@lingxiteam/assets 1.0.9-alpha.4 → 1.0.9-xj

package/es/error/index.js

@@ -1,5 +1,4 @@
-import ErrorMsg from './errorDisplay/Web/ErrorMsg';
 import MobileErrorMsg from './errorDisplay/Mobile/ErrorMsg';
 import { getHttpErrorByCode } from './errorDisplay/compUtils';
 import errorCatch from './errorCatch';
-export { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch };
+export { MobileErrorMsg, getHttpErrorByCode, errorCatch };

package/es/index.d.ts

@@ -1,6 +1,6 @@
 import security from './security';
-import { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
+import { MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
 import { parseUrlExpression } from './utils/url';
 export declare const IconCheckSvg: string;
 export declare const IconNormalCheckSvg: string;
-export { security, ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch, parseUrlExpression };
+export { security, MobileErrorMsg, getHttpErrorByCode, errorCatch, parseUrlExpression };

package/es/index.js

@@ -1,7 +1,7 @@
 import { getSvgImageBase64 } from './utils/img';
 import security from './security';
-import { ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
+import { MobileErrorMsg, getHttpErrorByCode, errorCatch } from './error';
 import { parseUrlExpression } from './utils/url';
 export var IconCheckSvg = getSvgImageBase64("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"22px\" height=\"22px\" viewBox=\"0 0 22 22\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><title>\u5168\u5C40\u6837\u5F0F:20/\u539F\u5B50\u7EA7\u63A7\u4EF6/\u590D\u9009/\u72B6\u6001:#\u9009\u4E2D</title><g id=\"\u63A7\u4EF6\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><g id=\"system-complete\"><path d=\"M11,0 C17.075904,0 22,4.92409598 22,11 C22,17.075904 17.0734732,22 11,22 C4.92652679,22 0,17.0734732 0,11 C0,4.92652679 4.92409598,0 11,0 Z\" id=\"Shape\" fill=\"#1890FF\"></path><path d=\"M9.42871875,12.9681652 L7.2069029,10.7463493 C6.90006126,10.4395077 6.40257267,10.4395077 6.09573103,10.7463493 C5.78889035,11.05319 5.78889035,11.550677 6.09573103,11.8575177 C6.09573161,11.8575183 6.0957322,11.8575189 6.09573278,11.8575195 L8.72212536,14.4838955 C9.11265701,14.8744045 9.74581424,14.874407 10.136349,14.483901 L10.5404063,14.0798527 L10.5404063,14.0798527 L16.2813591,8.33795955 C16.588183,8.03108543 16.5881626,7.53359119 16.2813136,7.22674219 C15.974472,6.91990055 15.4769834,6.91990055 15.1701417,7.22674219 L9.42871875,12.9681652 L9.42871875,12.9681652 Z\" id=\"Path\" fill=\"#FFFFFF\"></path></g></g></svg>");
 export var IconNormalCheckSvg = getSvgImageBase64("<?xml version=\"1.0\" encoding=\"UTF-8\"?><svg width=\"22px\" height=\"22px\" viewBox=\"0 0 22 22\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><title>\u5168\u5C40\u6837\u5F0F:20/\u539F\u5B50\u7EA7\u63A7\u4EF6/\u590D\u9009/\u72B6\u6001:\u672A\u9009\u4E2D</title><g id=\"\u63A7\u4EF6\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><g id=\"\u5143\u7D20/\u9009\u62E9/\u672A\u9009\u4E2D\"><path d=\"M11,22 C4.93492502,22 0,17.0653546 0,10.999496 C0,4.9337633 4.93492502,0 11,0 C17.065075,0 22,4.93464539 22,10.999496 C22,17.0644725 17.0660846,22 11,22\" id=\"Fill\" fill=\"#FFFFFF\"></path><path d=\"M11,0.5 C13.8998633,0.5 16.5248731,1.67505184 18.4249106,3.57508938 C20.3249482,5.47512693 21.5,8.10013672 21.5,11 C21.5,13.8995696 20.3245821,16.5243277 18.4245965,18.4243132 C16.5242275,20.3246822 13.8989967,21.5 11,21.5 C8.10129687,21.5 5.47631792,20.324316 3.57600094,18.4239991 C1.67568396,16.5236821 0.5,13.8987031 0.5,11 C0.5,8.10100334 1.67531776,5.47577251 3.57568679,3.57540349 C5.47567234,1.67541793 8.10043037,0.5 11,0.5 Z\" id=\"Shape\" stroke=\"#CCCCCC\"></path></g></g></svg>");
-export { security, ErrorMsg, MobileErrorMsg, getHttpErrorByCode, errorCatch, parseUrlExpression };
+export { security, MobileErrorMsg, getHttpErrorByCode, errorCatch, parseUrlExpression };

package/es/security/encipher/aes.d.ts

@@ -1,2 +1,2 @@
 export declare const AESEncrypt: (value: any, aesKey: string, handle?: any) => any;
-export declare const AESDecrypt: (value: string, aesKey: string, handle?: any) => any;
+export declare const AESDecrypt: (value: string, aesKey: string, handle?: any) => string;

package/es/security/encipher/aes.js

@@ -1,26 +1,6 @@
-import CryptoJS from 'crypto-js';
 export var AESEncrypt = function AESEncrypt(value, aesKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, aesKey, CryptoJS);
-  }
-  var key = CryptoJS.enc.Utf8.parse(aesKey);
-  var ciphertext = CryptoJS.enc.Utf8.parse(value);
-  var encrypted = CryptoJS.AES.encrypt(ciphertext, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return encrypted.toString();
+  return value;
 };
 export var AESDecrypt = function AESDecrypt(value, aesKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, aesKey, CryptoJS);
-  }
-  var key = CryptoJS.enc.Utf8.parse(aesKey);
-  var ciphertext = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Base64.parse(value));
-  // const ciphertext = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Base64.parse(CryptoJS.enc.Utf8.parse(value).toString(CryptoJS.enc.Utf8)));
-  var encrypted = CryptoJS.AES.decrypt(ciphertext, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return encrypted.toString(CryptoJS.enc.Utf8);
+  return value;
 };

