@gjzq/sdk 1.4.0-beta.2 → 1.4.0-beta.4

package/dist/{index-Clzjdhbd.js → index-CvWGodSd.js}

@@ -184,6 +184,7 @@ var Env;
   Env["FZ"] = "fz";
   Env["PRE"] = "pre";
   Env["PROD"] = "prod";
+  Env["LOCAL"] = "local";
 })(Env || (Env = {}));
 /**
  * appId枚举
@@ -270,9 +271,10 @@ var LinkParamsEnvEnum;
   LinkParamsEnvEnum[LinkParamsEnvEnum["REDIRECT"] = 2] = "REDIRECT";
   LinkParamsEnvEnum[LinkParamsEnvEnum["OPEN_APP"] = 3] = "OPEN_APP";
 })(LinkParamsEnvEnum || (LinkParamsEnvEnum = {}));
-var WEBAPPS_HOST = (_a = {}, _a[Env.DEV] = 'https://devwebapps.yjbtest.com', _a[Env.FZ] = 'https://fzwebapps.yjbtest.com', _a[Env.PRE] = 'https://prewebapps.yongjinbao.com.cn', _a[Env.PROD] = 'https://webapps.yongjinbao.com.cn', _a);
-var PAYMENT_DOMAIN = (_b = {}, _b[Env.DEV] = 'https://devpayment.yjbtest.com', _b[Env.FZ] = 'https://fzpayment.yjbtest.com', _b[Env.PRE] = 'https://prepayment.yongjinbao.com.cn', _b[Env.PROD] = 'https://payment.yongjinbao.com.cn', _b);
+var WEBAPPS_HOST = (_a = {}, _a[Env.LOCAL] = location.origin, _a[Env.DEV] = 'https://devwebapps.yjbtest.com', _a[Env.FZ] = 'https://fzwebapps.yjbtest.com', _a[Env.PRE] = 'https://prewebapps.yongjinbao.com.cn', _a[Env.PROD] = 'https://webapps.yongjinbao.com.cn', _a);
+var PAYMENT_DOMAIN = (_b = {}, _b[Env.LOCAL] = location.origin, _b[Env.DEV] = 'https://devpayment.yjbtest.com', _b[Env.FZ] = 'https://fzpayment.yjbtest.com', _b[Env.PRE] = 'https://prepayment.yongjinbao.com.cn', _b[Env.PROD] = 'https://payment.yongjinbao.com.cn', _b);
 var envRules = {
+  local: [],
   dev: [/^https?:\/\/dev.*\.yjbtest\.com$/,
   // dev*.yjbtest.com
   /^https?:\/\/localhost(:\d+)?$/,
@@ -284,6 +286,18 @@ var envRules = {
   prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn，但排除 pre
   ]
 };
+var envRulesUseLocal = {
+  local: [/^https?:\/\/localhost(:\d+)?$/,
+  // localhost，支持端口号
+  /^https?:\/\/172\.28\.\d+\.\d+(:\d+)?$/ // 172.28.*.*，支持端口号
+  ],
+  dev: [/^https?:\/\/dev.*\.yjbtest\.com$/ // dev*.yjbtest.com
+  ],
+  fz: [/^https?:\/\/fz.*\.yjbtest\.com$/],
+  pre: [/^https?:\/\/pre.*\.yongjinbao\.com\.cn$/],
+  prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn，但排除 pre
+  ]
+};
 
 /**
  * 判断一个值是否是函数
@@ -323,11 +337,11 @@ function isWKWebView() {
  * @returns true 如果已就绪，否则 false
  */
 function isBridgeReady() {
-  // Android 
+  // Android
   if (window.yjbInterface && isFunction$2(window.yjbInterface.execute)) {
     return true;
   }
-  // iOS 
+  // iOS
   if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.yjbInterface && isFunction$2(window.webkit.messageHandlers.yjbInterface.postMessage)) {
     return true;
   }
@@ -400,49 +414,39 @@ function decrypt(value, key) {
 }
 // web登录设置
 var getWebappsPath = function getWebappsPath() {
-  var hostStr = '';
-  var reg = /^https?:\/\/(dev|fz|local)/g;
-  // 兼容不带dev,fz 的host
-  var matchRes = reg.exec(location.origin);
-  var mKey = matchRes ? matchRes[1] : null;
-  if (location.origin.includes('yongjinbao.com')) {
-    hostStr = WEBAPPS_HOST['prod'];
-  } else {
-    if (mKey) {
-      hostStr = WEBAPPS_HOST[mKey];
-    } else if (location.origin.includes('yjbtest.com')) {
-      hostStr = WEBAPPS_HOST['fz'];
-    }
-  }
+  var env = getEnv(true).env;
+  var hostStr = WEBAPPS_HOST[env];
   return "".concat(hostStr, "/yjbwebservice/core");
 };
 var getApiUrlPath = function getApiUrlPath() {
   if (window.Login_API_URL) return window.Login_API_URL;
-  if (location.origin.indexOf('http') != 0 && window.envConfig) {
-    var env = window.envConfig.env || Env.PROD;
-    var hostStr = WEBAPPS_HOST[env];
-    return "".concat(hostStr, "/yjbwebservice/core");
-  }
-  return "".concat(location.origin, "/yjbwebservice/core");
+  return getWebappsPath();
 };
