From 9a0487a24fc59f435b097f75c754a5ed1f548d2d Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Tue, 10 Aug 2021 18:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4websocket=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development          | 16 ++++++++--------
 .env.production           |  2 +-
 .env.test                 |  2 +-
 src/store/modules/user.js |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.env.development b/.env.development
index 1c60a2e..49cdc66 100644
--- a/.env.development
+++ b/.env.development
@@ -1,16 +1,16 @@
 # 开发环境相关配置
 
-# 微服务IP
-VUE_APP_SERVER_ADDRESS = 'test.sdma.mingansei.com'
+# 项目名称
+VUE_APP_PROJECT_NAME = 'SJJY'
 
-# 省局数据后台IP
-VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130'
+# 微服务IP
+VUE_APP_SERVER_ADDRESS = '192.168.1.130'
 
 # 微服务地址
-VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}'
+VUE_APP_SERVER_API = 'http://${VUE_APP_SERVER_ADDRESS}:9100'
 
-# 项目名称
-VUE_APP_PROJECT_NAME = 'SJJY'
+# 省局数据后台IP
+VUE_APP_SJ_BASE_IP_ADDRESS = '192.168.1.130'
 
 # 业务后台访问地址
 VUE_APP_BASE_API = '${VUE_APP_SERVER_API}/sdma-manage/'
@@ -25,4 +25,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-manage/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
diff --git a/.env.production b/.env.production
index 93f2e3f..6ea4a3a 100644
--- a/.env.production
+++ b/.env.production
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-manage/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
diff --git a/.env.test b/.env.test
index 97a0b2b..82c5c32 100644
--- a/.env.test
+++ b/.env.test
@@ -22,4 +22,4 @@ VUE_APP_SJ_API = 'http://${VUE_APP_SJ_BASE_IP_ADDRESS}:9092/SJSE/'
 VUE_APP_PREVIEW_API = '${VUE_APP_SERVER_API}/sdma-preview/'
 
 # websocket连接地址
-VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-manage/websocket/'
+VUE_APP_WEBSOCKET = 'ws://${VUE_APP_SERVER_ADDRESS}:9100/sdma-websocket/websocket/'
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 45acf9a..da39107 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -5,8 +5,8 @@ import global from '../../utils/common.js'
 import store from '../../store'
 import router, { resetRouter } from '../../router'
 import Vue from 'vue'
-import { getOwnList, getRenwuListByPath } from '@/api/renwu'
-import { getNeedRecordList } from '@/api/ysjl'
+// import { getOwnList, getRenwuListByPath } from '@/api/renwu'
+// import { getNeedRecordList } from '@/api/ysjl'
 
 const user = {
   state: {
@@ -126,7 +126,7 @@ const user = {
           setToken()
           global.it = data.userVO.id
           // 查询相关待办条数
-          const messagePush = []
+          /* const messagePush = []
           const departmentId = user.state.departmentId
           getOwnList({ // 我的任务
             pageNum: 1, // 页码
@@ -263,7 +263,7 @@ const user = {
               })
             })
           }
-          user.state.messageCount = messagePush // 赋值要放在 set_user 后面，否则被冲刷掉了。
+          user.state.messageCount = messagePush*/ // 赋值要放在 set_user 后面，否则被冲刷掉了。
           // 查询路由
           const asyncRouter = filterAsyncRouter(data.menuList)
           asyncRouter.push({ path: '*', redirect: '/404', hidden: true })