package/es/security/encipher/des.d.ts

@@ -1,2 +1,2 @@
-export declare const DESEncrypt: (value: string, aesKey: string, handle?: any) => any;
-export declare const DESDecrypt: (value: string, aesKey: string, handle?: any) => any;
+export declare const DESEncrypt: (value: string, aesKey: string, handle?: any) => string;
+export declare const DESDecrypt: (value: string, aesKey: string, handle?: any) => string;

package/es/security/encipher/des.js

@@ -1,25 +1,6 @@
-import CryptoJS from 'crypto-js';
 export var DESEncrypt = function DESEncrypt(value, aesKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, aesKey, CryptoJS);
-  }
-  var key = CryptoJS.enc.Utf8.parse(aesKey);
-  var ciphertext = CryptoJS.enc.Utf8.parse(value);
-  var encrypted = CryptoJS.DES.encrypt(ciphertext, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return encrypted.toString();
+  return value;
 };
 export var DESDecrypt = function DESDecrypt(value, aesKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, aesKey, CryptoJS);
-  }
-  var key = CryptoJS.enc.Utf8.parse(aesKey);
-  var ciphertext = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Base64.parse(value));
-  var encrypted = CryptoJS.DES.decrypt(ciphertext, key, {
-    mode: CryptoJS.mode.ECB,
-    padding: CryptoJS.pad.Pkcs7
-  });
-  return encrypted.toString(CryptoJS.enc.Utf8);
+  return value;
 };

package/es/security/encipher/rsa.d.ts

@@ -1,2 +1,2 @@
-export declare const RSAEncrypt: (value: string, publicKey: string, handle?: any) => any;
-export declare const RSADecrypt: (value: string, privKey: string, handle?: any) => any;
+export declare const RSAEncrypt: (value: string, publicKey: string, handle?: any) => string;
+export declare const RSADecrypt: (value: string, privKey: string, handle?: any) => string;

package/es/security/encipher/rsa.js

@@ -1,17 +1,6 @@
-import JSEncrypt from 'jsencrypt';
 export var RSAEncrypt = function RSAEncrypt(value, publicKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, publicKey, JSEncrypt);
-  }
-  var encryptor = new JSEncrypt();
-  encryptor.setPublicKey(publicKey);
-  return encryptor.encrypt(value);
+  return value;
 };
 export var RSADecrypt = function RSADecrypt(value, privKey, handle) {
-  if (typeof handle === 'function') {
-    return handle(value, privKey, JSEncrypt);
-  }
-  var decrypt = new JSEncrypt();
-  decrypt.setPrivateKey(privKey);
-  return decrypt.decrypt(value);
+  return value;
 };

package/es/security/encipher/sign.js

@@ -7,6 +7,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { sha256 } from 'js-sha256';
 import { obj2QueryString } from '../../utils/url';
+import CookieUtil from '../../utils/cookieUtil';
 var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9RWfzCS';
 // 注意：修改此文件请跑测试用例, npm run test
 // 1、签名算法：
