jmash-core-mp 0.1.21 → 0.1.22

package/src/utils/net.ts

@@ -1,18 +1,18 @@
-import { sm2 } from "sm-crypto";
-
-// net工具类
-class NetUtil {
-  private publicKey: string =
-    "04ad5161202264bb7c201f4cc39d6fb00fed81fc2cec1b3f23ddfb933d3f32977be40e4285cff6da4bad65933777c135b95f41846363086e34624ff73b3685e84c";
-
-  //加密.
-  encrypt(data: string): string {
-    return sm2.doEncrypt(data, this.publicKey);
-  }
-  //解密
-  decrypt(data: string): string {
-    return sm2.doDecrypt(data, this.publicKey);
-  }
-}
-const net = new NetUtil();
-export { net };
+import { sm2 } from "sm-crypto";
+
+// net工具类
+class NetUtil {
+  private publicKey: string =
+    "04ad5161202264bb7c201f4cc39d6fb00fed81fc2cec1b3f23ddfb933d3f32977be40e4285cff6da4bad65933777c135b95f41846363086e34624ff73b3685e84c";
+
+  //加密.
+  encrypt(data: string): string {
+    return sm2.doEncrypt(data, this.publicKey);
+  }
+  //解密
+  decrypt(data: string): string {
+    return sm2.doDecrypt(data, this.publicKey);
+  }
+}
+const net = new NetUtil();
+export { net };

package/src/utils/request.ts

