light-h5-core-lib 2.7.2 → 2.7.5

package/LightCore.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CryptUtil = exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.PoolObj = void 0;
+exports.BeizerUtil = exports.UniqueIDUtil = exports.StringUtil = exports.RandomNumUtil = exports.FloatDigitUtil = exports.DateUtil = exports.BitUtil = exports.MD5 = exports.BaseSingleton = exports.PoolObj = void 0;
 var PoolObj_1 = require("./pool/PoolObj");
 Object.defineProperty(exports, "PoolObj", { enumerable: true, get: function () { return PoolObj_1.PoolObj; } });
 var BaseSingleton_1 = require("./common/base/BaseSingleton");
@@ -19,8 +19,6 @@ var UniqueIDUtil_1 = require("./common/util/UniqueIDUtil");
 Object.defineProperty(exports, "UniqueIDUtil", { enumerable: true, get: function () { return UniqueIDUtil_1.UniqueIDUtil; } });
 var BeizerUtil_1 = require("./common/util/BeizerUtil");
 Object.defineProperty(exports, "BeizerUtil", { enumerable: true, get: function () { return BeizerUtil_1.BeizerUtil; } });
-var CryptUtil_1 = require("./common/util/CryptUtil");
-Object.defineProperty(exports, "CryptUtil", { enumerable: true, get: function () { return CryptUtil_1.CryptUtil; } });
 var MD5_1 = require("./common/md5/MD5");
 Object.defineProperty(exports, "MD5", { enumerable: true, get: function () { return MD5_1.MD5; } });
 module.exports = {
@@ -34,5 +32,4 @@ module.exports = {
     StringUtil: StringUtil_1.StringUtil,
     UniqueIDUtil: UniqueIDUtil_1.UniqueIDUtil,
     BeizerUtil: BeizerUtil_1.BeizerUtil,
-    CryptUtil: CryptUtil_1.CryptUtil,
 };

package/common/util/CryptUtil.js

@@ -1,8 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CryptUtil = void 0;
-var crypto_ts_1 = require("crypto-ts");
-var MD5_1 = require("../md5/MD5");
+var crypto_es_1 = __importDefault(require("crypto-es"));
 /**
  * 加解密工具
  * @author Aonaufly
@@ -13,32 +15,28 @@ var CryptUtil = /** @class */ (function () {
     //#region AES-256 ECB
     /** 加密函数AES-256 ECB */
     CryptUtil.encryptAes = function (plainText, key) {
-        // 将密钥转换为 CryptoJS 格式的字节数组
-        var keyBytes = crypto_ts_1.enc.Utf8.parse(key);
-        // 使用 AES 加密，ECB 模式，Pkcs7 填充
-        var encrypted = crypto_ts_1.AES.encrypt(plainText, keyBytes, {
-            mode: crypto_ts_1.mode.ECB,
-            padding: crypto_ts_1.pad.PKCS7,
+        var keyBytes = crypto_es_1.default.enc.Utf8.parse(key);
+        var encrypted = crypto_es_1.default.AES.encrypt(crypto_es_1.default.enc.Utf8.parse(plainText), keyBytes, {
+            mode: crypto_es_1.default.mode.ECB,
+            padding: crypto_es_1.default.pad.Pkcs7,
         });
-        // 将加密结果转换为 base64 编码的字符串
         return encrypted.toString();
     };
     /**解密函数AES-256 ECB*/
     CryptUtil.decryptAes = function (cipherText, key) {
-        // 将密钥转换为 CryptoJS 格式的字节数组
-        var keyBytes = crypto_ts_1.enc.Utf8.parse(key);
-        // 使用 AES 解密，ECB 模式，Pkcs7 填充
-        var decrypted = crypto_ts_1.AES.decrypt(cipherText, keyBytes, {
-            mode: crypto_ts_1.mode.ECB,
-            padding: crypto_ts_1.pad.PKCS7,
+        var keyBytes = crypto_es_1.default.enc.Utf8.parse(key);
+        var decrypted = crypto_es_1.default.AES.decrypt(cipherText, keyBytes, {
+            mode: crypto_es_1.default.mode.ECB,
+            padding: crypto_es_1.default.pad.Pkcs7,
         });
-        // 将解密结果转换为 UTF-8 编码的字符串
-        return decrypted.toString(crypto_ts_1.enc.Utf8);
+        return crypto_es_1.default.enc.Utf8.stringify(decrypted);
     };
     //#endregion
-    // MD5 哈希函数
-    CryptUtil.md5 = function (input) {
-        return MD5_1.MD5.getInstance(MD5_1.MD5).hex_md5(input);
+    /**
+     * MD5
+     */
+    CryptUtil.md5 = function (text) {
+        return crypto_es_1.default.MD5(text).toString();
     };
     return CryptUtil;
 }());

package/common/util/RandomNumUtil.js

@@ -9,7 +9,7 @@ var RandomNumUtil = /** @class */ (function () {
     function RandomNumUtil() {
     }
     /**
-     * 获取一定方位的随机整数
+     * 获取一定范围的随机整数
      *
      * <b>( min ≤ r ≤ max )</b>
      *
@@ -35,6 +35,20 @@ var RandomNumUtil = /** @class */ (function () {
             return isInt ? min : Math.round(min);
         }
     };
+    /**
+     * 打乱数组
+     */
+    RandomNumUtil.shuffleSort = function (arr) {
+        var n = arr.length;
+        var index;
+        var temp;
+        while (n--) {
+            index = Math.floor(Math.random() * n);
+            temp = arr[index];
+            arr[index] = arr[n];
+            arr[n] = temp;
+        }
+    };
     return RandomNumUtil;
 }());
 exports.RandomNumUtil = RandomNumUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "light-h5-core-lib",
-    "version": "2.7.2",
+    "version": "2.7.5",
     "description": "light core lib",
     "main": "./LightCore.js",
     "types": "./type/index.d.ts",
@@ -14,7 +14,5 @@
     ],
     "author": "Aonaufly",
     "license": "ISC",
-    "dependencies": {
-        "crypto-ts": "^1.0.2"
-    }
+    "dependencies": {}
 }

package/type/index.d.ts

@@ -125,7 +125,7 @@ export declare class FloatDigitUtil {
  */
 export declare class RandomNumUtil {
 	/**
-	 * 获取一定方位的随机整数
+	 * 获取一定范围的随机整数
 	 *
 	 * <b>( min ≤ r ≤ max )</b>
 	 *
@@ -134,6 +134,10 @@ export declare class RandomNumUtil {
 	 * @param isInt 是否返回整数
 	 */
 	static randomNumBoth(min: number, max: number, isInt?: boolean): number;
+	/**
+	 * 打乱数组
+	 */
+	static shuffleSort<T>(arr: T[]): void;
 }
 /**
  * 字符串工具
@@ -194,17 +198,6 @@ export declare class BeizerUtil {
 	}[], precision?: number): number;
 	private static getBezierPoint;
 }
-/**
- * 加解密工具
- * @author Aonaufly
- */
-export declare class CryptUtil {
-	/** 加密函数AES-256 ECB */
-	static encryptAes(plainText: string, key: string): string;
-	/**解密函数AES-256 ECB*/
-	static decryptAes(cipherText: string, key: string): string;
-	static md5(input: string): string;
-}
 export declare class MD5 extends BaseSingleton<MD5> {
 	private hexcase;
 	private b64pad;