Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-#VUE_APP_BASE_API= http://192.168.0.98:11091/m
-VUE_APP_BASE_API= /basics_api/m
+VUE_APP_BASE_API= http://192.168.0.98:11091/m
+#VUE_APP_BASE_API= /basics_api/m

device-manager-ui/admin/.env.production

 # 生产环境配置
 NODE_ENV = production
 
-# 地址
-VUE_APP_BASE_API = /basics_api/m
-
 # websocket地址
-VUE_APP_WEBSOCKET_API =192.168.0.98:18222/m
+VUE_APP_WEBSOCKET_API =192.168.0.251:18222/m
 
 # 门户登录地址
 VUE_APP_PORTAL_URL =/portal_home
 
 
 # 站点请求地址
-VUE_APP_SITETREE_URL = /basics_api/base/site/siteTree
\ No newline at end of file
+VUE_APP_SITETREE_URL = http://192.168.0.251:11078/base/site/siteTree
\ No newline at end of file

device-manager-ui/admin/.env.test

@@ -2,7 +2,7 @@
 NODE_ENV = 'test'
 
 # 地址
-VUE_APP_BASE_API = /basics_api/m
+VUE_APP_BASE_API = http://192.168.0.98:11091/m
 
 # websocket地址
 VUE_APP_WEBSOCKET_API =192.168.0.98:18222/m
@@ -12,4 +12,4 @@ VUE_APP_PORTAL_URL =/portal_home
 
 
 # 站点请求地址
-VUE_APP_SITETREE_URL = /basics_api/base/site/siteTree
\ No newline at end of file
+VUE_APP_SITETREE_URL = http://192.168.0.98:11078/base/site/siteTree
\ No newline at end of file

device-manager-ui/admin/.env.yibin

@@ -2,14 +2,14 @@
 NODE_ENV = production
 
 # 地址
-VUE_APP_BASE_API = /basics_api/m
+VUE_APP_BASE_API = http://192.168.2.144:11091/m
 
 # websocket地址
-VUE_APP_WEBSOCKET_API =192.168.0.98:18222/m
+VUE_APP_WEBSOCKET_API =192.168.2.144:18222/m
 
 # 门户登录地址
-VUE_APP_PORTAL_URL =/portal_home
+VUE_APP_PORTAL_URL = /portal_home
 
 
 # 站点请求地址
-VUE_APP_SITETREE_URL = /basics_api/base/site/siteTree
\ No newline at end of file
+VUE_APP_SITETREE_URL = http://192.168.2.144:11078/base/site/siteTree
\ No newline at end of file

device-manager-ui/admin/src/assets/utils/ajax.js

 import axios from "axios";
-// import Qs from "qs";
+import Qs from "qs";
 const JSONbig = require("json-bigint")({ storeAsString: true });
-// import cookie from "./cookie";
+import cookie from "./cookie";
 import httpErrorHandler from "./httpErrorHandler";
+
 const instance = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API,
+  baseURL: "/m",
   headers: {
     post: {
       "Content-Type": "application/json;charset=UTF-8",
@@ -34,8 +35,7 @@ instance.interceptors.request.use(
     // console.log("sessionStorage",window.sessionStorage)
     config.headers.Authorization = window.sessionStorage.getItem("token") || "";
     //console.log("request config and session",config,window.sessionStorage);
-    // config.baseURL = "";
-    console.log(">>>", config);
+    console.log(config);
     return config;
   },
   (err) => {

device-manager-ui/admin/src/views/login/authentication.vue

@@ -22,11 +22,11 @@ export default {
     },
     loginFail(error) {
       this.$message.error(error.message || "请登录");
-      console.log("<<", process.env.VUE_APP_BASE_API);
-      // window.location.href =
-      //   process.env.VUE_APP_PORTAL_URL == "undefined"
-      //     ? "http://192.168.0.98:11072"
-      //     : process.env.VUE_APP_PORTAL_URL;
+      // console.log("<<", process.env.VUE_APP_BASE_API);
+      window.location.href =
+        process.env.VUE_APP_PORTAL_URL == "undefined"
+          ? "http://192.168.0.98:11072"
+          : process.env.VUE_APP_PORTAL_URL;
     },
   },
   computed: {