@jx3box/jx3box-common 8.6.8 → 8.7.0

package/data/jx3_zlp.json

@@ -1,8 +1,8 @@
 {
     "std": ["太极秘录","丝路风语","雾海寻龙", "万灵当歌", "群侠万变", "横刀断浪", "江湖无限", "北天药宗", "白帝风云", "其它"],
-    "origin": ["苍雪龙城","血战天策", "安史之乱", "日月明尊", "剑湖神宫", "巴蜀风云", "五毒现世", "圣殿云起", "藏剑山庄", "物华天宝", "其它"],
+    "origin": ["烽火燎原","苍雪龙城","血战天策", "安史之乱", "日月明尊", "剑湖神宫", "巴蜀风云", "五毒现世", "圣殿云起", "藏剑山庄", "物华天宝", "其它"],
     "wujie": ["太极秘录","丝路风语","雾海寻龙", "万灵当歌", "群侠万变", "横刀断浪", "江湖无限", "北天药宗", "白帝风云", "其它"],
-    "all": ["太极秘录","丝路风语","苍雪龙城","雾海寻龙", "血战天策", "万灵当歌", "群侠万变", "安史之乱", "日月明尊", "横刀断浪", "剑湖神宫", "巴蜀风云", "江湖无限", "五毒现世", "圣殿云起", "北天药宗", "白帝风云", "藏剑山庄", "物华天宝", "其它"],
+    "all": ["烽火燎原","太极秘录","丝路风语","苍雪龙城","雾海寻龙", "血战天策", "万灵当歌", "群侠万变", "安史之乱", "日月明尊", "横刀断浪", "剑湖神宫", "巴蜀风云", "江湖无限", "五毒现世", "圣殿云起", "北天药宗", "白帝风云", "藏剑山庄", "物华天宝", "其它"],
     "std_map": [
         {
             "label": "太极秘录",
@@ -46,6 +46,10 @@
         }
     ],
     "origin_map": [
+        {
+            "label": "烽火燎原",
+            "value": "fenghuoliaoyuan"
+        },
         {
             "label": "苍雪龙城",
             "value": "cangxuelongcheng"
@@ -92,6 +96,10 @@
         }
     ],
     "wujie_map": [
+        {
+            "label": "太极秘录",
+            "value": "taijimilu"
+        },
         {
             "label": "丝路风语",
             "value": "silufengyu"
@@ -130,6 +138,10 @@
         }
     ],
     "all_map": [
+        {
+            "label": "烽火燎原",
+            "value": "fenghuoliaoyuan"
+        },
         {
             "label": "太极秘录",
             "value": "taijimilu"

package/js/https.js

@@ -1,6 +1,22 @@
-import { axios, installInterceptors, installNextInterceptors, installHelperInterceptors, installCmsInterceptors } from "./axios";
+import {
+    axios,
+    installInterceptors,
+    installNextInterceptors,
+    installHelperInterceptors,
+    installCmsInterceptors,
+} from "./axios";
 import { SSE } from "./sse";
-import { __server, __cms, __node, __spider, __next, __pay, __helperUrl, __team, __lua } from "../data/jx3box.json";
+import {
+    __server,
+    __cms,
+    __node,
+    __spider,
+    __next,
+    __pay,
+    __helperUrl,
+    __team,
+    __lua,
+} from "../data/jx3box.json";
 import { getTokenFromUrl } from "./utils";
 
 const server_map = {
@@ -26,7 +42,10 @@ function $cms(options = {}, axiosConfig = {}) {
     }
 
     let token = getTokenFromUrl();
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -58,13 +77,17 @@ function $helper(options) {
         // 同时发送cookie和basic auth
         withCredentials: true,
         auth: {
-            username: (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token") || "",
+            username:
+                (localStorage && localStorage.getItem("__token")) ||
+                localStorage.getItem("token") ||
+                "",
             password: "helper common request",
         },
         baseURL: domain,
         headers: {
             Accept: "application/prs.helper.v2+json",
-            "JX3-Client-Type": (options && options.client_id) || jx3ClientType(),
+            "JX3-Client-Type":
+                (options && options.client_id) || jx3ClientType(),
         },
     };
 
@@ -100,7 +123,10 @@ function $next(options = {}, axiosConfig = {}) {
     }
 
     let token = getTokenFromUrl();
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -137,7 +163,10 @@ function $team(options = {}) {
     } else {
         requestDomain = process.env.VUE_APP_TEAM_API || __team;
     }
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || { domain: requestDomain };
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
+        domain: requestDomain,
+    };
     return $next(_options);
 }
 
@@ -151,7 +180,10 @@ function $pay(options = {}) {
         requestDomain = process.env.VUE_APP_PAY_API || __pay;
     }
 
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || { domain: requestDomain };
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
+        domain: requestDomain,
+    };
     return $next(_options);
 }
 
@@ -164,15 +196,24 @@ function $lua(options = {}) {
     } else {
         requestDomain = process.env.VUE_APP_LUA_API || __lua;
     }
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || { domain: requestDomain };
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
+        domain: requestDomain,
+    };
     return $next(_options);
 }
 
 // node
 function $node(options) {
-    let domain = (options && options.domain) || __node;
+    const domain = (options && options.domain);
+
+    const requestDomain = domain || process.env.VUE_APP_NODE_API || __node;
+
     let token = getTokenFromUrl();
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -180,14 +221,9 @@ function $node(options) {
             username: token || "",
             password: "node common request",
         },
-        baseURL: domain,
+        baseURL: requestDomain,
     };
 
