egova-admin-jssdk 0.0.6 → 0.0.7

package/dist/service/index.d.ts

@@ -16,3 +16,15 @@ export declare function getUnitTree(params: UnitParams): Promise<import("axios")
  * @returns
  */
 export declare function countUnitHuman(params: CountParams): Promise<import("axios").AxiosResponse<any, any>> | undefined;
+/**
+ * 获取加密方式和公钥
+ * @returns
+ */
+export declare function getPublicKey(): Promise<import("axios").AxiosResponse<any, any>> | undefined;
+/**
+ * 修改用户密码,sdk中会自动进行密码加密，外部无需对密码进行加密
+ * @param oldPwd 旧密码
+ * @param newPwd 新密码
+ * @returns
+ */
+export declare function changeUserCryptogram(oldPwd: string, newPwd: string): Promise<import("axios").AxiosResponse<any, any> | undefined>;

package/dist/service/index.js

@@ -1,5 +1,7 @@
 import { adminAxios } from "../util/axios-util";
 import { isNil } from "lodash-es";
+import { saltData } from "../util/global";
+import { crypto } from "@/util/crypto";
 /**
  * 获取部门人员
  * @param params
@@ -38,3 +40,38 @@ export function countUnitHuman(params) {
     const result = paramsList.length ? `${url}?${paramsList.join("&")}` : url;
     return adminAxios.getAxiosInstance()?.post(result, params.ids);
 }
+/**
+ * 获取加密方式和公钥
+ * @returns
+ */
+export function getPublicKey() {
+    return adminAxios.getAxiosInstance()?.get("/free/oauth/getalgandpublickey");
+}
+/**
+ * 修改用户密码,sdk中会自动进行密码加密，外部无需对密码进行加密
+ * @param oldPwd 旧密码
+ * @param newPwd 新密码
+ * @returns
+ */
+export async function changeUserCryptogram(oldPwd, newPwd) {
+    if (!saltData.publicKey) {
+        const publicKeyRes = await getPublicKey();
+        if (publicKeyRes && !publicKeyRes.hasError) {
+            let data = publicKeyRes.result?.data || [];
+            if (data && data.length === 2) {
+                saltData.type = data[0];
+                saltData.publicKey = data[1];
+            }
+        }
+    }
+    let oldPwdEncrypt = oldPwd;
+    let newPwdEncrypt = newPwd;
+    if (saltData.publicKey) {
+        oldPwdEncrypt = await crypto.sm2Encrypt(oldPwd, saltData.publicKey);
+        newPwdEncrypt = await crypto.sm2Encrypt(newPwd, saltData.publicKey);
+    }
+    return adminAxios.getAxiosInstance()?.post("/unity/org/human/changeuserowncryptogram", {
+        cryptogram: newPwdEncrypt,
+        cryptogramOld: oldPwdEncrypt
+    });
+}

package/dist/util/crypto.d.ts

@@ -0,0 +1,35 @@
+import type { SM4ModeBase, SM4Mode_StringOutput, UTF8String } from "sm-crypto";
+/**
+ * Crypto 加密
+ * @public
+ */
+export declare class Crypto {
+    constructor(key: string);
+    private key;
+    /**
+     * 加密数据
+     * @param inArray - 加密数据
+     * @param mode - 加密模式
+     * @returns 加密结果
+     */
+    encrypt(inArray: number[] | UTF8String, mode?: SM4ModeBase | SM4Mode_StringOutput): string;
+    /**
+     * 解密数据
+     * @param inArray - 解密数据
+     * @param mode - 解密模式
+     * @returns 解密结果
+     */
+    decrypt(inArray: number[] | UTF8String, mode?: SM4ModeBase | SM4Mode_StringOutput): string;
+    /**
+     * sm2 加密数据 (登录时对密码的加密)
+     * @param msg
+     * @param publicKey
+     * @returns
+     */
+    sm2Encrypt(msg: string, publicKey?: string): Promise<string>;
+}
+/**
+ * Crypto 加密实例
+ * @public
+ */
+export declare const crypto: Crypto;

package/dist/util/crypto.js

