xctc-utils 1.1.2 → 1.1.4

package/app.ts

@@ -5,10 +5,18 @@
 // ts-node app.ts
 import {formatTimeStamp,formatStrTime} from "./src/time"
 import {weixinUrlCode} from "./src/weixin"
-import {decrypt} from "./src/crypto"
+import {decrypt,encrypt} from "./src/crypto"
+
+const congif = {
+    path:"/setting/setting-config/setting-config-index",
+    id:12,
+    type:"shop"
+}
+// let word = encrypt( congif  ,"5uMz4R8r0926DkC8","5uMz4R8r0926DkC8")
+// console.log(word)
 
 let word = "8CF99EE640F8175269E6B83795902CAD2DCA8039E5FED78C9F16CA17501F37DB95F7B899A88A99075FB8D84C64AE65DCAC82FF4B039D6D7ACCF952F63A3BB7267CDDAC4202D4986DD5DB69D67DEDE440"
-let val = decrypt(word,"5uMz4R8rop26DkC8","5uMz4Rsd0926DkC8")
+let val = decrypt( word )
 console.log("val",val)
 function app(){
     console.log("xxxx")

package/dist/crypto/index.d.ts

@@ -1,2 +1,2 @@
-export declare function encrypt(word: any, key: any, iv: any): string;
-export declare function decrypt(word: any, key: any, iv: any): any;
+export declare function encrypt(word: any, key?: any, iv?: any): string;
+export declare function decrypt(word: any, key?: any, iv?: any): any;

package/dist/weixin/index.js

@@ -7,9 +7,12 @@ var utils_1 = require("../utils");
 var crypto_1 = require("../crypto");
 var w = window;
 var loc = w.location;
+var defaultKey = "5uMz4R8rop26DkC8";
+var defaultIv = "5uMz4Rsd0926DkC8";
 var weixinConfig = {};
 function weixinUrlCode(config) {
-    weixinConfig = config;
+    weixinConfig = config || {};
+    var cryptoiv = weixinConfig.cryptoiv, cryptokey = weixinConfig.cryptokey;
     var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     // 获取地址栏返回 code 参数
     var codeKey = weixinConfig['codeKey'];
@@ -44,7 +47,10 @@ function weixinUrlCode(config) {
                     hrefState = item.substr(6);
                     var stateKey = weixinConfig['stateKey'] || "weixinState";
                     w.sessionStorage.setItem(stateKey, hrefState);
-                    w.sessionStorage.setItem("".concat(stateKey, "Obj"), (0, crypto_1.decrypt)(hrefState, cryptoConfig().key, cryptoConfig().iv));
+                    var stateObj = (0, crypto_1.decrypt)(hrefState, cryptoConfig(cryptokey).key, cryptoConfig(cryptoiv).iv);
+                    if (stateObj instanceof Object)
+                        stateObj = JSON.stringify(stateObj);
+                    w.sessionStorage.setItem("".concat(stateKey, "Obj"), stateObj);
                 }
             }
         }
@@ -53,12 +59,11 @@ function weixinUrlCode(config) {
     }
 }
 exports.weixinUrlCode = weixinUrlCode;
-function cryptoConfig() {
-    var key = "5uMz4R8rop26DkC8", iv = "5uMz4Rsd0926DkC8";
-    if (weixinConfig['cryptoiv'])
-        iv = weixinConfig.cryptoiv;
-    if (weixinConfig['cryptokey'])
-        key = weixinConfig.cryptokey;
+function cryptoConfig(key, iv) {
+    if (!key)
+        key = defaultKey;
+    if (!iv)
+        key = defaultIv;
     return {
         key: key,
         iv: iv,
@@ -218,7 +223,7 @@ function weixinShareInit(options) {
         var state = "";
         if (options === null || options === void 0 ? void 0 : options.data) {
             var data = options.data;
-            state = (0, crypto_1.encrypt)(data, options['key'], options['iv']);
+            state = (0, crypto_1.encrypt)(data, cryptoConfig(options['key']).key, cryptoConfig(options['iv']).iv);
             link = "".concat(link, "?state=").concat(state);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",