@@ -1,134 +1,134 @@
-import type { TokenModel } from "../api/auth/types";
-
-import { db } from "../utils/db";
-import { grpc } from "../utils/grpc";
-
-import mpx from "@mpxjs/core";
-import mpxFetch from "@mpxjs/fetch";
-mpx.use(mpxFetch);
-
-let isRefreshing = false;
-type TokenCallBackFunc = (token: string) => void;
-let requests: TokenCallBackFunc[] = [];
-//是否登出.
-let isLogout = false;
-
-mpx.xfetch.interceptors.request.use(function (config) {
-  if (!config.url.startsWith("http")) {
-    const appconfig = getApp().globalData.config;
-    config.url = appconfig.baseUrl + config.url;
-  }
-  //console.log("request:", config);
-  // Grpc Gateway 清理默认值,Enum,时间等不能空;
-  grpc.clearEmpty(config.params);
-  grpc.clearEmpty(config.data);
-  if (!config.header) {
-    config.header = {};
-  }
-
-  //配置其他认证请求头信息
-  if (
-    config.header.Authorization !== null &&
-    config.header.Authorization !== undefined &&
-    config.header.Authorization === false
-  ) {
-    delete config.header.Authorization;
-    return config;
-  }
-  const auth =
-    config.header.Authorization && config.header.Authorization !== null
-      ? (config.header.Authorization as string)
-      : "";
-  if (auth && auth.length > 0 && !auth.startsWith("Bearer ")) {
-    return config;
-  }
-  // 请求设置token和租户
-  const expire = db.isTokenExpires();
-  if (!expire && db.getToken()) {
-    config.header["Authorization"] = "Bearer " + db.getToken();
-    const organTenant = db.getOrganTenant(config.tenant);
-    if (organTenant && config.header.GrpcMetadataTenant !== false) {
-      config.header["Grpc-Metadata-Tenant"] = organTenant;
-    } else {
-      delete config.header["Grpc-Metadata-Tenant"];
-    }
-    //console.log("header:", config.header);
-  } else if (!db.getRefreshToken()) {
-    console.log("not token request. ");
-    return config;
-  } else {
-    console.log("token expire", expire);
-  }
-
-  const isRefreshToken = config.url.endsWith("/v1/rbac/auth/refresh_token");
-  //Token已过期或即将过期.
-  if (!isRefreshToken && expire) {
-    if (!isRefreshing) {
-      isRefreshing = true;
-      // 刷新token
-      refreshToken(db.getRefreshToken())
-        .then((res) => {
-          // token 刷新后将数组的方法重新执行
-          console.log("refreshToken-res", res);
-          db.setToken(res.data);
-          requests.forEach((cb) => cb(res.data.accessToken));
-          requests = []; // 刷新完清空
-        })
-        .catch(() => {
-          db.clearStorage();
-        })
-        .finally(() => {
-          isRefreshing = false;
-        });
-    }
-    const retry = new Promise<any>((resolve) => {
-      /* (token) => {...}这个函数就是回调函数*/
-      requests.push((token) => {
-        config.header.Authorization = "Bearer " + token;
-        resolve(config);
-      });
-    });
-    return retry;
-  }
-
-  // 也可以返回promise
-  return config;
-});
-
-mpx.xfetch.interceptors.response.use(function (res) {
-  // console.log(“response:”，res);
-  if (res.statusCode === 200) {
-    return res;
-  } else if (res.statusCode === 401) {
-    // token 过期,重新登录
-    if (!isLogout) {
-      isLogout = true;
-      mpx.showToast({
-        title: "当前页面已失效，请重新登录",
-        icon: "none",
-      });
-      db.clearStorage();
-      isLogout = false;
-    }
-    return Promise.reject(res);
-  }
-  // 返回promise,通过catch ,处理 code,message.
-  return Promise.reject(res);
-});
-
-//刷新Token
-function refreshToken(refreshToken: string) {
-  const appconfig = getApp().globalData.config;
-  return mpx.xfetch.fetch<TokenModel>({
-    url: appconfig.baseUrl + "/v1/front/rbac/auth/refresh_token",
-    method: "POST",
-    data: {
-      data: { refreshToken: refreshToken },
-      tenant: appconfig.tenant,
-      clientId: appconfig.appId,
-    },
-    header: { Authorization: false },
-  });
-}
-
-export { mpxFetch };
+import type { TokenModel } from "../api/auth/types";
+
+import { db } from "../utils/db";
+import { grpc } from "../utils/grpc";
+
+import mpx from "@mpxjs/core";
+import mpxFetch from "@mpxjs/fetch";
+mpx.use(mpxFetch);
+
+let isRefreshing = false;
+type TokenCallBackFunc = (token: string) => void;
+let requests: TokenCallBackFunc[] = [];
+//是否登出.
+let isLogout = false;
+
+mpx.xfetch.interceptors.request.use(function (config) {
+  if (!config.url.startsWith("http")) {
+    const appconfig = getApp().globalData.config;
+    config.url = appconfig.baseUrl + config.url;
+  }
+  //console.log("request:", config);
+  // Grpc Gateway 清理默认值,Enum,时间等不能空;
+  grpc.clearEmpty(config.params);
+  grpc.clearEmpty(config.data);
+  if (!config.header) {
+    config.header = {};
+  }
+
+  //配置其他认证请求头信息
+  if (
+    config.header.Authorization !== null &&
+    config.header.Authorization !== undefined &&
+    config.header.Authorization === false
+  ) {
+    delete config.header.Authorization;
+    return config;
+  }
+  const auth =
+    config.header.Authorization && config.header.Authorization !== null
+      ? (config.header.Authorization as string)
+      : "";
+  if (auth && auth.length > 0 && !auth.startsWith("Bearer ")) {
+    return config;
+  }
+  // 请求设置token和租户
+  const expire = db.isTokenExpires();
+  if (!expire && db.getToken()) {
+    config.header["Authorization"] = "Bearer " + db.getToken();
+    const organTenant = db.getOrganTenant(config.tenant);
+    if (organTenant && config.header.GrpcMetadataTenant !== false) {
+      config.header["Grpc-Metadata-Tenant"] = organTenant;
+    } else {
+      delete config.header["Grpc-Metadata-Tenant"];
+    }
+    //console.log("header:", config.header);
+  } else if (!db.getRefreshToken()) {
+    console.log("not token request. ");
+    return config;
+  } else {
+    console.log("token expire", expire);
+  }
+
+  const isRefreshToken = config.url.endsWith("/v1/rbac/auth/refresh_token");
+  //Token已过期或即将过期.
+  if (!isRefreshToken && expire) {
+    if (!isRefreshing) {
+      isRefreshing = true;
+      // 刷新token
+      refreshToken(db.getRefreshToken())
+        .then((res) => {
+          // token 刷新后将数组的方法重新执行
+          console.log("refreshToken-res", res);
+          db.setToken(res.data);
+          requests.forEach((cb) => cb(res.data.accessToken));
+          requests = []; // 刷新完清空
+        })
+        .catch(() => {
+          db.clearStorage();
+        })
+        .finally(() => {
+          isRefreshing = false;
+        });
+    }
+    const retry = new Promise<any>((resolve) => {
+      /* (token) => {...}这个函数就是回调函数*/
+      requests.push((token) => {
+        config.header.Authorization = "Bearer " + token;
+        resolve(config);
+      });
+    });
+    return retry;
+  }
+
+  // 也可以返回promise
+  return config;
+});
+
+mpx.xfetch.interceptors.response.use(function (res) {
+  // console.log(“response:”，res);
+  if (res.statusCode === 200) {
+    return res;
+  } else if (res.statusCode === 401) {
+    // token 过期,重新登录
+    if (!isLogout) {
+      isLogout = true;
+      mpx.showToast({
+        title: "当前页面已失效，请重新登录",
+        icon: "none",
+      });
+      db.clearStorage();
+      isLogout = false;
+    }
+    return Promise.reject(res);
+  }
+  // 返回promise,通过catch ,处理 code,message.
+  return Promise.reject(res);
+});
+
+//刷新Token
+function refreshToken(refreshToken: string) {
+  const appconfig = getApp().globalData.config;
+  return mpx.xfetch.fetch<TokenModel>({
+    url: appconfig.baseUrl + "/v1/front/rbac/auth/refresh_token",
+    method: "POST",
+    data: {
+      data: { refreshToken: refreshToken },
+      tenant: appconfig.tenant,
+      clientId: appconfig.appId,
+    },
+    header: { Authorization: false },
+  });
+}
+
+export { mpxFetch };

