@gm-mobile/mp-request 3.11.2-beta.0 → 3.11.4-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/mp-request",
-  "version": "3.11.2-beta.0",
+  "version": "3.11.4-beta.0",
   "description": "> TODO: description",
   "author": "zhongsink <zhongink@gmail.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -20,9 +20,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-tool": "^3.11.2-beta.0",
-    "@gm-mobile/locales": "^3.11.2-beta.0",
-    "@gm-mobile/mp": "^3.11.2-beta.0",
+    "@gm-mobile/c-tool": "^3.11.4-beta.0",
+    "@gm-mobile/locales": "^3.11.4-beta.0",
+    "@gm-mobile/mp": "^3.11.4-beta.0",
     "js-base64": "^3.6.0"
   },
   "peerDependencies": {
@@ -30,5 +30,5 @@
     "taro-axios": "^1.1.1",
     "weapp-cookie": "^1.4.6"
   },
-  "gitHead": "0703860dd8377767874403df5236d56c00446c54"
+  "gitHead": "b5ca25b313c10ac57e6fc12b7165785489080838"
 }

package/src/config_private_domain.ts

@@ -6,40 +6,85 @@ import { LocalStorage } from '@gm-mobile/mp'
 // 如果有值使用此值作为接口请求域名
 let privateBaseUrl: string = LocalStorage.get('privateBaseUrl') || ''
 
-/** 私有化部署实现，监测到登录后，后续所有接口的请求域名将使用group中的private_domain字段值 */
-async function configPrivateDomain(defaultBaseUrl: string) {
+/** 私有化部署实现，监测到登录后，后续所有接口的请求域名将使用group中的private_domain字段值
+ * 退出登录后应该调用clearPrivateDomain恢复
+ */
+export async function configPrivateDomain(defaultBaseUrl: string) {
   instance.interceptors.request.use(async (config) => {
     const { baseURL = '', url, data = '{}' } = config
     const fullUrl = baseURL + url
+    if (url!.indexOf('ceres') === -1) {
+      // 仅处理ceres接口
+      return config
+    }
     const apiName = fullUrl.split('/').reverse()[0]
     const origin = fullUrl.split('/').slice(0, 3).join('/')
     const form: any = /^\{/.test(data) ? JSON.parse(data) : {}
     switch (apiName) {
       case 'Token': {
-        const group_id = form.group_id
-        const group_customized_code = form.group_customized_code
-        const {
-          data: { groups },
-          status,
-        } = await axios.post(
-          '/ceres/enterprise/EnterpriseService/ListLoginGroup',
-          {
-            group_id,
-            customized_code: group_customized_code,
-          },
-          { baseURL: defaultBaseUrl }
-        )
-        if (status !== 200)
-          return Promise.reject(new Error('ListLoginGroup 请求失败'))
-        privateBaseUrl = get(groups, '0.private_domain_name') || ''
-        LocalStorage.set('privateBaseUrl', privateBaseUrl)
+        // #region 已知目前三种登录方式：
+        // 1、group_id 使用企业id登录，如轻巧版
+        // 2、group_customized_code 使用自定义编码登录，如采购助手
+        // 3、wechat_app_id 使用绑定了企业的应用id登录，通过GetApplicationRelation取得group_id，如eshop
+        // 故以下三个一定存在一个
+        const group_id: string | undefined = form.group_id
+        const group_customized_code: string | undefined =
+          form.group_customized_code
+        const wechat_app_id: string | undefined = form.wechat_app_id
+        // #endregion
+        const getPrivateBaseUrl = async ({
+          group_id,
+          customized_code,
+        }: {
+          group_id?: string
+          customized_code?: string
+        }) => {
+          const {
+            data: { groups },
+          } = await axios.post(
+            '/ceres/enterprise/EnterpriseService/ListLoginGroup',
+            { group_id, customized_code },
+            { baseURL: defaultBaseUrl }
+          )
+          return get(groups, '0.private_domain_name')?.replace(/\/^/, '') || ''
+        }
+        // 登录1和登录2
+        if (group_id || group_customized_code) {
+          privateBaseUrl =
+            (await getPrivateBaseUrl({
+              group_id,
+              customized_code: group_customized_code,
+            })) || ''
+          LocalStorage.set('privateBaseUrl', privateBaseUrl)
+        } else if (wechat_app_id) {
+          // 登录3
+          const {
+            data: { group_id },
+          } = await axios.post(
+            '/ceres/preference/PreferenceService/GetApplicationRelation',
+            {
+              application_key: wechat_app_id,
+              application_type: 1,
+            },
+            { baseURL: defaultBaseUrl }
+          )
+          privateBaseUrl = (await getPrivateBaseUrl({ group_id })) || ''
+          LocalStorage.set('privateBaseUrl', privateBaseUrl)
+          console.log('[configPrivateDomain] 启用自定义域名', privateBaseUrl)
+        } else {
+          console.warn('不该来到这里')
+        }
+        break
+      }
+      default: {
         break
       }
-      default:
     }
-    config.baseURL = privateBaseUrl || defaultBaseUrl
+    config.baseURL = privateBaseUrl || defaultBaseUrl || config.baseURL
     return Promise.resolve(config)
   })
 }
 
-export default configPrivateDomain
+export function clearPrivateDomain() {
+  privateBaseUrl = ''
+}