@@ -0,0 +1,54 @@
+/* eslint-disable camelcase */
+import { sm2, sm4 } from "sm-crypto";
+const key = "0123456789abcdeffedcba9876543210";
+/**
+ * Crypto 加密
+ * @public
+ */
+export class Crypto {
+    constructor(key) {
+        this.key = key;
+    }
+    key;
+    /**
+     * 加密数据
+     * @param inArray - 加密数据
+     * @param mode - 加密模式
+     * @returns 加密结果
+     */
+    encrypt(inArray, mode) {
+        return sm4.encrypt(inArray, this.key, mode);
+    }
+    /**
+     * 解密数据
+     * @param inArray - 解密数据
+     * @param mode - 解密模式
+     * @returns 解密结果
+     */
+    decrypt(inArray, mode) {
+        return sm4.decrypt(inArray, this.key, mode);
+    }
+    /**
+     * sm2 加密数据 (登录时对密码的加密)
+     * @param msg
+     * @param publicKey
+     * @returns
+     */
+    async sm2Encrypt(msg, publicKey) {
+        try {
+            if (!publicKey) {
+                return Promise.reject(new Error("无法获取加密密钥"));
+            }
+            const encryptData = sm2.doEncrypt(msg, publicKey, 1);
+            return Promise.resolve(encryptData);
+        }
+        catch (error) {
+            return Promise.reject(error);
+        }
+    }
+}
+/**
+ * Crypto 加密实例
+ * @public
+ */
+export const crypto = new Crypto(key);

package/dist/util/global.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 定义的加密方式和密钥
+ */
+export declare const saltData: {
+    type: string;
+    publicKey: string;
+};

package/dist/util/global.js

@@ -0,0 +1,7 @@
+/**
+ * 定义的加密方式和密钥
+ */
+export const saltData = {
+    type: "sm2WithSalt",
+    publicKey: ""
+};

package/lib/egova-admin-jssdk.mjs