package/static/ali/mini.project.json

@@ -1,4 +1,4 @@
-{
-  "enableAppxNg": true,
-  "component2": true
-}
+{
+  "enableAppxNg": true,
+  "component2": true
+}

package/static/dd/project.config.json

@@ -1,15 +1,15 @@
-{
-  "setting": {
-    "newFeature": true,
-    "urlCheck": true,
-    "es6": false,
-    "postcss": false,
-    "minified": false,
-    "checkSiteMap": false,
-    "autoAudits": false
-  },
-  "appid": "wx2a8b3d689b8959eb",
-  "projectname": "jmash-core-mp",
-  "description": "Jmash Core MPX小程序",
-  "condition": {}
-}
+{
+  "setting": {
+    "newFeature": true,
+    "urlCheck": true,
+    "es6": false,
+    "postcss": false,
+    "minified": false,
+    "checkSiteMap": false,
+    "autoAudits": false
+  },
+  "appid": "wx2a8b3d689b8959eb",
+  "projectname": "jmash-core-mp",
+  "description": "Jmash Core MPX小程序",
+  "condition": {}
+}

package/static/swan/project.swan.json

@@ -1,14 +1,14 @@
-{
-  "compilation-args": {
-    "common": {
-      "ignoreTransJs": true,
-      "ignoreUglify": true
-    },
-    "options": [],
-    "selected": -3
-  },
-  "projectname": "jmash-core-mp",
-  "setting": {
-    "urlCheck": true
-  }
-}
+{
+  "compilation-args": {
+    "common": {
+      "ignoreTransJs": true,
+      "ignoreUglify": true
+    },
+    "options": [],
+    "selected": -3
+  },
+  "projectname": "jmash-core-mp",
+  "setting": {
+    "urlCheck": true
+  }
+}

package/static/tt/project.config.json

@@ -1,11 +1,11 @@
-{
-  "setting": {
-    "urlCheck": true,
-    "es6": false,
-    "postcss": false,
-    "minified": false,
-    "newFeature": true
-  },
-  "appid": "testAppId",
-  "projectname": "jmash-core-mp"
-}
+{
+  "setting": {
+    "urlCheck": true,
+    "es6": false,
+    "postcss": false,
+    "minified": false,
+    "newFeature": true
+  },
+  "appid": "testAppId",
+  "projectname": "jmash-core-mp"
+}

package/static/wx/project.config.json

@@ -1,41 +1,41 @@
-{
-  "setting": {
-    "newFeature": true,
-    "urlCheck": true,
-    "es6": false,
-    "postcss": true,
-    "minified": false,
-    "checkSiteMap": false,
-    "autoAudits": false,
-    "compileWorklet": false,
-    "uglifyFileName": false,
-    "uploadWithSourceMap": true,
-    "enhance": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "minifyWXML": true,
-    "localPlugins": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "condition": false,
-    "swc": false,
-    "disableSWC": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
-  },
-  "appid": "wx2a8b3d689b8959eb",
-  "projectname": "jmash-core-mp",
-  "description": "Jmash Core MPX小程序",
-  "condition": {},
-  "compileType": "miniprogram",
-  "simulatorPluginLibVersion": {},
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "editorSetting": {}
+{
+  "setting": {
+    "newFeature": true,
+    "urlCheck": true,
+    "es6": false,
+    "postcss": true,
+    "minified": false,
+    "checkSiteMap": false,
+    "autoAudits": false,
+    "compileWorklet": false,
+    "uglifyFileName": false,
+    "uploadWithSourceMap": true,
+    "enhance": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "appid": "wx2a8b3d689b8959eb",
+  "projectname": "jmash-core-mp",
+  "description": "Jmash Core MPX小程序",
+  "condition": {},
+  "compileType": "miniprogram",
+  "simulatorPluginLibVersion": {},
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {}
 }

package/uno.config.js

@@ -1,9 +1,9 @@
-const { defineConfig } = require('unocss')
-const presetMpx = require('@mpxjs/unocss-base')
-
-module.exports = defineConfig({
-  include: [/\.mpx($|\?)/],
-  presets: [
-    presetMpx()
-  ]
-})
+const { defineConfig } = require('unocss')
+const presetMpx = require('@mpxjs/unocss-base')
+
+module.exports = defineConfig({
+  include: [/\.mpx($|\?)/],
+  presets: [
+    presetMpx()
+  ]
+})