0.0.38

增加环境变量

.env.development

@@ -1,8 +1,10 @@
 # just a flag
 ENV = 'development'
 
+VUE_APP_BASE_WEBSOCKET = 'ws://183.131.25.186:9506'
 # base api
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://183.131.25.186:9501'
 '
 
 
+

.env.fengrui

@@ -0,0 +1,5 @@
+# just a flag
+ENV = 'liujian'
+
+# base api
+VUE_APP_BASE_API = 'http://192.168.1.201:9501'

.env.liujian

@@ -0,0 +1,7 @@
+# just a flag
+ENV = 'liujian'
+
+# base api
+VUE_APP_BASE_API = 'http://192.168.1.127:9501'
+# base websocket
+VUE_APP_BASE_WEBSOCKET = 'ws://192.168.1.127:9506'

.env.liujiawei

@@ -0,0 +1,7 @@
+# just a flag
+ENV = 'liujian'
+
+# base api
+VUE_APP_BASE_API = 'http://192.168.1.201:9501'
+# base websocket
+VUE_APP_BASE_WEBSOCKET = 'ws://192.168.1.201:9506'

package.json

@@ -12,7 +12,9 @@
     "new": "plop",
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit"
+    "test:ci": "npm run lint && npm run test:unit",
+    "liujian": "cross-env NODE_ENV=development vue-cli-service serve --mode liujian",
+    "liujiawei": "cross-env NODE_ENV=development vue-cli-service serve --mode liujiawei"
   },
   "dependencies": {
     "axios": "0.18.1",
@@ -63,6 +65,7 @@
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
+    "cross-env": "^7.0.3",
     "eslint": "6.7.2",
     "eslint-plugin-vue": "6.2.2",
     "html-webpack-plugin": "3.2.0",

src/utils/request.js

@@ -7,8 +7,8 @@ import URL from '@/utils/baseUrl';
 // create an axios instance
 const service = axios.create({
   //千万不能在这里使用绝对地址，这会导致webpack的devserve不生效
-  baseURL: URL.baseUrl,
-  //baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  //baseURL: URL.baseUrl,
+  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   //withCredentials: true, // send cookies when cross-domain requests
   timeout: 50000 // request timeout
 })

src/views/chat/hall.vue

@@ -2381,7 +2381,8 @@ export default {
     //console.log("Admin-Token:", adminToken);
 
     //2.连接websocket 
-    let websocketNewUrl = URL.WebsocketUrl +"?token=" + adminToken;
+    let websocketNewUrl = process.env.VUE_APP_BASE_WEBSOCKET +"?token=" + adminToken;
+    //let websocketNewUrl = URL.WebsocketUrl +"?token=" + adminToken;
     this.ws = new WebSocket(websocketNewUrl);
     this.ws.addEventListener('message', this.handleIncomingMessage);