Browse Source

修改配置项

master
liuchuang 6 years ago
parent
commit
f2b771d3ff
  1. 8
      public/index.html
  2. 5
      src/router/index.js
  3. 3
      src/views/main-sidebar.vue

8
public/index.html

@ -33,25 +33,29 @@
<!-- 开发环境 --> <!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://10.10.10.118:9094/epdc-api' window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
window.SITE_CONFIG['socketURL'] = 'http://localhost:9094/epdc-api'
</script> </script>
<% } %> <% } %>
<!-- 集成测试环境 --> <!-- 集成测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://219.146.91.110:9094/epdc-api' window.SITE_CONFIG['apiURL'] = 'http://219.146.91.110:9094/epdc-api'
window.SITE_CONFIG['socketURL'] = 'http://219.146.91.110:9094/epdc-api'
</script> </script>
<% } %> <% } %>
<!-- 验收测试环境 --> <!-- 验收测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080' window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
window.SITE_CONFIG['socketURL'] = 'http://localhost:9094/epdc-api'
</script> </script>
<% } %> <% } %>
<!-- 生产环境 --> <!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'https://epdc-api.elinkchina.com.cn/epdc-api' window.SITE_CONFIG['apiURL'] = 'https://epdc-api.elinkchina.com.cn/epdc-api'
window.SITE_CONFIG['socketURL'] = 'https://epdc-api.elinkchina.com.cn/epdc-api'
</script> </script>
<% } %> <% } %>
</head> </head>

5
src/router/index.js

@ -2,6 +2,7 @@ import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'
import http from '@/utils/request' import http from '@/utils/request'
import { isURL } from '@/utils/validate' import { isURL } from '@/utils/validate'
import Cookies from 'js-cookie'
Vue.use(Router) Vue.use(Router)
@ -46,6 +47,10 @@ const router = new Router({
}) })
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
var token = Cookies.get('token')
if (to.path === '/login' && token !== undefined && token !== null && token !== '') {
return next({ name: 'home' })
}
// 添加动态(菜单)路由 // 添加动态(菜单)路由
// 已添加或者当前路由为页面路由, 可直接访问 // 已添加或者当前路由为页面路由, 可直接访问
if (window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] || fnCurrentRouteIsPageRoute(to, pageRoutes)) { if (window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {

3
src/views/main-sidebar.vue

@ -101,7 +101,8 @@ export default {
}, },
connection () { connection () {
// //
this.socket = new SockJS('http://219.146.91.110:9094/epdc-api/ws/menuNoticeEndpoint')// 广httpWebSocketws let socketUrl = window.SITE_CONFIG['socketURL'] + '/ws/menuNoticeEndpoint'
this.socket = new SockJS(socketUrl)// 广httpWebSocketws
// STOMP // STOMP
this.stompClient = Stomp.over(this.socket) this.stompClient = Stomp.over(this.socket)

Loading…
Cancel
Save