-function getWebappsEnv(origin, fallback) {
+function getWebappsEnv(origin, fallback, useLocal) {
   if (fallback === void 0) {
     fallback = Env.PROD;
   }
-  for (var _i = 0, _a = Object.entries(envRules); _i < _a.length; _i++) {
+  if (useLocal === void 0) {
+    useLocal = false;
+  }
+  var envRule = useLocal ? envRulesUseLocal : envRules;
+  for (var _i = 0, _a = Object.entries(envRule); _i < _a.length; _i++) {
     var _b = _a[_i],
       env = _b[0],
       rules = _b[1];
-    for (var _c = 0, rules_1 = rules; _c < rules_1.length; _c++) {
-      var rule = rules_1[_c];
-      if (rule.test(origin)) {
+    for (var _c = 0, _d = rules; _c < _d.length; _c++) {
+      var rule = _d[_c];
+      if (rule.test(origin) && origin) {
         return env;
       }
     }
   }
   return fallback;
 }
-function getEnv() {
+function getEnv(useLocal) {
+  if (useLocal === void 0) {
+    useLocal = false;
+  }
   // 默认webapps环境
   var host = WEBAPPS;
   var defaultEnv = {
@@ -463,7 +467,8 @@ function getEnv() {
     }
   } else {
     var ORI = location.origin;
-    defaultEnv.env = getWebappsEnv(ORI);
+    defaultEnv.env = getWebappsEnv(ORI, Env.PROD, useLocal);
+    console.log(1111, defaultEnv);
   }
   return defaultEnv;
 }
@@ -6354,6 +6359,14 @@ function loginWithTokenForWeb(loginType) {
   });
 }
 
+/**
+ * 注销用户号登录 4016
+ * @function userLogOut
+ */
+var userLogOut = function userLogOut() {
+  nativeIOOperation(4016, {});
+};
+
 /**
  * 检查登录状态
  * @function checkLogin
@@ -6383,6 +6396,11 @@ function checkLoginForWeb(loginType) {
         case 3:
           loginResult = _a.sent();
           console.log('loginResult: ', loginResult);
+          // 1113 新增用户注销判断，需退登客户端
+          if (loginResult.code === -4) {
+            userLogOut();
+            return [2 /*return*/, 0];
+          }
           if (loginResult.code !== 0) {
             // 2025.01.02 经讨论 退登不解绑！！
             // 解绑userId
@@ -9285,14 +9303,6 @@ var userLoginModal = function userLoginModal(json) {
   return nativeIOOperation(4028, params);
 };
 
-/**
- * 注销用户号登录 4016
- * @function userLogOut
- */
-var userLogOut = function userLogOut() {
-  nativeIOOperation(4016, {});
-};
-
 /**
    * 活体检测 3018
    * @function VivoDetectionParams

package/dist/index.d.ts

@@ -245,7 +245,7 @@ declare const checkLogin: (loginType: string, channelId: string) => Promise<any>
  * @param {string} loginType 登录类型
  * @returns {Promise<boolean>}
  */
-declare function checkLoginForWeb(loginType: string): Promise<boolean>;
+declare function checkLoginForWeb(loginType: string): Promise<boolean | Number>;
 
 /**
  * marginAccount登录状态检查

package/dist/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-Clzjdhbd.js');
+var index = require('./index-CvWGodSd.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/dist/pure.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-Clzjdhbd.js');
+var index = require('./index-CvWGodSd.js');
 require('ts-md5');
 require('weixin-js-sdk');
 require('clipboard');

package/es/checkLoginForWeb/index.mjs

@@ -12,6 +12,7 @@ import { loginWithToken } from '../loginWithToken/index.mjs';
 import { loginWithTokenForWeb } from '../loginWithTokenForWeb/index.mjs';
 import { LoginType, useHybridLogin, CHANNELID } from '../utils/const.mjs';
 import { getQueryString } from '../utils/urlFuncs.mjs';
+import { userLogOut } from '../userLogOut/index.mjs';
 
 /**
  * 检查登录状态
@@ -42,6 +43,11 @@ function checkLoginForWeb(loginType) {
         case 3:
           loginResult = _a.sent();
           console.log('loginResult: ', loginResult);
+          // 1113 新增用户注销判断，需退登客户端
+          if (loginResult.code === -4) {
+            userLogOut();
+            return [2 /*return*/, 0];
+          }
           if (loginResult.code !== 0) {
             // 2025.01.02 经讨论 退登不解绑！！
             // 解绑userId

package/es/utils/const.mjs

@@ -30,6 +30,7 @@ var Env;
   Env["FZ"] = "fz";
   Env["PRE"] = "pre";
   Env["PROD"] = "prod";
+  Env["LOCAL"] = "local";
 })(Env || (Env = {}));
 /**
  * appId枚举
@@ -116,9 +117,10 @@ var LinkParamsEnvEnum;
   LinkParamsEnvEnum[LinkParamsEnvEnum["REDIRECT"] = 2] = "REDIRECT";
   LinkParamsEnvEnum[LinkParamsEnvEnum["OPEN_APP"] = 3] = "OPEN_APP";
 })(LinkParamsEnvEnum || (LinkParamsEnvEnum = {}));
-var WEBAPPS_HOST = (_a = {}, _a[Env.DEV] = 'https://devwebapps.yjbtest.com', _a[Env.FZ] = 'https://fzwebapps.yjbtest.com', _a[Env.PRE] = 'https://prewebapps.yongjinbao.com.cn', _a[Env.PROD] = 'https://webapps.yongjinbao.com.cn', _a);
-var PAYMENT_DOMAIN = (_b = {}, _b[Env.DEV] = 'https://devpayment.yjbtest.com', _b[Env.FZ] = 'https://fzpayment.yjbtest.com', _b[Env.PRE] = 'https://prepayment.yongjinbao.com.cn', _b[Env.PROD] = 'https://payment.yongjinbao.com.cn', _b);
+var WEBAPPS_HOST = (_a = {}, _a[Env.LOCAL] = location.origin, _a[Env.DEV] = 'https://devwebapps.yjbtest.com', _a[Env.FZ] = 'https://fzwebapps.yjbtest.com', _a[Env.PRE] = 'https://prewebapps.yongjinbao.com.cn', _a[Env.PROD] = 'https://webapps.yongjinbao.com.cn', _a);
+var PAYMENT_DOMAIN = (_b = {}, _b[Env.LOCAL] = location.origin, _b[Env.DEV] = 'https://devpayment.yjbtest.com', _b[Env.FZ] = 'https://fzpayment.yjbtest.com', _b[Env.PRE] = 'https://prepayment.yongjinbao.com.cn', _b[Env.PROD] = 'https://payment.yongjinbao.com.cn', _b);
 var envRules = {
+  local: [],
   dev: [/^https?:\/\/dev.*\.yjbtest\.com$/,
   // dev*.yjbtest.com
   /^https?:\/\/localhost(:\d+)?$/,
@@ -130,5 +132,17 @@ var envRules = {
   prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn，但排除 pre
   ]
 };
+var envRulesUseLocal = {
+  local: [/^https?:\/\/localhost(:\d+)?$/,
+  // localhost，支持端口号
+  /^https?:\/\/172\.28\.\d+\.\d+(:\d+)?$/ // 172.28.*.*，支持端口号
+  ],
+  dev: [/^https?:\/\/dev.*\.yjbtest\.com$/ // dev*.yjbtest.com
+  ],
+  fz: [/^https?:\/\/fz.*\.yjbtest\.com$/],
+  pre: [/^https?:\/\/pre.*\.yongjinbao\.com\.cn$/],
+  prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn，但排除 pre
+  ]
+};
 
-export { ALL_NO_SYSTEM_PARAM_KEYS, AccountType, AppId, CHANNELID, DEFAULT_RESPONSE, Env, HYBRID, LOGOUT_TYPE, LinkPageEnvEnum, LinkParamsEnvEnum, LinkTypeEnum, LoginPlaceholderEnum, LoginResult, LoginType, LoginTypeEnum, MESSAGE, NO_TOKEN, PAYMENT_DOMAIN, ReadFileType, WEBAPPS, WEBAPPS_HOST, envRules, isAndroid, isIos, isMini, useHybridLogin };
+export { ALL_NO_SYSTEM_PARAM_KEYS, AccountType, AppId, CHANNELID, DEFAULT_RESPONSE, Env, HYBRID, LOGOUT_TYPE, LinkPageEnvEnum, LinkParamsEnvEnum, LinkTypeEnum, LoginPlaceholderEnum, LoginResult, LoginType, LoginTypeEnum, MESSAGE, NO_TOKEN, PAYMENT_DOMAIN, ReadFileType, WEBAPPS, WEBAPPS_HOST, envRules, envRulesUseLocal, isAndroid, isIos, isMini, useHybridLogin };

package/es/utils/funcs.mjs

@@ -1,7 +1,7 @@
 import AES from 'crypto-js/aes.js';
 import Utf8 from 'crypto-js/enc-utf8.js';
 import ECB from 'crypto-js/mode-ecb.js';
-import { Env, WEBAPPS_HOST, PAYMENT_DOMAIN, HYBRID, WEBAPPS, envRules } from './const.mjs';
+import { PAYMENT_DOMAIN, WEBAPPS_HOST, Env, HYBRID, WEBAPPS, envRulesUseLocal, envRules } from './const.mjs';
 
 /**
  * 判断一个值是否是函数
@@ -41,11 +41,11 @@ function isWKWebView() {
  * @returns true 如果已就绪，否则 false
  */
 function isBridgeReady() {
-  // Android 
+  // Android
   if (window.yjbInterface && isFunction$2(window.yjbInterface.execute)) {
     return true;
   }
-  // iOS 
+  // iOS
   if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.yjbInterface && isFunction$2(window.webkit.messageHandlers.yjbInterface.postMessage)) {
     return true;
   }