@@ -1,16 +1,17 @@
-var j = Object.defineProperty;
-var B = (r, t, e) => t in r ? j(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var p = (r, t, e) => B(r, typeof t != "symbol" ? t + "" : t, e);
-import E from "axios";
-import { random as I, merge as u, isNil as d } from "lodash-es";
-import U from "crypto-js";
-import b from "qs";
-import { toRaw as A } from "vue";
-/*! egova-admin-jssdk v0.0.6 */
-function g(r) {
+var B = Object.defineProperty;
+var K = (r, t, e) => t in r ? B(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
+var p = (r, t, e) => K(r, typeof t != "symbol" ? t + "" : t, e);
+import L from "axios";
+import { random as U, merge as u, isNil as h } from "lodash-es";
+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 */
+function f(r) {
   return r instanceof Element ? "element" : Object.prototype.toString.call(r).replace(/\[object\s(.+)\]/, "$1").toLowerCase();
 }
-class v {
+class N {
   /**
    * 等价于Math.random()
    * @returns
@@ -48,15 +49,15 @@ class v {
     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(() => I(!0) - 0.5).join(""), a;
+    return a = a.split("").sort(() => U(!0) - 0.5).join(""), a;
   }
   getRandomChar(t) {
-    const e = Math.floor(I(!0) * t.length);
+    const e = Math.floor(U(!0) * t.length);
     return t[e];
   }
 }
-const L = new v();
-class V {
+const k = new N();
+class H {
   /**
    * 清除 url 中重复的斜杠
    * @param url 链接地址
@@ -67,8 +68,8 @@ class V {
     return t.replace(/([^:]|^)\/{2,}/g, "$1/");
   }
 }
-const C = new V();
-class N {
+const P = new H();
+class D {
   constructor(t) {
     /**
      * 应用标识
@@ -85,7 +86,7 @@ class N {
    * @returns
    */
   generateRandomString() {
-    return L.randomStr(8);
+    return k.randomStr(8);
   }
   /**
    * 生成签名参数
@@ -109,10 +110,10 @@ class N {
    * @returns
    */
   removeNilValue(t) {
-    if (g(t) === "object") {
+    if (f(t) === "object") {
       for (const e in t)
         if (Object.prototype.hasOwnProperty.call(t, e)) {
-          const n = t[e], o = g(n);
+          const n = t[e], o = f(n);
           o === "object" ? this.removeNilValue(n) : (o === "null" || o === "undefined" || o === "function") && delete t[e];
         }
     }
@@ -123,7 +124,7 @@ class N {
    * @returns
    */
   formatEncodeValue(t) {
-    const e = g(t);
+    const e = f(t);
     return encodeURIComponent(e === "undefined" || e === "function" ? "" : t).replace(/%00/g, "\0").replace(/%2B/g, "+").replace(/%20/g, "+").replace(/\(/g, "%28").replace(/\)/g, "%29").replace(/'/g, "%27").replace(/!/g, "%21").replace(/~/g, "%7E");
   }
   /**
@@ -134,7 +135,7 @@ class N {
    * @returns
    */
   formatEncodeParam(t, e, n) {
-    const o = g(n);
+    const o = f(n);
     if (o === "object") {
       const s = Object.keys(n).sort();
       s.length === 0 ? t.push(`${e}={}`) : s.forEach((i) => {
@@ -159,7 +160,7 @@ class N {
    * @returns
    */
   cryptoHash(t) {
-    return U.HmacSHA1(t, this.appIdCode.code).toString(U.enc.Hex).toUpperCase();
+    return A.HmacSHA1(t, this.appIdCode.code).toString(A.enc.Hex).toUpperCase();
   }
   /**
    * 获取 url 参数
@@ -167,7 +168,7 @@ class N {
    * @returns
    */
   urlSearchParams(t) {
-    return t && t.indexOf("?") > -1 ? b.parse(t.split("?").pop() ?? "") : {};
+    return t && t.indexOf("?") > -1 ? I.parse(t.split("?").pop() ?? "") : {};
   }
   /**
    * 获取签名 url
@@ -179,8 +180,8 @@ class N {
     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 = `${C.cleanUrl(`/${e}`)}?${i}`, h = this.cryptoHash(c);
-      t = `${n}${c}&signature=${h}`;
+      const i = this.sortParamByKey(o), c = `${P.cleanUrl(`/${e}`)}?${i}`, m = this.cryptoHash(c);
+      t = `${n}${c}&signature=${m}`;
     } catch {
       console.error("签名失败，请使用有效的链接", t);
     }
@@ -195,36 +196,36 @@ class N {
   signatureConfig(t) {
     var e, n, o, s;
     try {
-      const a = ((e = t.method) == null ? void 0 : e.toUpperCase()) === "GET", c = A(t.data), h = c !== null && typeof c == "object", f = ((o = (n = t.headers) == null ? void 0 : n["Content-Type"]) == null ? void 0 : o.toString()) || "", R = f.includes("multipart/form-data");
-      let y = f.includes("application/json");
-      !a && !f && h && (y = !0), u(t, { headers: { "App-Id": this.appIdCode.id } });
-      const m = {}, O = this.urlSearchParams(t.url);
-      if (u(m, O), !d(t.params)) {
-        const l = A(t.params);
-        this.removeNilValue(l), t.params = l, u(m, b.parse(b.stringify(l)));
+      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");
+      let S = b.includes("application/json");
+      !a && !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)));
       }
-      !d(c) && h && !R && !y && u(m, c);
-      const S = this.generateSignatureOption();
-      u(m, S);
-      let w = this.sortParamByKey(m);
-      if (y) {
+      !h(c) && m && !O && !S && u(g, c);
+      const w = this.generateSignatureOption();
+      u(g, w);
+      let $ = this.sortParamByKey(g);
+      if (S) {
         const l = JSON.stringify(c);
-        this.isStringOverKB(l, 128) || (h ? w += this.formatEncodeValue(l) : w += this.formatEncodeValue(c));
+        this.isStringOverKB(l, 128) || (m ? $ += this.formatEncodeValue(l) : $ += this.formatEncodeValue(c));
       }
-      let $ = "";
-      (s = t.url) != null && s.startsWith("http") ? $ = t.url : $ = `${t.baseURL}/${t.url || ""}`;
-      const { pathname: P } = new URL($, window.location.origin), T = `${C.cleanUrl(`/${P}`)}?${w}`;
-      S.signature = this.cryptoHash(T), t.params = u({}, t.params, S);
+      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);
     }
   }
 }
-const H = {
+const z = {
   id: "mis",
   code: "c9d8e36df18ef01ff0da74e0bb13151c"
-}, K = new N(H);
-class z {
+}, F = new D(z);
+class M {
   constructor() {
     p(this, "axiosInstance");
     p(this, "egovaAdminToken");
@@ -235,7 +236,7 @@ class z {
    * @param token 统一用户中心的token
    */
   init(t, e) {
-    this.egovaAdminToken = e, this.axiosInstance = E.create({
+    this.egovaAdminToken = e, this.axiosInstance = L.create({
       baseURL: t,
       timeout: 6e4
     }), this.configAxios();
@@ -264,28 +265,93 @@ class z {
    * @param config
    */
   configSignature(t) {
-    K.signatureConfig(t);
+    F.signatureConfig(t);
   }
 }
-const x = new z();
-function _(r) {
+const y = new M(), d = {
+  type: "sm2WithSalt",
+  publicKey: ""
+}, J = "0123456789abcdeffedcba9876543210";
+class Q {
+  constructor(t) {
+    p(this, "key");
+    this.key = t;
+  }
+  /**
+   * 加密数据
+   * @param inArray - 加密数据
+   * @param mode - 加密模式
+   * @returns 加密结果
+   */
+  encrypt(t, e) {
+    return E.encrypt(t, this.key, e);
+  }
+  /**
+   * 解密数据
+   * @param inArray - 解密数据
+   * @param mode - 解密模式
+   * @returns 解密结果
+   */
+  decrypt(t, e) {
+    return E.decrypt(t, this.key, e);
+  }
+  /**
+   * sm2 加密数据 (登录时对密码的加密)
+   * @param msg
+   * @param publicKey
+   * @returns
+   */
+  async sm2Encrypt(t, e) {
+    try {
+      if (!e)
+        return Promise.reject(new Error("无法获取加密密钥"));
+      const n = V.doEncrypt(t, e, 1);
+      return Promise.resolve(n);
+    } catch (n) {
+      return Promise.reject(n);
+    }
+  }
+}
+const R = new Q(J);
+function rt(r) {
   var t;
-  return (t = x.getAxiosInstance()) == null ? void 0 : t.get("/unity/org/human/gethumanlist", { params: r });
+  return (t = y.getAxiosInstance()) == null ? void 0 : t.get("/unity/org/human/gethumanlist", { params: r });
 }
-function W(r) {
+function ot(r) {
   var t;
-  return (t = x.getAxiosInstance()) == null ? void 0 : t.get("/unity/builder/org/gettenantunittree", { params: r });
+  return (t = y.getAxiosInstance()) == null ? void 0 : t.get("/unity/builder/org/gettenantunittree", { params: r });
 }
-function X(r) {
+function st(r) {
   var o;
   const t = "/unity/org/unit/countunithumannumber", e = [];
-  d(r.tenantId) || e.push(`tenantId=${r.tenantId}`), d(r.roleId) || e.push(`roleId=${r.roleId}`), d(r.onlyQueryUnbound) || e.push(`onlyQueryUnbound=${r.onlyQueryUnbound}`), d(r.permissionId) || e.push(`permissionId=${r.permissionId}`);
+  h(r.tenantId) || e.push(`tenantId=${r.tenantId}`), h(r.roleId) || e.push(`roleId=${r.roleId}`), h(r.onlyQueryUnbound) || e.push(`onlyQueryUnbound=${r.onlyQueryUnbound}`), h(r.permissionId) || e.push(`permissionId=${r.permissionId}`);
   const n = e.length ? `${t}?${e.join("&")}` : t;
-  return (o = x.getAxiosInstance()) == null ? void 0 : o.post(n, r.ids);
+  return (o = y.getAxiosInstance()) == null ? void 0 : o.post(n, r.ids);
+}
+function q() {
+  var r;
+  return (r = y.getAxiosInstance()) == null ? void 0 : r.get("/free/oauth/getalgandpublickey");
+}
+async function it(r, t) {
+  var o, s;
+  if (!d.publicKey) {
+    const i = await q();
+    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]);
+    }
+  }
+  let e = r, n = t;
+  return d.publicKey && (e = await R.sm2Encrypt(r, d.publicKey), n = await R.sm2Encrypt(t, d.publicKey)), (s = y.getAxiosInstance()) == null ? void 0 : s.post("/unity/org/human/changeuserowncryptogram", {
+    cryptogram: n,
+    cryptogramOld: e
+  });
 }
 export {
-  x as adminAxios,
-  X as countUnitHuman,
-  W as getUnitTree,
-  _ as gethumanlist
+  y as adminAxios,
+  it as changeUserCryptogram,
+  st as countUnitHuman,
+  q as getPublicKey,
+  ot as getUnitTree,
+  rt as gethumanlist
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egova-admin-jssdk",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": false,
   "scripts": {
     "build": "run-p type-check build-lib build-type",
@@ -12,13 +12,15 @@
     "axios": ">=0.29.0",
     "crypto-js": ">=4.1.1",
     "lodash-es": ">=4.17.21",
-    "qs": ">=6.13.1"
+    "qs": ">=6.13.1",
+    "sm-crypto": ">=0.3.12"
   },
   "dependencies": {
     "axios": "^1.7.9",
     "crypto-js": "^4.2.0",
     "lodash-es": "^4.17.21",
     "qs": "^6.13.1",
+    "sm-crypto": "^0.3.13",
     "vue": "^3.5.13"
   },
   "devDependencies": {
@@ -27,6 +29,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.10.2",
     "@types/qs": "^6.9.17",
+    "@types/sm-crypto": "^0.3.4",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vue/eslint-config-prettier": "^10.1.0",
     "@vue/eslint-config-typescript": "^14.1.3",