@@ -29,6 +30,7 @@ var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9R
 // 由于X-B 的规则可能被业务网关使用，并往请求头增加内容，导致前后端加密不一致
 // 2022.08.09 使用以下3个固定值 + X-LX-*匹配 方式
 var hKeys = ['X-B-AUTH', 'X-B-TARGET-ID', 'APP-ID'];
+var userKeyInCookie = process.env.LING_XI_USER_KEY_IN_COOKIE || 'X-LX-N-ID';
 // 配置指定接口前缀,2023-03-16规则调整，不需要使用
 // const apiPrefix =
 //   process.env.LING_XI_HTTP_SIGN_API_PERFIX ||
@@ -77,8 +79,10 @@ export var createHttpSignStr = function createHttpSignStr(url, options) {
   } else {
     params = _typeof(body) === 'object' ? JSON.stringify(body) : body;
   }
+  // 获取参数4: 用户id
+  var userId = CookieUtil.get(userKeyInCookie) || '';
   // 组装加密字符串
-  var str = [apiPath, headerParams, params, SIGN_KEY].join('#');
+  var str = [apiPath, headerParams, params, userId, SIGN_KEY].join('#');
   if (typeof window !== 'undefined' && (window.lxDebug || window.localStorage.getItem('lxDebug'))) {
     console.log(' --- signDebug ---');
     console.log('url', url);

package/es/security/index.d.ts

@@ -22,12 +22,12 @@ declare const _default: {
         createHttpSignStr: (url: string, options: any) => string;
         getApiPath: (url: string) => string | undefined;
     };
-    RSAEncrypt: (value: string, publicKey: string, handle?: any) => any;
-    RSADecrypt: (value: string, privKey: string, handle?: any) => any;
+    RSAEncrypt: (value: string, publicKey: string, handle?: any) => string;
+    RSADecrypt: (value: string, privKey: string, handle?: any) => string;
     AESEncrypt: (value: any, aesKey: string, handle?: any) => any;
-    AESDecrypt: (value: string, aesKey: string, handle?: any) => any;
-    DESEncrypt: (value: string, aesKey: string, handle?: any) => any;
-    DESDecrypt: (value: string, aesKey: string, handle?: any) => any;
+    AESDecrypt: (value: string, aesKey: string, handle?: any) => string;
+    DESEncrypt: (value: string, aesKey: string, handle?: any) => string;
+    DESDecrypt: (value: string, aesKey: string, handle?: any) => string;
     KEYS: {
         signKey: string;
         rsaPublicKey: string | undefined;

package/es/utils/cookieUtil.js

@@ -0,0 +1,36 @@
+var CookieUtil = {
+  get: function get(name) {
+    var cookieName = "".concat(encodeURIComponent(name), "=");
+    var cookieStart = document.cookie.indexOf(cookieName);
+    var cookieValue = null;
+    var cookieEnd;
+    if (cookieStart > -1) {
+      cookieEnd = document.cookie.indexOf(';', cookieStart);
+      if (cookieEnd === -1) {
+        cookieEnd = document.cookie.length;
+      }
+      cookieValue = decodeURIComponent(document.cookie.substring(cookieStart + cookieName.length, cookieEnd));
+    }
+    return cookieValue;
+  },
+  set: function set(name, value, expires, path, domain, secure) {
+    var cookieText = "".concat(encodeURIComponent(name), "=").concat(encodeURIComponent(value));
+    if (expires instanceof Date) {
+      cookieText += "; expires=".concat(expires.toGMTString());
+    }
+    if (path) {
+      cookieText += "; path=".concat(path);
+    }
+    if (domain) {
+      cookieText += "; domain=".concat(domain);
+    }
+    if (secure) {
+      cookieText += '; secure';
+    }
+    document.cookie = cookieText;
+  },
+  unset: function unset(name, path, domain, secure) {
+    this.set(name, '', new Date(0), path, domain, secure);
+  }
+};
+export default CookieUtil;

package/lib/index.js

@@ -3,12 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "ErrorMsg", {
-  enumerable: true,
-  get: function get() {
-    return _error.ErrorMsg;
-  }
-});
 exports.IconNormalCheckSvg = exports.IconCheckSvg = void 0;
 Object.defineProperty(exports, "MobileErrorMsg", {
   enumerable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/assets",
-  "version": "1.0.9-alpha.4",
+  "version": "1.0.9-xj",
   "description": "灵犀低代码平台移动端 - 工具类",
   "main": "lib/index.js",
   "module": "es/index.js",