@@ -118,49 +118,39 @@ function decrypt(value, key) {
 }
 // web登录设置
 var getWebappsPath = function getWebappsPath() {
-  var hostStr = '';
-  var reg = /^https?:\/\/(dev|fz|local)/g;
-  // 兼容不带dev,fz 的host
-  var matchRes = reg.exec(location.origin);
-  var mKey = matchRes ? matchRes[1] : null;
-  if (location.origin.includes('yongjinbao.com')) {
-    hostStr = WEBAPPS_HOST['prod'];
-  } else {
-    if (mKey) {
-      hostStr = WEBAPPS_HOST[mKey];
-    } else if (location.origin.includes('yjbtest.com')) {
-      hostStr = WEBAPPS_HOST['fz'];
-    }
-  }
+  var env = getEnv(true).env;
+  var hostStr = WEBAPPS_HOST[env];
   return "".concat(hostStr, "/yjbwebservice/core");
 };
 var getApiUrlPath = function getApiUrlPath() {
   if (window.Login_API_URL) return window.Login_API_URL;
-  if (location.origin.indexOf('http') != 0 && window.envConfig) {
-    var env = window.envConfig.env || Env.PROD;
-    var hostStr = WEBAPPS_HOST[env];
-    return "".concat(hostStr, "/yjbwebservice/core");
-  }
-  return "".concat(location.origin, "/yjbwebservice/core");
+  return getWebappsPath();
 };
