jmash-core-mp 0.1.13 → 0.1.14

package/lib/utils/net.d.ts

@@ -1,7 +1,7 @@
-declare class NetUtil {
-    private publicKey;
-    encrypt(data: string): string;
-    decrypt(data: string): string;
-}
-declare const net: NetUtil;
-export { net };
+declare class NetUtil {
+    private publicKey;
+    encrypt(data: string): string;
+    decrypt(data: string): string;
+}
+declare const net: NetUtil;
+export { net };

package/lib/utils/net.js

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

package/lib/utils/request.d.ts

@@ -1,2 +1,2 @@
-import mpxFetch from "@mpxjs/fetch";
-export { mpxFetch };
+import mpxFetch from "@mpxjs/fetch";
+export { mpxFetch };

package/lib/utils/request.js

@@ -1,122 +1,122 @@
-import { db } from "../utils/db";
-import { grpc } from "../utils/grpc";
-import mpx from "@mpxjs/core";
-import mpxFetch from "@mpxjs/fetch";
-mpx.use(mpxFetch);
-import { config as appconfig } from "../utils/config";
-let isRefreshing = false;
-let requests = [];
-//是否登出.
-let isLogout = false;
-mpx.xfetch.interceptors.request.use(function (config) {
-    if (!config.url.startsWith("http")) {
-        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
-        : "";
-    if (auth && auth.length > 0 && !auth.startsWith("Bearer ")) {
-        return config;
-    }
-    // 请求设置token和租户
-    const expire = db.isTokenExpires();
-    if (!expire) {
-        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((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
-    return res;
-});
-//刷新Token
-function refreshToken(refreshToken) {
-    return mpx.xfetch.fetch({
-        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 { db } from "../utils/db";
+import { grpc } from "../utils/grpc";
+import mpx from "@mpxjs/core";
+import mpxFetch from "@mpxjs/fetch";
+mpx.use(mpxFetch);
+import { config as appconfig } from "../utils/config";
+let isRefreshing = false;
+let requests = [];
+//是否登出.
+let isLogout = false;
+mpx.xfetch.interceptors.request.use(function (config) {
+    if (!config.url.startsWith("http")) {
+        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
+        : "";
+    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((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
+    return res;
+});
+//刷新Token
+function refreshToken(refreshToken) {
+    return mpx.xfetch.fetch({
+        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/mpx.config.js

@@ -1,27 +1,27 @@
-const { defineConfig } = require("@vue/cli-service");
-module.exports = defineConfig({
-  outputDir: `dist/${process.env.MPX_CURRENT_TARGET_MODE}`,
-  transpileDependencies: ["@mpxjs/mpx-cube-ui"],
-  pluginOptions: {
-    mpx: {
-      plugin: {
-        srcMode: "wx",
-        hackResolveBuildDependencies: ({ files, resolveDependencies }) => {
-          const path = require("path");
-          const packageJSONPath = path.resolve("package.json");
-          if (files.has(packageJSONPath)) files.delete(packageJSONPath);
-          if (resolveDependencies.files.has(packageJSONPath)) {
-            resolveDependencies.files.delete(packageJSONPath);
-          }
-        },
-      },
-      loader: {},
-      unocss: {},
-    },
-  },
-  /**
-   * 如果希望node_modules下的文件时对应的缓存可以失效，
-   * 可以将configureWebpack.snap.managedPaths修改为 []
-   */
-  configureWebpack(config) {},
-});
+const { defineConfig } = require("@vue/cli-service");
+module.exports = defineConfig({
+  outputDir: `dist/${process.env.MPX_CURRENT_TARGET_MODE}`,
+  transpileDependencies: ["@mpxjs/mpx-cube-ui"],
+  pluginOptions: {
+    mpx: {
+      plugin: {
+        srcMode: "wx",
+        hackResolveBuildDependencies: ({ files, resolveDependencies }) => {
+          const path = require("path");
+          const packageJSONPath = path.resolve("package.json");
+          if (files.has(packageJSONPath)) files.delete(packageJSONPath);
+          if (resolveDependencies.files.has(packageJSONPath)) {
+            resolveDependencies.files.delete(packageJSONPath);
+          }
+        },
+      },
+      loader: {},
+      unocss: {},
+    },
+  },
+  /**
+   * 如果希望node_modules下的文件时对应的缓存可以失效，
+   * 可以将configureWebpack.snap.managedPaths修改为 []
+   */
+  configureWebpack(config) {},
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/postcss.config.js

@@ -1,11 +1,11 @@
-const autoprefixer = require('autoprefixer')
-const RN = ['android', 'ios', 'harmony']
-const isRN = RN.includes(
-  process.env.MPX_CURRENT_TARGET_MODE
-)
-// RN环境下去除postcss的autoprefix插件
-module.exports = {
-  plugins: [
-    !isRN && autoprefixer({ remove: false })
-  ].filter(Boolean)
-}
+const autoprefixer = require('autoprefixer')
+const RN = ['android', 'ios', 'harmony']
+const isRN = RN.includes(
+  process.env.MPX_CURRENT_TARGET_MODE
+)
+// RN环境下去除postcss的autoprefix插件
+module.exports = {
+  plugins: [
+    !isRN && autoprefixer({ remove: false })
+  ].filter(Boolean)
+}

package/project.config.json

@@ -1,25 +1,25 @@
-{
-  "setting": {
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "uglifyFileName": false,
-    "enhance": true,
-    "packNpmRelationList": [],
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useCompilerPlugins": false,
-    "minifyWXML": true
-  },
-  "compileType": "miniprogram",
-  "simulatorPluginLibVersion": {},
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "appid": "wx2a8b3d689b8959eb",
-  "editorSetting": {}
+{
+  "setting": {
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "uglifyFileName": false,
+    "enhance": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useCompilerPlugins": false,
+    "minifyWXML": true
+  },
+  "compileType": "miniprogram",
+  "simulatorPluginLibVersion": {},
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx2a8b3d689b8959eb",
+  "editorSetting": {}
 }

package/project.private.config.json

@@ -1,14 +1,14 @@
-{
-  "libVersion": "3.15.2",
-  "projectname": "jmash-core-mp",
-  "setting": {
-    "urlCheck": true,
-    "coverView": true,
-    "lazyloadPlaceholderEnable": false,
-    "skylineRenderEnable": false,
-    "preloadBackgroundData": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "compileHotReLoad": true
-  }
+{
+  "libVersion": "3.15.2",
+  "projectname": "jmash-core-mp",
+  "setting": {
+    "urlCheck": true,
+    "coverView": true,
+    "lazyloadPlaceholderEnable": false,
+    "skylineRenderEnable": false,
+    "preloadBackgroundData": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "compileHotReLoad": true
+  }
 }

package/public/index.html

@@ -1,15 +1,15 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport"
-          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover">
-    <meta name="format-detection" content="telephone=no">
-    <meta name="x5-cache" content="disable">
-    <title></title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, viewport-fit=cover">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="x5-cache" content="disable">
+    <title></title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>