From 0be722c32832bacf87859f35d705272eb9bddc40 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Sat, 9 Jul 2022 18:48:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E-sys=5Fconfig=20=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=20(http)=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index e9ac8cedf..95d3b68f8 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -39,4 +39,9 @@ MODIFY COLUMN `verify_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLA -- 2022年7月9日通知标题长度 已同步正式环境 ALTER TABLE `laws_weilai`.`sys_announcement` - MODIFY COLUMN `titile` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `id`; \ No newline at end of file + MODIFY COLUMN `titile` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `id`; + +-- 2022年7月9日 增加配置数据 未同步 +INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` ) +VALUES +( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'fileViewURL' ); From 8f96072fe45941841b0cda93dc2486d5e61d2ab1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Sat, 9 Jul 2022 19:00:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 95d3b68f8..7e0407bd1 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -41,7 +41,7 @@ MODIFY COLUMN `verify_deliverable_type` varchar(500) CHARACTER SET utf8mb4 COLLA ALTER TABLE `laws_weilai`.`sys_announcement` MODIFY COLUMN `titile` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `id`; --- 2022年7月9日 增加配置数据 未同步 +-- 2022年7月9日 增加配置数据 已同步正式环境 INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` ) VALUES ( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'fileViewURL' ); From 7a8a2c27d61c3a2fb9cd29ac4aa9bf52eaa14cb2 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 9 Jul 2022 19:04:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E5=A5=97?= =?UTF-8?q?=E8=AE=BF=E9=97=AEhttp=E7=9A=84=E5=90=8E=E7=AB=AF=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/api_address_config.js | 2 +- jero-web/src/components/jero/JImageUpload.vue | 2 +- jero-web/src/components/jero/JUpload.vue | 2 +- jero-web/src/permission.js | 1 + jero-web/src/store/modules/user.js | 5 ++--- jero-web/src/utils/socketVuex.js | 1 - jero-web/src/utils/socketVuexOne.js | 1 - jero-web/src/views/modules/oss/OSSFileList.vue | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) 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) } From 30cd2da2702940f22aa336f23a7c70be28d0900c Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Sat, 9 Jul 2022 19:05:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E7=BD=AEsql=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/first_bug_fix_record.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql index 7e0407bd1..e762a0d48 100644 --- a/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql +++ b/jero-boot/db/蔚来标准sql/first_bug_fix_record.sql @@ -44,4 +44,4 @@ ALTER TABLE `laws_weilai`.`sys_announcement` -- 2022年7月9日 增加配置数据 已同步正式环境 INSERT INTO `sys_config` ( `id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name` ) VALUES -( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'fileViewURL' ); +( '3', 'admin', '2022-07-09 18:38:23', 'admin', '2022-07-09 18:38:28', 'A01', 'http://localhost:8080', 'domianPreviewURL' );