-function getWebappsEnv(origin, fallback) {
+function getWebappsEnv(origin, fallback, useLocal) {
   if (fallback === void 0) {
     fallback = Env.PROD;
   }
-  for (var _i = 0, _a = Object.entries(envRules); _i < _a.length; _i++) {
+  if (useLocal === void 0) {
+    useLocal = false;
+  }
+  var envRule = useLocal ? envRulesUseLocal : envRules;
+  for (var _i = 0, _a = Object.entries(envRule); _i < _a.length; _i++) {
     var _b = _a[_i],
       env = _b[0],
       rules = _b[1];
-    for (var _c = 0, rules_1 = rules; _c < rules_1.length; _c++) {
-      var rule = rules_1[_c];
-      if (rule.test(origin)) {
+    for (var _c = 0, _d = rules; _c < _d.length; _c++) {
+      var rule = _d[_c];
+      if (rule.test(origin) && origin) {
         return env;
       }
     }
   }
   return fallback;
 }
-function getEnv() {
+function getEnv(useLocal) {
+  if (useLocal === void 0) {
+    useLocal = false;
+  }
   // 默认webapps环境
   var host = WEBAPPS;
   var defaultEnv = {
@@ -181,7 +171,8 @@ function getEnv() {
     }
   } else {
     var ORI = location.origin;
-    defaultEnv.env = getWebappsEnv(ORI);
+    defaultEnv.env = getWebappsEnv(ORI, Env.PROD, useLocal);
+    console.log(1111, defaultEnv);
   }
   return defaultEnv;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjzq/sdk",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0-beta.4",
   "main": "dist/index.js",
   "module": "es/index.mjs",
   "types": "./dist/index.d.ts",