diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index 2b5512066..806fb064b 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -3,7 +3,7 @@ */ window._CONFIG = {} window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer -window._CONFIG['domianPreviewURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : '' +window._CONFIG['domianPreviewURL'] = localStorage.getItem('domianPreviewURL') ? localStorage.getItem('domianPreviewURL') : '' window._CONFIG['domianWebSocketURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : '' // 单点登录地址 window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download' diff --git a/jero-web/src/components/jero/JImageUpload.vue b/jero-web/src/components/jero/JImageUpload.vue index d15afd02a..51b311fa3 100644 --- a/jero-web/src/components/jero/JImageUpload.vue +++ b/jero-web/src/components/jero/JImageUpload.vue @@ -171,7 +171,7 @@ // 预览 handlePreview(file) { if (file && file.url) { - var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + var fileFullUrl = `${window._CONFIG['domianPreviewURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` window.open(url) } diff --git a/jero-web/src/components/jero/JUpload.vue b/jero-web/src/components/jero/JUpload.vue index 7631f7cb5..98fd85c0d 100644 --- a/jero-web/src/components/jero/JUpload.vue +++ b/jero-web/src/components/jero/JUpload.vue @@ -267,7 +267,7 @@ }, handlePreview(file) { if (file && file.url) { - var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` + var fileFullUrl = `${window._CONFIG['domianPreviewURL']}/sys/common/download/${file.response.result.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` window.open(url) } diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index cfde5c21f..52be797eb 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -33,6 +33,7 @@ router.beforeEach((to, from, next) => { Vue.ls.set(UI_CACHE_DB_DICT_DATA, res.result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) Vue.ls.set('domianWebSocketURL', res.result.domianWebSocketURL) Vue.ls.set('onlinePreviewDomainURL', res.result.onlinePreviewDomainURL) + Vue.ls.set('domianPreviewURL', res.result.domianPreviewURL) store.commit('SET_TOKEN', res.result.token) store.commit('SET_INFO', res.result.userInfo) store.commit('SET_NAME', { diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 5743ceaa5..74125ad9d 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -86,6 +86,7 @@ const user = { Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL) Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL) + Vue.ls.set('domianPreviewURL', result.domianPreviewURL) commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) @@ -131,11 +132,9 @@ const user = { const menuData = response.result.menu const authData = response.result.auth const allAuthData = response.result.allAuth - window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot' + window._CONFIG['domianPreviewURL'] = Vue.ls.get('domianPreviewURL') + '/jero-boot' window._CONFIG['domianWebSocketURL'] = Vue.ls.get('domianWebSocketURL') + '/jero-boot' window._CONFIG['onlinePreviewDomainURL'] = Vue.ls.get('onlinePreviewDomainURL') + '/onlinePreview' - const onlinePreviewDomainURL = response.result.onlinePreviewDomainURL - const domianWebSocketURL = response.result.domianWebSocketURL //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) diff --git a/jero-web/src/utils/socketVuex.js b/jero-web/src/utils/socketVuex.js index 733cb2dce..81a0b3f99 100644 --- a/jero-web/src/utils/socketVuex.js +++ b/jero-web/src/utils/socketVuex.js @@ -3,7 +3,6 @@ import Vuex from 'vuex' import store from '@/store/' Vue.use(Vuex) -// console.log(window._CONFIG['domianWebSocketURL']) export default new Vuex.Store({ state: { diff --git a/jero-web/src/utils/socketVuexOne.js b/jero-web/src/utils/socketVuexOne.js index 5e1e6a4ae..0dc3b1700 100644 --- a/jero-web/src/utils/socketVuexOne.js +++ b/jero-web/src/utils/socketVuexOne.js @@ -3,7 +3,6 @@ import Vuex from 'vuex' import store from '@/store/' Vue.use(Vuex) -// console.log(window._CONFIG['domianWebSocketURL']) export default new Vuex.Store({ state: { diff --git a/jero-web/src/views/modules/oss/OSSFileList.vue b/jero-web/src/views/modules/oss/OSSFileList.vue index 6029c553d..6c83e2dc4 100644 --- a/jero-web/src/views/modules/oss/OSSFileList.vue +++ b/jero-web/src/views/modules/oss/OSSFileList.vue @@ -168,7 +168,7 @@ }, handlePreview(record) { if (record && record.url) { - var fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${record.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileName}` + var fileFullUrl = `${window._CONFIG['domianPreviewURL']}/sys/common/download/${record.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileName}` let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}` window.open(url) }