From c02a668806fc8cb3d289eed57222503e4ad2e38a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 23 Mar 2022 19:31:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/api_address_config.js | 6 +- jero-web/src/store/modules/user.js | 108 +++++++++++++++----------- 2 files changed, 64 insertions(+), 50 deletions(-) diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index fe0efdf16..619af5f89 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -3,11 +3,11 @@ */ window._CONFIG = {} window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer -window._CONFIG['domianPreviewURL'] = 'http://localhost:8080/jero-boot' // 路由转发 devServer -window._CONFIG['domianWebSocketURL'] = 'http://localhost:8080/jero-boot' +window._CONFIG['domianPreviewURL'] = '' +window._CONFIG['domianWebSocketURL'] = '' // 单点登录地址 window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download' window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe' window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas' // 预览文件地址 -window._CONFIG['onlinePreviewDomainURL'] = 'http://127.0.0.1:8012/onlinePreview' +window._CONFIG['onlinePreviewDomainURL'] = '' diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 7593389b7..267c01c93 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -1,7 +1,16 @@ import Vue from 'vue' -import { login, logout, phoneLogin, thirdLogin } from "@/api/login" -import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES } from "@/store/mutation-types" -import { welcome } from "@/utils/util" +import { login, logout, phoneLogin, thirdLogin } from '@/api/login' +import { + ACCESS_TOKEN, + USER_NAME, + USER_INFO, + USER_AUTH, + SYS_BUTTON_AUTH, + UI_CACHE_DB_DICT_DATA, + TENANT_ID, + CACHE_INCLUDED_ROUTES +} from '@/store/mutation-types' +import { welcome } from '@/utils/util' import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' @@ -10,7 +19,7 @@ const user = { token: '', username: '', realname: '', - tenantid:'', + tenantid: '', welcome: '', avatar: '', permissionList: [], @@ -37,16 +46,16 @@ const user = { }, SET_TENANT: (state, id) => { state.tenantid = id - }, + } }, actions: { // CAS验证登录 ValidateLogin({ commit }, userInfo) { return new Promise((resolve, reject) => { - getAction("/sys/cas/client/validateLogin",userInfo).then(response => { - console.log("----cas 登录--------",response); - if(response.success){ + getAction('/sys/cas/client/validateLogin', userInfo).then(response => { + console.log('----cas 登录--------', response) + if (response.success) { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) @@ -54,10 +63,10 @@ const user = { Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) - commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() }) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) commit('SET_AVATAR', userInfo.avatar) resolve(response) - }else{ + } else { resolve(response) } }).catch(error => { @@ -69,19 +78,21 @@ const user = { Login({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { - if(response.code =='200'){ + if (response.code == '200') { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) - Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) + window._CONFIG['domianPreviewURL'] = result.domianWebSocketURL+'/jero-boot' + window._CONFIG['domianWebSocketURL'] = result.domianWebSocketURL+'/jero-boot' + window._CONFIG['onlinePreviewDomainURL'] = result.onlinePreviewDomainURL+'/onlinePreview' commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) - commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() }) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) commit('SET_AVATAR', userInfo.avatar) resolve(response) - }else{ + } else { reject(response) } }).catch(error => { @@ -92,46 +103,49 @@ const user = { //手机号登录 PhoneLogin({ commit }, userInfo) { return new Promise((resolve, reject) => { - phoneLogin(userInfo).then(response => { - if(response.code =='200'){ - const result = response.result - const userInfo = result.userInfo - Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) - Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) - Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) - Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) - commit('SET_TOKEN', result.token) - commit('SET_INFO', userInfo) - commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() }) - commit('SET_AVATAR', userInfo.avatar) - resolve(response) - }else{ - reject(response) - } - }).catch(error => { - reject(error) + phoneLogin(userInfo).then(response => { + if (response.code == '200') { + const result = response.result + const userInfo = result.userInfo + Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) + Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000) + commit('SET_TOKEN', result.token) + commit('SET_INFO', userInfo) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) + commit('SET_AVATAR', userInfo.avatar) + resolve(response) + } else { + reject(response) + } + }).catch(error => { + reject(error) + }) }) - }) }, // 获取用户信息 GetPermissionList({ commit }) { return new Promise((resolve, reject) => { queryPermissionsByUser().then(response => { - const menuData = response.result.menu; - const authData = response.result.auth; - const allAuthData = response.result.allAuth; + console.log(response) + const menuData = response.result.menu + const authData = response.result.auth + const allAuthData = response.result.allAuth + 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)); + sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) + sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) if (menuData && menuData.length > 0) { //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ menuData.forEach((item, index) => { - if (item["children"]) { - let hasChildrenMenu = item["children"].filter((i) => { + if (item['children']) { + let hasChildrenMenu = item['children'].filter((i) => { return !i.hidden || i.hidden == false }) if (hasChildrenMenu == null || hasChildrenMenu.length == 0) { - item["hidden"] = true + item['hidden'] = true } } }) @@ -151,7 +165,7 @@ const user = { // 登出 Logout({ commit, state }) { return new Promise((resolve) => { - let logoutToken = state.token; + let logoutToken = state.token commit('SET_TOKEN', '') commit('SET_PERMISSIONLIST', []) Vue.ls.remove(ACCESS_TOKEN) @@ -175,8 +189,8 @@ const user = { // 第三方登录 ThirdLogin({ commit }, param) { return new Promise((resolve, reject) => { - thirdLogin(param.token,param.thirdType).then(response => { - if(response.code =='200'){ + thirdLogin(param.token, param.thirdType).then(response => { + if (response.code == '200') { const result = response.result const userInfo = result.userInfo Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) @@ -184,10 +198,10 @@ const user = { Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) - commit('SET_NAME', { username: userInfo.username,realname: userInfo.realname, welcome: welcome() }) + commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) commit('SET_AVATAR', userInfo.avatar) resolve(response) - }else{ + } else { reject(response) } }).catch(error => { @@ -195,7 +209,7 @@ const user = { }) }) }, - saveTenant({ commit }, id){ + saveTenant({ commit }, id) { Vue.ls.set(TENANT_ID, id, 7 * 24 * 60 * 60 * 1000) commit('SET_TENANT', id) } From 01f64f9b560c182e07555494f81792ea7465ab3e Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 23 Mar 2022 20:23:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B9-=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OnlCgformTagServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index ec3ccf076..6cf30d267 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -89,9 +89,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl Date: Wed, 23 Mar 2022 20:31:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/api_address_config.js | 6 +++--- jero-web/src/components/tools/HeaderNotice.vue | 2 +- jero-web/src/store/modules/user.js | 8 +++++--- .../src/views/documentManage/library/docDetail/index.vue | 2 -- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/public/api_address_config.js b/jero-web/public/api_address_config.js index 619af5f89..2b5512066 100644 --- a/jero-web/public/api_address_config.js +++ b/jero-web/public/api_address_config.js @@ -3,11 +3,11 @@ */ window._CONFIG = {} window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer -window._CONFIG['domianPreviewURL'] = '' -window._CONFIG['domianWebSocketURL'] = '' +window._CONFIG['domianPreviewURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : '' +window._CONFIG['domianWebSocketURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : '' // 单点登录地址 window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download' window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe' window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas' // 预览文件地址 -window._CONFIG['onlinePreviewDomainURL'] = '' +window._CONFIG['onlinePreviewDomainURL'] = localStorage.getItem('onlinePreviewDomainURL') ? localStorage.getItem('onlinePreviewDomainURL') : '' diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index d4dd5b492..ff0621ce9 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -154,7 +154,7 @@ console.log('断开了：' + err) self.connection() } - }, 10000) + }, 5000) }, websocketOnerror: function(e) { console.log('WebSocket连接发生错误') diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index 267c01c93..5743ceaa5 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -84,9 +84,8 @@ const user = { Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) - window._CONFIG['domianPreviewURL'] = result.domianWebSocketURL+'/jero-boot' - window._CONFIG['domianWebSocketURL'] = result.domianWebSocketURL+'/jero-boot' - window._CONFIG['onlinePreviewDomainURL'] = result.onlinePreviewDomainURL+'/onlinePreview' + Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL) + Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL) commit('SET_TOKEN', result.token) commit('SET_INFO', userInfo) commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() }) @@ -132,6 +131,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['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); diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index a6714dca2..0a5a6ee3a 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -247,8 +247,6 @@ let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { - console.log(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) - downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id }) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') } else { From c495bafb87089f8f508a0829f642bed55dcf0d85 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 23 Mar 2022 21:11:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E7=AE=AD?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/search/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 7b6facf89..b2c0eb79f 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -138,7 +138,7 @@ {{$t('query')}} {{$t('reset')}} - {{ toggleSearchStatus ? $t('open') : $t('away') }} + {{ !toggleSearchStatus ? $t('open') : $t('away') }}