diff --git a/dl_vue/.env.development b/dl_vue/.env.development index 4369277..34d7a41 100644 --- a/dl_vue/.env.development +++ b/dl_vue/.env.development @@ -9,3 +9,6 @@ VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true + +# websocket +VUE_APP_WEBSOCKET = 'ws://localhost:8099/ws/asset/' diff --git a/dl_vue/.env.production b/dl_vue/.env.production index c02750e..c760d7b 100644 --- a/dl_vue/.env.production +++ b/dl_vue/.env.production @@ -6,3 +6,6 @@ ENV = 'production' # 通告快接管理后台/生产环境 VUE_APP_BASE_API = 'https://www.ddtg.site/noticeApi' + +# websocket +VUE_APP_WEBSOCKET = 'ws://localhost:8099/ws/asset/' diff --git a/dl_vue/.env.staging b/dl_vue/.env.staging index f4d8776..690111f 100644 --- a/dl_vue/.env.staging +++ b/dl_vue/.env.staging @@ -10,3 +10,6 @@ ENV = 'staging' # 成事达管理平台/测试环境 VUE_APP_BASE_API = '/stage-api' + +# websocket +VUE_APP_WEBSOCKET = 'ws://localhost:8099/ws/asset/' diff --git a/dl_vue/src/App.vue b/dl_vue/src/App.vue index 7478ac4..a502bf5 100644 --- a/dl_vue/src/App.vue +++ b/dl_vue/src/App.vue @@ -22,7 +22,7 @@ export default { }, created () { const username = Cookies.get('username') - this.$store.dispatch('websocket_init', "ws://localhost:8099/ws/asset/"+username) + this.$store.dispatch('websocket_init', process.env.VUE_APP_WEBSOCKET+username) }, metaInfo() { return { diff --git a/dl_vue/src/main.js b/dl_vue/src/main.js index c08a0da..7d156c2 100644 --- a/dl_vue/src/main.js +++ b/dl_vue/src/main.js @@ -49,7 +49,6 @@ Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.download = download Vue.prototype.handleTree = handleTree -Vue.prototype.$websocket=websocket; // 全局组件挂载 Vue.component('DictTag', DictTag) diff --git a/dl_vue/src/views/login.vue b/dl_vue/src/views/login.vue index 07479d1..3b30b79 100644 --- a/dl_vue/src/views/login.vue +++ b/dl_vue/src/views/login.vue @@ -189,7 +189,7 @@ export default { Cookies.remove('rememberMe') } this.$store.dispatch('Login', this.loginForm).then(() => { - this.$store.dispatch('websocket_init', "ws://localhost:8099/ws/asset/"+this.loginForm.username) + this.$store.dispatch('websocket_init', process.env.VUE_APP_WEBSOCKET+this.loginForm.username) listAllSite().then(response => { if (response.data && response.data.length > 0) { response.data.map((item) => {