@gjzq/sdk 1.4.0-beta.4 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -184,7 +184,6 @@ var Env;
184
184
  Env["FZ"] = "fz";
185
185
  Env["PRE"] = "pre";
186
186
  Env["PROD"] = "prod";
187
- Env["LOCAL"] = "local";
188
187
  })(Env || (Env = {}));
189
188
  /**
190
189
  * appId枚举
@@ -271,10 +270,9 @@ var LinkParamsEnvEnum;
271
270
  LinkParamsEnvEnum[LinkParamsEnvEnum["REDIRECT"] = 2] = "REDIRECT";
272
271
  LinkParamsEnvEnum[LinkParamsEnvEnum["OPEN_APP"] = 3] = "OPEN_APP";
273
272
  })(LinkParamsEnvEnum || (LinkParamsEnvEnum = {}));
274
- 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);
275
- 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);
273
+ 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);
274
+ 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);
276
275
  var envRules = {
277
- local: [],
278
276
  dev: [/^https?:\/\/dev.*\.yjbtest\.com$/,
279
277
  // dev*.yjbtest.com
280
278
  /^https?:\/\/localhost(:\d+)?$/,
@@ -286,18 +284,6 @@ var envRules = {
286
284
  prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn,但排除 pre
287
285
  ]
288
286
  };
289
- var envRulesUseLocal = {
290
- local: [/^https?:\/\/localhost(:\d+)?$/,
291
- // localhost,支持端口号
292
- /^https?:\/\/172\.28\.\d+\.\d+(:\d+)?$/ // 172.28.*.*,支持端口号
293
- ],
294
- dev: [/^https?:\/\/dev.*\.yjbtest\.com$/ // dev*.yjbtest.com
295
- ],
296
- fz: [/^https?:\/\/fz.*\.yjbtest\.com$/],
297
- pre: [/^https?:\/\/pre.*\.yongjinbao\.com\.cn$/],
298
- prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn,但排除 pre
299
- ]
300
- };
301
287
 
302
288
  /**
303
289
  * 判断一个值是否是函数
@@ -337,11 +323,11 @@ function isWKWebView() {
337
323
  * @returns true 如果已就绪,否则 false
338
324
  */
339
325
  function isBridgeReady() {
340
- // Android
326
+ // Android
341
327
  if (window.yjbInterface && isFunction$2(window.yjbInterface.execute)) {
342
328
  return true;
343
329
  }
344
- // iOS
330
+ // iOS
345
331
  if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.yjbInterface && isFunction$2(window.webkit.messageHandlers.yjbInterface.postMessage)) {
346
332
  return true;
347
333
  }
@@ -414,39 +400,49 @@ function decrypt(value, key) {
414
400
  }
415
401
  // web登录设置
416
402
  var getWebappsPath = function getWebappsPath() {
417
- var env = getEnv(true).env;
418
- var hostStr = WEBAPPS_HOST[env];
403
+ var hostStr = '';
404
+ var reg = /^https?:\/\/(dev|fz|local)/g;
405
+ // 兼容不带dev,fz 的host
406
+ var matchRes = reg.exec(location.origin);
407
+ var mKey = matchRes ? matchRes[1] : null;
408
+ if (location.origin.includes('yongjinbao.com')) {
409
+ hostStr = WEBAPPS_HOST['prod'];
410
+ } else {
411
+ if (mKey) {
412
+ hostStr = WEBAPPS_HOST[mKey];
413
+ } else if (location.origin.includes('yjbtest.com')) {
414
+ hostStr = WEBAPPS_HOST['fz'];
415
+ }
416
+ }
419
417
  return "".concat(hostStr, "/yjbwebservice/core");
420
418
  };
421
419
  var getApiUrlPath = function getApiUrlPath() {
422
420
  if (window.Login_API_URL) return window.Login_API_URL;
423
- return getWebappsPath();
421
+ if (location.origin.indexOf('http') != 0 && window.envConfig) {
422
+ var env = window.envConfig.env || Env.PROD;
423
+ var hostStr = WEBAPPS_HOST[env];
424
+ return "".concat(hostStr, "/yjbwebservice/core");
425
+ }
426
+ return "".concat(location.origin, "/yjbwebservice/core");
424
427
  };
