egova-admin-jssdk 0.0.7 → 0.0.9

package/dist/service/index.js

@@ -1,7 +1,7 @@
 import { adminAxios } from "../util/axios-util";
 import { isNil } from "lodash-es";
 import { saltData } from "../util/global";
-import { crypto } from "@/util/crypto";
+import { crypto } from "../util/crypto";
 /**
  * 获取部门人员
  * @param params
@@ -55,7 +55,8 @@ export function getPublicKey() {
  */
 export async function changeUserCryptogram(oldPwd, newPwd) {
     if (!saltData.publicKey) {
-        const publicKeyRes = await getPublicKey();
+        const responseData = await getPublicKey();
+        const publicKeyRes = responseData.data;
         if (publicKeyRes && !publicKeyRes.hasError) {
             let data = publicKeyRes.result?.data || [];
             if (data && data.length === 2) {

package/lib/egova-admin-jssdk.mjs

@@ -7,7 +7,7 @@ import A from "crypto-js";
 import I from "qs";
 import { toRaw as C } from "vue";
 import { sm4 as E, sm2 as V } from "sm-crypto";
-/*! egova-admin-jssdk v0.0.7 */
+/*! egova-admin-jssdk v0.0.9 */
 function f(r) {
   return r instanceof Element ? "element" : Object.prototype.toString.call(r).replace(/\[object\s(.+)\]/, "$1").toLowerCase();
 }
@@ -25,7 +25,7 @@ class N {
    */
   randomStr(t) {
     const e = Math.ceil(t / 2), n = new Uint8Array(e);
-    return window.crypto.getRandomValues(n), Array.from(n).map((i) => i.toString(16).padStart(2, "0")).join("").substr(0, t);
+    return window.crypto.getRandomValues(n), Array.from(n).map((c) => c.toString(16).padStart(2, "0")).join("").substr(0, t);
   }
   /**
    * 随机生成len长度的纯数字字符串，比如randomNumberStr(16)得到 "1842442170233672"
@@ -44,12 +44,12 @@ class N {
    * @param len
    */
   getRandomPassword(t) {
-    const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZ", n = "abcdefghijklmnopqrstuvwxyz", o = "0123456789", s = ".~!@#$%^&*)(_+}{|:?><", i = e + n + o + s;
-    let a = "";
-    a += this.getRandomChar(e), a += this.getRandomChar(n), a += this.getRandomChar(o), a += this.getRandomChar(s);
-    for (let c = a.length; c < t; c++)
-      a += this.getRandomChar(i);
-    return a = a.split("").sort(() => U(!0) - 0.5).join(""), a;
+    const e = "ABCDEFGHIJKLMNOPQRSTUVWXYZ", n = "abcdefghijklmnopqrstuvwxyz", o = "0123456789", s = ".~!@#$%^&*)(_+}{|:?><", c = e + n + o + s;
+    let i = "";
+    i += this.getRandomChar(e), i += this.getRandomChar(n), i += this.getRandomChar(o), i += this.getRandomChar(s);
+    for (let a = i.length; a < t; a++)
+      i += this.getRandomChar(c);
+    return i = i.split("").sort(() => U(!0) - 0.5).join(""), i;
   }
   getRandomChar(t) {
     const e = Math.floor(U(!0) * t.length);
@@ -57,7 +57,7 @@ class N {
   }
 }
 const k = new N();
-class H {
+class D {
   /**
    * 清除 url 中重复的斜杠
    * @param url 链接地址
@@ -68,8 +68,8 @@ class H {
     return t.replace(/([^:]|^)\/{2,}/g, "$1/");
   }
 }
-const P = new H();
-class D {
+const P = new D();
+class H {
   constructor(t) {
     /**
      * 应用标识
@@ -138,8 +138,8 @@ class D {
     const o = f(n);
     if (o === "object") {
       const s = Object.keys(n).sort();
-      s.length === 0 ? t.push(`${e}={}`) : s.forEach((i) => {
-        this.formatEncodeParam(t, e === "" ? `${i}` : `${e}[${i}]`, n[i]);
+      s.length === 0 ? t.push(`${e}={}`) : s.forEach((c) => {
+        this.formatEncodeParam(t, e === "" ? `${c}` : `${e}[${c}]`, n[c]);
       });
     } else o === "array" ? n.length === 0 ? t.push(`${e}=[]`) : n.forEach((s) => {
       this.formatEncodeParam(t, `${e}[]`, s);
@@ -180,8 +180,8 @@ class D {
     try {
       const { pathname: e, origin: n } = new URL(t, window.location.origin), o = this.urlSearchParams(t), s = this.generateSignatureOption();
       u(o, s);
-      const i = this.sortParamByKey(o), c = `${P.cleanUrl(`/${e}`)}?${i}`, m = this.cryptoHash(c);
-      t = `${n}${c}&signature=${m}`;
+      const c = this.sortParamByKey(o), a = `${P.cleanUrl(`/${e}`)}?${c}`, m = this.cryptoHash(a);
+      t = `${n}${a}&signature=${m}`;
     } catch {
       console.error("签名失败，请使用有效的链接", t);
     }
@@ -196,35 +196,35 @@ class D {
   signatureConfig(t) {
     var e, n, o, s;
     try {
-      const a = ((e = t.method) == null ? void 0 : e.toUpperCase()) === "GET", c = C(t.data), m = c !== null && typeof c == "object", b = ((o = (n = t.headers) == null ? void 0 : n["Content-Type"]) == null ? void 0 : o.toString()) || "", O = b.includes("multipart/form-data");
+      const i = ((e = t.method) == null ? void 0 : e.toUpperCase()) === "GET", a = C(t.data), m = a !== null && typeof a == "object", b = ((o = (n = t.headers) == null ? void 0 : n["Content-Type"]) == null ? void 0 : o.toString()) || "", O = b.includes("multipart/form-data");
       let S = b.includes("application/json");
-      !a && !b && m && (S = !0), u(t, { headers: { "App-Id": this.appIdCode.id } });
+      !i && !b && m && (S = !0), u(t, { headers: { "App-Id": this.appIdCode.id } });
       const g = {}, j = this.urlSearchParams(t.url);
       if (u(g, j), !h(t.params)) {
         const l = C(t.params);
         this.removeNilValue(l), t.params = l, u(g, I.parse(I.stringify(l)));
       }
-      !h(c) && m && !O && !S && u(g, c);
+      !h(a) && m && !O && !S && u(g, a);
       const w = this.generateSignatureOption();
       u(g, w);
       let $ = this.sortParamByKey(g);
       if (S) {
-        const l = JSON.stringify(c);
-        this.isStringOverKB(l, 128) || (m ? $ += this.formatEncodeValue(l) : $ += this.formatEncodeValue(c));
+        const l = JSON.stringify(a);
+        this.isStringOverKB(l, 128) || (m ? $ += this.formatEncodeValue(l) : $ += this.formatEncodeValue(a));
       }
       let x = "";
       (s = t.url) != null && s.startsWith("http") ? x = t.url : x = `${t.baseURL}/${t.url || ""}`;
       const { pathname: T } = new URL(x, window.location.origin), v = `${P.cleanUrl(`/${T}`)}?${$}`;
       w.signature = this.cryptoHash(v), t.params = u({}, t.params, w);
-    } catch (i) {
-      console.error("签名失败", i);
+    } catch (c) {
+      console.error("签名失败", c);
     }
   }
 }
 const z = {
   id: "mis",
   code: "c9d8e36df18ef01ff0da74e0bb13151c"
-}, F = new D(z);
+}, F = new H(z);
 class M {
   constructor() {
     p(this, "axiosInstance");
@@ -335,7 +335,7 @@ function q() {
 async function it(r, t) {
   var o, s;
   if (!d.publicKey) {
-    const i = await q();
+    const i = (await q()).data;
     if (i && !i.hasError) {
       let a = ((o = i.result) == null ? void 0 : o.data) || [];
       a.length === 2 && (d.type = a[0], d.publicKey = a[1]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egova-admin-jssdk",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "private": false,
   "scripts": {
     "build": "run-p type-check build-lib build-type",