-    // 是否需要开启本地代理作为测试
-    if (options && options.proxy) {
-        config.baseURL = process.env.NODE_ENV === "production" ? domain : `http://localhost:${options.port}`;
-    }
-
     // 创建实例
     const ins = axios.create(config);
 
@@ -199,7 +235,9 @@ function $node(options) {
 
 import { tokenExpires } from "../data/conf.json";
 function isLogin() {
-    let created_at = !localStorage.getItem("created_at") ? -Infinity : localStorage.getItem("created_at");
+    let created_at = !localStorage.getItem("created_at")
+        ? -Infinity
+        : localStorage.getItem("created_at");
     let logged_in = localStorage.getItem("logged_in") == "true" ? true : false;
     return logged_in && Date.now() - created_at < tokenExpires;
 }
@@ -217,7 +255,8 @@ function $https(server, options) {
 
     // 是否需要开启本地代理作为测试
     if (options && options.proxy) {
-        config.baseURL = process.env.NODE_ENV === "production" ? server_map[server] : "/";
+        config.baseURL =
+            process.env.NODE_ENV === "production" ? server_map[server] : "/";
     } else {
         config.baseURL = server_map[server];
     }
@@ -243,7 +282,10 @@ function $_https(server, options) {
     }
 
     let token = getTokenFromUrl();
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
 
     let config = {
         // 同时发送cookie和basic auth
@@ -252,7 +294,8 @@ function $_https(server, options) {
             username: token || "",
             password: "$_https common request",
         },
-        baseURL: process.env.NODE_ENV === "production" ? server_map[server] : "/",
+        baseURL:
+            process.env.NODE_ENV === "production" ? server_map[server] : "/",
         headers: {},
     };
 
@@ -263,7 +306,8 @@ function $_https(server, options) {
 
     // 是否需要开启本地代理作为测试
     if (!options || options.proxy || options.proxy === undefined) {
-        config.baseURL = process.env.NODE_ENV === "production" ? server_map[server] : "/";
+        config.baseURL =
+            process.env.NODE_ENV === "production" ? server_map[server] : "/";
     } else {
         config.baseURL = server_map[server];
     }
@@ -281,4 +325,16 @@ function $_https(server, options) {
     return ins;
 }
 
-export { $https, $_https, $cms, $helper, $next, $team, $pay, $node, $lua, axios, SSE };
+export {
+    $https,
+    $_https,
+    $cms,
+    $helper,
+    $next,
+    $team,
+    $pay,
+    $node,
+    $lua,
+    axios,
+    SSE,
+};

package/js/https_v2.js

@@ -20,8 +20,11 @@ function $cms(options = {}, axiosConfig = {}) {
         requestDomain = process.env.VUE_APP_CMS_API || domains.__cms;
     }
 
-    let token = getTokenFromUrl()
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    let token = getTokenFromUrl();
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -54,13 +57,17 @@ function $helper(options) {
         // 同时发送cookie和basic auth
         withCredentials: true,
         auth: {
-            username: (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token") || "",
+            username:
+                (localStorage && localStorage.getItem("__token")) ||
+                localStorage.getItem("token") ||
+                "",
             password: "helper common request",
         },
         baseURL: domain,
         headers: {
             Accept: "application/prs.helper.v2+json",
-            "JX3-Client-Type": (options && options.client_id) || jx3ClientType(),
+            "JX3-Client-Type":
+                (options && options.client_id) || jx3ClientType(),
         },
     };
 
@@ -95,8 +102,11 @@ function $next(options = {}, axiosConfig = {}) {
         requestDomain = process.env.VUE_APP_NEXT_API || domains.__next;
     }
 
-    let token = getTokenFromUrl()
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    let token = getTokenFromUrl();
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -129,7 +139,8 @@ function $team(options = {}) {
         requestDomain = process.env.VUE_APP_TEAM_API || domains.__team;
     }
 
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || {
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
         domain: requestDomain,
     };
     return $next(_options);
@@ -145,7 +156,8 @@ function $pay(options = {}) {
         requestDomain = process.env.VUE_APP_PAY_API || domains.__pay;
     }
 
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || {
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
         domain: requestDomain,
     };
     return $next(_options);
@@ -160,7 +172,8 @@ function $lua(options = {}) {
     } else {
         requestDomain = process.env.VUE_APP_LUA_API || domains.__lua;
     }
-    let _options = (options && Object.assign(options, { domain: requestDomain })) || {
+    let _options = (options &&
+        Object.assign(options, { domain: requestDomain })) || {
         domain: requestDomain,
     };
     return $next(_options);
@@ -168,9 +181,16 @@ function $lua(options = {}) {
 
 // node 通用请求接口
 function $node(options) {
-    let domain = (options && options.domain) || domains.__node;
-    let token = getTokenFromUrl()
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    let domain = options && options.domain;
+
+    const requestDomain =
+        domain || process.env.VUE_APP_NODE_API || domains.__node;
+
+    let token = getTokenFromUrl();
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -178,14 +198,9 @@ function $node(options) {
             username: token || "",
             password: "node common request",
         },
-        baseURL: domain,
+        baseURL: requestDomain,
     };
 
-    // 是否需要开启本地代理作为测试
-    if (options && options.proxy) {
-        config.baseURL = process.env.NODE_ENV === "production" ? domain : `http://localhost:${options.port}`;
-    }
-
     // 创建实例
     const ins = axios.create(config);
 
@@ -198,8 +213,11 @@ function $node(options) {
 // 默认请求
 function $http(options) {
     let domain = typeof options == "string" ? options : options.domain;
-    let token = getTokenFromUrl()
-    token = token ? token : (localStorage && localStorage.getItem("__token")) || localStorage.getItem("token");
+    let token = getTokenFromUrl();
+    token = token
+        ? token
+        : (localStorage && localStorage.getItem("__token")) ||
+          localStorage.getItem("token");
     let config = {
         // 同时发送cookie和basic auth
         withCredentials: true,
@@ -267,7 +285,8 @@ function installInterceptors(target, options) {
         function (err) {
             if (!options || !options.mute) {
                 if (err.response && err.response.data) {
-                    err.response.data.msg && loadPop(err.response.data.msg, popType);
+                    err.response.data.msg &&
+                        loadPop(err.response.data.msg, popType);
                 } else {
                     loadDefaultRequestErrorPop(err);
                 }
@@ -289,7 +308,11 @@ function installStandardInterceptors(target, options) {
         function (response) {
             if (response.data.code) {
                 if (!options || !options.mute) {
-                    response.data.msg && loadPop(`[${response.data.code}]${response.data.msg}`, popType);
+                    response.data.msg &&
+                        loadPop(
+                            `[${response.data.code}]${response.data.msg}`,
+                            popType
+                        );
                 }
                 return Promise.reject(response);
             }
@@ -298,7 +321,11 @@ function installStandardInterceptors(target, options) {
         function (err) {
             if (!options || !options.mute) {
                 console.log(err.response);
-                if (err.response && err.response.data && err.response.data.msg) {
+                if (
+                    err.response &&
+                    err.response.data &&
+                    err.response.data.msg
+                ) {
                     loadPop(err.response.data.msg, popType);
                 } else {
                     loadDefaultRequestErrorPop(err);
@@ -323,7 +350,10 @@ function installHelperInterceptors(target, options) {
                 return response;
             } else {
                 if (!options || !options.mute) {
-                    loadPop(`[${response.data.code}]${response.data.message}`, popType);
+                    loadPop(
+                        `[${response.data.code}]${response.data.message}`,
+                        popType
+                    );
                 }
                 return Promise.reject(response);
             }
@@ -337,5 +367,4 @@ function installHelperInterceptors(target, options) {
     );
 }
 
-
 export { $cms, $next, $helper, $node, $team, $pay, $lua, $http, axios, SSE };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common",
-    "version": "8.6.8",
+    "version": "8.7.0",
     "description": "JX3BOX公共基础模块",
     "main": "main.js",
     "repository": {