@wapri/ghermes 2.0.10 → 3.0.0-beta.0

package/dist/base.d.ts

@@ -10,6 +10,8 @@ import { Env } from '@wapri/gbase';
 export default class HermesBase {
     readonly env: Env;
     private readonly baseUrl;
+    /** 网关前缀，业务中心地址为 `${servicePrefix}${SERVICE_PATHS[key]}` */
+    readonly servicePrefix: string;
     /** axios实例 */
     readonly instance: AxiosInstance;
     /** 拦截器配置 */

package/dist/base.js

@@ -19,13 +19,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 import axios from 'axios';
 import { isEmpty, Env, getToken as _getToken } from '@wapri/gbase';
-import { serverDomains } from "./constants/domain";
+import { createServerDomains, DEFAULT_SERVICE_PREFIX } from "./constants/domain";
 import { axiosTransformSafeLong } from "./utils/snowflake";
 var HermesBase = /*#__PURE__*/function () {
   function HermesBase(config) {
     _classCallCheck(this, HermesBase);
     _defineProperty(this, "env", void 0);
     _defineProperty(this, "baseUrl", '');
+    /** 网关前缀，业务中心地址为 `${servicePrefix}${SERVICE_PATHS[key]}` */
+    _defineProperty(this, "servicePrefix", void 0);
     /** axios实例 */
     _defineProperty(this, "instance", void 0);
     /** 拦截器配置 */
@@ -60,8 +62,10 @@ var HermesBase = /*#__PURE__*/function () {
       removeToken = config.removeToken,
       unwrapResponse = config.unwrapResponse,
       onError = config.onError,
-      onUnauthorized = config.onUnauthorized;
+      onUnauthorized = config.onUnauthorized,
+      servicePrefix = config.servicePrefix;
     this.env = env;
+    this.servicePrefix = servicePrefix || DEFAULT_SERVICE_PREFIX;
     this.baseUrl = this.initialBaseUrl(config);
     this.interceptor = interceptor;
     this.retry = this.initialRetry(retry);
@@ -84,13 +88,14 @@ var HermesBase = /*#__PURE__*/function () {
   _createClass(HermesBase, [{
     key: "initialBaseUrl",
     value: function initialBaseUrl(config) {
-      var _serverDomains$module;
+      var _createServerDomains$;
       var _config$env2 = config.env,
         env = _config$env2 === void 0 ? Env.PROD : _config$env2,
         baseUrl = config.baseUrl,
         _config$module = config.module,
         module = _config$module === void 0 ? 'store' : _config$module;
-      return baseUrl || ((_serverDomains$module = serverDomains[module]) === null || _serverDomains$module === void 0 ? void 0 : _serverDomains$module[env]);
+      if (baseUrl) return baseUrl;
+      return (_createServerDomains$ = createServerDomains(this.servicePrefix)[module]) === null || _createServerDomains$ === void 0 ? void 0 : _createServerDomains$[env];
     }
 
     /** 设置重试配置 */

package/dist/constants/domain.d.ts

@@ -1,34 +1,44 @@
 import { Env } from '@wapri/gbase';
 /**
  * 服务端模块（域名维度）：
- * - store / admin 为终端维度（门店端 / 平台端），直接挂到网关根
- * - 其余为业务中心维度，走「网关根 + 服务前缀」
- * - gateway 为网关管控台独立实例（不经过业务网关根）
+ * - store / admin 为终端维度（门店端 / 平台端），直接使用网关前缀
+ * - 其余为业务中心维度，走「网关前缀 + 服务路径」
+ * - gateway 为网关管控台独立实例
+ *
+ * 网关前缀属于业务侧部署信息，通过 `HermesBaseConfig.servicePrefix` 传入；
+ * 库里只保留路径段（`/permission-center` 等）与默认前缀 `/api`。
  */
 export type ServerDomainKey = 'store' | 'admin' | 'permission' | 'merchant' | 'goods' | 'marketing' | 'pay' | 'order' | 'express' | 'file' | 'capability' | 'message' | 'cart' | 'gateway' | 'aftersale' | 'invoice' | 'auth';
-/** 各业务中心的网关注册前缀（固定值，不随环境变化） */
-export declare const SERVICE_PREFIX: Record<Exclude<ServerDomainKey, 'store' | 'admin' | 'gateway'>, string>;
-export declare const serverDomains: {
-    store: Record<Env, string>;
-    admin: Record<Env, string>;
-    permission: Record<Env, string>;
-    merchant: Record<Env, string>;
-    goods: Record<Env, string>;
-    marketing: Record<Env, string>;
-    pay: Record<Env, string>;
-    order: Record<Env, string>;
-    express: Record<Env, string>;
-    file: Record<Env, string>;
-    capability: Record<Env, string>;
-    message: Record<Env, string>;
-    cart: Record<Env, string>;
-    gateway: {
-        dev: string;
-        test: string;
-        pre: string;
-        prod: string;
-    };
-    aftersale: Record<Env, string>;
-    invoice: Record<Env, string>;
-    auth: Record<Env, string>;
+/** 默认网关前缀，业务可通过 `HermesBaseConfig.servicePrefix` 覆盖 */
+export declare const DEFAULT_SERVICE_PREFIX = "/api";
+/** 各业务中心相对网关前缀的路径段 */
+export declare const SERVICE_PATHS: {
+    readonly permission: "/permission-center";
+    readonly merchant: "/merchant";
+    readonly goods: "/goods-center";
+    readonly marketing: "/marketing-center";
+    readonly pay: "/pay-center";
+    readonly order: "/order-center";
+    readonly express: "/express-center";
+    readonly file: "/file";
+    readonly capability: "/capability";
+    readonly message: "/message";
+    readonly cart: "/cart-center";
+    readonly aftersale: "/after-sale-center";
+    readonly invoice: "/invoice/v1";
+    readonly auth: "/auth";
+    readonly gateway: "/gateway/admin";
 };
+/** 业务中心模块 */
+export type ServiceDomainKey = keyof typeof SERVICE_PATHS;
+/**
+ * 按网关前缀推导各模块地址。
+ *
+ * 业务中心地址统一是 `${servicePrefix}${SERVICE_PATHS[key]}`，
+ * 如 `servicePrefix = '/api'` 时商品中心为 `/api/goods-center`。
+ *
+ * @param servicePrefix 网关前缀
+ */
+export declare const createServerDomains: (servicePrefix?: string) => Record<ServerDomainKey, Record<Env, string>>;
+/** 默认地址表（不传配置时使用） */
+export declare const serverDomains: Record<ServerDomainKey, Record<Env, string>>;

package/dist/constants/domain.js

@@ -4,53 +4,77 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Env } from '@wapri/gbase';
 
-/**
- * 服务端模块（域名维度）：
- * - store / admin 为终端维度（门店端 / 平台端），直接挂到网关根
- * - 其余为业务中心维度，走「网关根 + 服务前缀」
- * - gateway 为网关管控台独立实例（不经过业务网关根）
+/**
+ * 服务端模块（域名维度）：
+ * - store / admin 为终端维度（门店端 / 平台端），直接使用网关前缀
+ * - 其余为业务中心维度，走「网关前缀 + 服务路径」
+ * - gateway 为网关管控台独立实例
+ *
+ * 网关前缀属于业务侧部署信息，通过 `HermesBaseConfig.servicePrefix` 传入；
+ * 库里只保留路径段（`/permission-center` 等）与默认前缀 `/api`。
  */
 
-/** 网关根路径（终端维度直接使用） */
-var GATEWAY_ROOT = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Env.DEV, '/api'), Env.TEST, '/api'), Env.PRE, '/api'), Env.PROD, '/api');
+/** 默认网关前缀，业务可通过 `HermesBaseConfig.servicePrefix` 覆盖 */
+export var DEFAULT_SERVICE_PREFIX = '/api';
 
-/** 各业务中心的网关注册前缀（固定值，不随环境变化） */
-export var SERVICE_PREFIX = {
-  permission: '/kaimai-permission-center',
-  merchant: '/kaimai-merchant',
-  goods: '/kaimai-goods-center',
-  marketing: '/kaimai-marketing-center',
-  pay: '/kaimai-pay-center',
-  order: '/kaimai-order-center',
-  express: '/kaimai-express-center',
-  file: '/kaimai-file',
-  capability: '/kaimai-capability',
-  message: '/kaimai-message',
-  cart: '/kaimai-cart-center',
-  aftersale: '/kaimai-after-sale-center',
+/** 各业务中心相对网关前缀的路径段 */
+export var SERVICE_PATHS = {
+  permission: '/permission-center',
+  merchant: '/merchant',
+  goods: '/goods-center',
+  marketing: '/marketing-center',
+  pay: '/pay-center',
+  order: '/order-center',
+  express: '/express-center',
+  file: '/file',
+  capability: '/capability',
+  message: '/message',
+  cart: '/cart-center',
+  aftersale: '/after-sale-center',
   invoice: '/invoice/v1',
-  auth: '/auth'
+  auth: '/auth',
+  gateway: '/gateway/admin'
 };
-function buildServiceDomains(prefix) {
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Env.DEV, "".concat(GATEWAY_ROOT[Env.DEV]).concat(prefix)), Env.TEST, "".concat(GATEWAY_ROOT[Env.TEST]).concat(prefix)), Env.PRE, "".concat(GATEWAY_ROOT[Env.PRE]).concat(prefix)), Env.PROD, "".concat(GATEWAY_ROOT[Env.PROD]).concat(prefix));
-}
-export var serverDomains = {
-  store: GATEWAY_ROOT,
-  admin: GATEWAY_ROOT,
-  permission: buildServiceDomains(SERVICE_PREFIX.permission),
-  merchant: buildServiceDomains(SERVICE_PREFIX.merchant),
-  goods: buildServiceDomains(SERVICE_PREFIX.goods),
-  marketing: buildServiceDomains(SERVICE_PREFIX.marketing),
-  pay: buildServiceDomains(SERVICE_PREFIX.pay),
-  order: buildServiceDomains(SERVICE_PREFIX.order),
-  express: buildServiceDomains(SERVICE_PREFIX.express),
-  file: buildServiceDomains(SERVICE_PREFIX.file),
-  capability: buildServiceDomains(SERVICE_PREFIX.capability),
-  message: buildServiceDomains(SERVICE_PREFIX.message),
-  cart: buildServiceDomains(SERVICE_PREFIX.cart),
-  // 网关管控台独立实例，各环境同路径；聚合文档可 new Hermes({ baseUrl: '/docs' }) 覆盖
-  gateway: _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Env.DEV, '/gateway/admin'), Env.TEST, '/gateway/admin'), Env.PRE, '/gateway/admin'), Env.PROD, '/gateway/admin'),
-  aftersale: buildServiceDomains(SERVICE_PREFIX.aftersale),
-  invoice: buildServiceDomains(SERVICE_PREFIX.invoice),
-  auth: buildServiceDomains(SERVICE_PREFIX.auth)
-};
+
+/** 业务中心模块 */
+
+var buildEnvPaths = function buildEnvPaths(path) {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Env.DEV, path), Env.TEST, path), Env.PRE, path), Env.PROD, path);
+};
+
+/**
+ * 按网关前缀推导各模块地址。
+ *
+ * 业务中心地址统一是 `${servicePrefix}${SERVICE_PATHS[key]}`，
+ * 如 `servicePrefix = '/api'` 时商品中心为 `/api/goods-center`。
+ *
+ * @param servicePrefix 网关前缀
+ */
+export var createServerDomains = function createServerDomains() {
+  var servicePrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_SERVICE_PREFIX;
+  var resolve = function resolve(key) {
+    return buildEnvPaths("".concat(servicePrefix).concat(SERVICE_PATHS[key]));
+  };
+  return {
+    store: buildEnvPaths(servicePrefix),
+    admin: buildEnvPaths(servicePrefix),
+    permission: resolve('permission'),
+    merchant: resolve('merchant'),
+    goods: resolve('goods'),
+    marketing: resolve('marketing'),
+    pay: resolve('pay'),
+    order: resolve('order'),
+    express: resolve('express'),
+    file: resolve('file'),
+    capability: resolve('capability'),
+    message: resolve('message'),
+    cart: resolve('cart'),
+    gateway: resolve('gateway'),
+    aftersale: resolve('aftersale'),
+    invoice: resolve('invoice'),
+    auth: resolve('auth')
+  };
+};
+
+/** 默认地址表（不传配置时使用） */
+export var serverDomains = createServerDomains();