425
- function getWebappsEnv(origin, fallback, useLocal) {
428
+ function getWebappsEnv(origin, fallback) {
426
429
  if (fallback === void 0) {
427
430
  fallback = Env.PROD;
428
431
  }
429
- if (useLocal === void 0) {
430
- useLocal = false;
431
- }
432
- var envRule = useLocal ? envRulesUseLocal : envRules;
433
- for (var _i = 0, _a = Object.entries(envRule); _i < _a.length; _i++) {
432
+ for (var _i = 0, _a = Object.entries(envRules); _i < _a.length; _i++) {
434
433
  var _b = _a[_i],
435
434
  env = _b[0],
436
435
  rules = _b[1];
437
- for (var _c = 0, _d = rules; _c < _d.length; _c++) {
438
- var rule = _d[_c];
439
- if (rule.test(origin) && origin) {
436
+ for (var _c = 0, rules_1 = rules; _c < rules_1.length; _c++) {
437
+ var rule = rules_1[_c];
438
+ if (rule.test(origin)) {
440
439
  return env;
441
440
  }
442
441
  }
443
442
  }
444
443
  return fallback;
445
444
  }
446
- function getEnv(useLocal) {
447
- if (useLocal === void 0) {
448
- useLocal = false;
449
- }
445
+ function getEnv() {
450
446
  // 默认webapps环境
451
447
  var host = WEBAPPS;
452
448
  var defaultEnv = {
@@ -467,8 +463,7 @@ function getEnv(useLocal) {
467
463
  }
468
464
  } else {
469
465
  var ORI = location.origin;
470
- defaultEnv.env = getWebappsEnv(ORI, Env.PROD, useLocal);
471
- console.log(1111, defaultEnv);
466
+ defaultEnv.env = getWebappsEnv(ORI);
472
467
  }
473
468
  return defaultEnv;
474
469
  }
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var index = require('./index-CvWGodSd.js');
3
+ var index = require('./index-m-V72yXx.js');
4
4
  require('ts-md5');
5
5
  require('weixin-js-sdk');
6
6
  require('clipboard');
package/dist/pure.js CHANGED
@@ -1,6 +1,6 @@
1
1
  'use strict';
2
2
 
3
- var index = require('./index-CvWGodSd.js');
3
+ var index = require('./index-m-V72yXx.js');
4
4
  require('ts-md5');
5
5
  require('weixin-js-sdk');
6
6
  require('clipboard');
@@ -30,7 +30,6 @@ var Env;
30
30
  Env["FZ"] = "fz";
31
31
  Env["PRE"] = "pre";
32
32
  Env["PROD"] = "prod";
33
- Env["LOCAL"] = "local";
34
33
  })(Env || (Env = {}));
35
34
  /**
36
35
  * appId枚举
@@ -117,10 +116,9 @@ var LinkParamsEnvEnum;
117
116
  LinkParamsEnvEnum[LinkParamsEnvEnum["REDIRECT"] = 2] = "REDIRECT";
118
117
  LinkParamsEnvEnum[LinkParamsEnvEnum["OPEN_APP"] = 3] = "OPEN_APP";
119
118
  })(LinkParamsEnvEnum || (LinkParamsEnvEnum = {}));
120
- 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);
121
- 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);
119
+ 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);
120
+ 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);
122
121
  var envRules = {
123
- local: [],
124
122
  dev: [/^https?:\/\/dev.*\.yjbtest\.com$/,
125
123
  // dev*.yjbtest.com
126
124
  /^https?:\/\/localhost(:\d+)?$/,
@@ -132,17 +130,5 @@ var envRules = {
132
130
  prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn,但排除 pre
133
131
  ]
134
132
  };
135
- var envRulesUseLocal = {
136
- local: [/^https?:\/\/localhost(:\d+)?$/,
137
- // localhost,支持端口号
138
- /^https?:\/\/172\.28\.\d+\.\d+(:\d+)?$/ // 172.28.*.*,支持端口号
139
- ],
140
- dev: [/^https?:\/\/dev.*\.yjbtest\.com$/ // dev*.yjbtest.com
141
- ],
142
- fz: [/^https?:\/\/fz.*\.yjbtest\.com$/],
143
- pre: [/^https?:\/\/pre.*\.yongjinbao\.com\.cn$/],
144
- prod: [/^https?:\/\/(?!pre).*\.yongjinbao\.com\.cn$/ // *.yongjinbao.com.cn,但排除 pre
145
- ]
146
- };
147
133
 
148
- 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 };
134
+ 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 };
@@ -1,7 +1,7 @@
1
1
  import AES from 'crypto-js/aes.js';
2
2
  import Utf8 from 'crypto-js/enc-utf8.js';
3
3
  import ECB from 'crypto-js/mode-ecb.js';
4
- import { PAYMENT_DOMAIN, WEBAPPS_HOST, Env, HYBRID, WEBAPPS, envRulesUseLocal, envRules } from './const.mjs';
4
+ import { Env, WEBAPPS_HOST, PAYMENT_DOMAIN, HYBRID, WEBAPPS, envRules } from './const.mjs';
5
5
 
6
6
  /**
7
7
  * 判断一个值是否是函数
@@ -41,11 +41,11 @@ function isWKWebView() {
41
41
  * @returns true 如果已就绪,否则 false
42
42
  */
43
43
  function isBridgeReady() {
44
- // Android
44
+ // Android
45
45
  if (window.yjbInterface && isFunction$2(window.yjbInterface.execute)) {
46
46
  return true;
47
47
  }
48
- // iOS
48
+ // iOS
49
49
  if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.yjbInterface && isFunction$2(window.webkit.messageHandlers.yjbInterface.postMessage)) {
50
50
  return true;
51
51
  }
@@ -118,39 +118,49 @@ function decrypt(value, key) {
118
118
  }
119
119
  // web登录设置
120
120
  var getWebappsPath = function getWebappsPath() {
121
- var env = getEnv(true).env;
122
- var hostStr = WEBAPPS_HOST[env];
121
+ var hostStr = '';
122
+ var reg = /^https?:\/\/(dev|fz|local)/g;
123
+ // 兼容不带dev,fz 的host
124
+ var matchRes = reg.exec(location.origin);
125
+ var mKey = matchRes ? matchRes[1] : null;
126
+ if (location.origin.includes('yongjinbao.com')) {
127
+ hostStr = WEBAPPS_HOST['prod'];
128
+ } else {
129
+ if (mKey) {
130
+ hostStr = WEBAPPS_HOST[mKey];
131
+ } else if (location.origin.includes('yjbtest.com')) {
132
+ hostStr = WEBAPPS_HOST['fz'];
133
+ }
134
+ }
123
135
  return "".concat(hostStr, "/yjbwebservice/core");
124
136
  };
125
137
  var getApiUrlPath = function getApiUrlPath() {
126
138
  if (window.Login_API_URL) return window.Login_API_URL;
127
- return getWebappsPath();
139
+ if (location.origin.indexOf('http') != 0 && window.envConfig) {
140
+ var env = window.envConfig.env || Env.PROD;
141
+ var hostStr = WEBAPPS_HOST[env];
142
+ return "".concat(hostStr, "/yjbwebservice/core");
143
+ }
144
+ return "".concat(location.origin, "/yjbwebservice/core");
128
145
  };
129
- function getWebappsEnv(origin, fallback, useLocal) {
146
+ function getWebappsEnv(origin, fallback) {
130
147
  if (fallback === void 0) {
131
148
  fallback = Env.PROD;
132
149
  }
133
- if (useLocal === void 0) {
134
- useLocal = false;
135
- }
136
- var envRule = useLocal ? envRulesUseLocal : envRules;
137
- for (var _i = 0, _a = Object.entries(envRule); _i < _a.length; _i++) {
150
+ for (var _i = 0, _a = Object.entries(envRules); _i < _a.length; _i++) {
138
151
  var _b = _a[_i],
139
152
  env = _b[0],
140
153
  rules = _b[1];
141
- for (var _c = 0, _d = rules; _c < _d.length; _c++) {
142
- var rule = _d[_c];
143
- if (rule.test(origin) && origin) {
154
+ for (var _c = 0, rules_1 = rules; _c < rules_1.length; _c++) {
155
+ var rule = rules_1[_c];
156
+ if (rule.test(origin)) {
144
157
  return env;
145
158
  }
146
159
  }
147
160
  }
148
161
  return fallback;
149
162
  }
150
- function getEnv(useLocal) {
151
- if (useLocal === void 0) {
152
- useLocal = false;
153
- }
163
+ function getEnv() {
154
164
  // 默认webapps环境
155
165
  var host = WEBAPPS;
156
166
  var defaultEnv = {
@@ -171,8 +181,7 @@ function getEnv(useLocal) {
171
181
  }
172
182
  } else {
173
183
  var ORI = location.origin;
174
- defaultEnv.env = getWebappsEnv(ORI, Env.PROD, useLocal);
175
- console.log(1111, defaultEnv);
184
+ defaultEnv.env = getWebappsEnv(ORI);
176
185
  }
177
186
  return defaultEnv;
178
187
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gjzq/sdk",
3
- "version": "1.4.0-beta.4",
3
+ "version": "1.5.0",
4
4
  "main": "dist/index.js",
5
5
  "module": "es/index.mjs",
6
6
  "types": "./dist/index.d.ts",