package/dist/demo/custom-interceptor.js

@@ -12,7 +12,8 @@ import { Hermes } from "./..";
 var hermes = new Hermes({
   env: Env.DEV,
   module: 'merchant',
-  baseUrl: 'http://admin-test.kaimaitong.com/api',
+  // 网关根地址：业务按自身部署传入，仓库内不写死环境域名
+  baseUrl: '/api',
   interceptor: {
     plugin: ['trace'],
     // 自定义请求拦截器：内置拦截器执行后追加，可继续修改 config
@@ -36,7 +37,7 @@ var Demo = function Demo() {
             _context.next = 3;
             return hermes.instance.request({
               method: 'get',
-              url: '/kaimai-permission-center/system/menu/list'
+              url: '/permission-center/system/menu/list'
             });
           case 3:
             res = _context.sent;

package/dist/modules/auth/index.d.ts

@@ -14,7 +14,7 @@ export declare class HermesModuleAuth {
     oauthCallback(params: AccountOAuthCallbackRequest): Promise<AccountLoginResponse> | undefined;
     /** 退出登录。 */
     logout(): Promise<unknown> | undefined;
-    /** 签发短时一次性票据。 */
+    /** 签发短时一次性票据（scene / clientType 由业务按认证中心约定传入）。 */
     getTicket(data?: TicketIssueRequest): Promise<TicketIssueDto> | undefined;
     /** 用票据兑换登录态。 */
     ticketGetToken(data: {

package/dist/modules/auth/index.js

@@ -7,14 +7,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { SERVICE_PREFIX } from "../../constants";
+import { SERVICE_PATHS } from "../../constants";
 export var HermesModuleAuth = /*#__PURE__*/function () {
   function HermesModuleAuth(hermes) {
     _classCallCheck(this, HermesModuleAuth);
     _defineProperty(this, "hermes", void 0);
     _defineProperty(this, "baseUrl", '');
     this.hermes = hermes;
-    this.baseUrl = SERVICE_PREFIX.auth;
+    this.baseUrl = "".concat(hermes.servicePrefix).concat(SERVICE_PATHS.auth);
   }
 
   /** 认证中心统一登录。 */
@@ -90,7 +90,7 @@ export var HermesModuleAuth = /*#__PURE__*/function () {
       });
     }
 
-    /** 签发短时一次性票据。 */
+    /** 签发短时一次性票据（scene / clientType 由业务按认证中心约定传入）。 */
   }, {
     key: "getTicket",
     value: function getTicket(data) {
@@ -98,10 +98,7 @@ export var HermesModuleAuth = /*#__PURE__*/function () {
       return (_this$hermes6 = this.hermes) === null || _this$hermes6 === void 0 ? void 0 : _this$hermes6.instance.request({
         method: 'post',
         url: "".concat(this.baseUrl, "/ticket/issue"),
-        data: _objectSpread({
-          scene: 'LOGISTICS_TRACKING',
-          clientType: 'H5'
-        }, data || {})
+        data: _objectSpread({}, data || {})
       });
     }
 
@@ -113,9 +110,7 @@ export var HermesModuleAuth = /*#__PURE__*/function () {
       return (_this$hermes7 = this.hermes) === null || _this$hermes7 === void 0 ? void 0 : _this$hermes7.instance.request({
         method: 'post',
         url: "".concat(this.baseUrl, "/ticket/exchange"),
-        data: _objectSpread({
-          deviceId: 'H5 Session'
-        }, data || {}),
+        data: _objectSpread({}, data || {}),
         headers: {
           isToken: false
         }

package/dist/modules/file/index.js

@@ -5,14 +5,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { SERVICE_PREFIX } from "../../constants";
+import { SERVICE_PATHS } from "../../constants";
 export var HermesModuleFile = /*#__PURE__*/function () {
   function HermesModuleFile(hermes) {
     _classCallCheck(this, HermesModuleFile);
     _defineProperty(this, "hermes", void 0);
     _defineProperty(this, "baseUrl", '');
     this.hermes = hermes;
-    this.baseUrl = SERVICE_PREFIX.file;
+    this.baseUrl = "".concat(hermes.servicePrefix).concat(SERVICE_PATHS.file);
   }
   _createClass(HermesModuleFile, [{
     key: "tosGetSts",

package/dist/types/common.d.ts

@@ -26,6 +26,11 @@ export type RequestCommon = {
      * @default usedCar
      *  */
     module?: ServerDomainKey;
+    /**
+     * 网关前缀，业务中心地址统一是 `${servicePrefix}${SERVICE_PATHS[key]}`。
+     * @default '/api'
+     */
+    servicePrefix?: string;
 };
 /**
  * 业务自定义请求拦截器：在内置拦截器（token + plugin）执行后追加调用，可继续修改 config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wapri/ghermes",
-  "version": "2.0.10",
+  "version": "3.0.0-beta.0",
   "description": "公共请求库,维护了统一请求与不同模块的请求",
   "keywords": [],
   "license": "UNLICENSED",
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "axios": "^1.16.1",
-    "@wapri/gbase": "^1.0.0"
+    "@wapri/gbase": "^1.0.1-beta.0"
   },
   "publishConfig": {
     "access": "public",