WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liyawei
2022-03-23 21:11:32 +08:00
parent 86a435a4bb c495bafb87
commit f831a2791b
6 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+14 -2
View File
@@ -89,9 +89,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
@Override @Override
public Integer queryExitTableData(OnlCgformTag onlCgformTag) { public Integer queryExitTableData(OnlCgformTag onlCgformTag) {
//设置标签存入数据库的字段类型 //设置标签存入数据库的字段类型
if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER)){ if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER.getValue())){
onlCgformTag.setDbType("int"); onlCgformTag.setDbType("int");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE) && onlCgformTag.equals(FieldTypeEnum.DATE_MORE)){ }else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE.getValue())){
onlCgformTag.setDbType("Date");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_MORE.getValue())){
onlCgformTag.setDbType("Date"); onlCgformTag.setDbType("Date");
}else{ }else{
onlCgformTag.setDbType("String"); onlCgformTag.setDbType("String");
@@ -123,6 +125,16 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
onlCgformTag.setUpdateTime(now); onlCgformTag.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
onlCgformTag.setUpdateBy(sysUser.getRealname()); onlCgformTag.setUpdateBy(sysUser.getRealname());
//设置标签存入数据库的字段类型
if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.TEXT_NUMBER.getValue())){
onlCgformTag.setDbType("int");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_SINGLE.getValue())){
onlCgformTag.setDbType("Date");
}else if(onlCgformTag.getFieldShowType().equals(FieldTypeEnum.DATE_MORE.getValue())){
onlCgformTag.setDbType("Date");
}else{
onlCgformTag.setDbType("String");
}
saveOrUpdate(onlCgformTag); saveOrUpdate(onlCgformTag);
} }
jero-web/public/api_address_config.js
Vendored
+3 -3
View File
@@ -3,11 +3,11 @@
*/ */
window._CONFIG = {} window._CONFIG = {}
window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer window._CONFIG['domianURL'] = '/jero-boot' // 路由转发 devServer
window._CONFIG['domianPreviewURL'] = 'http://localhost:8080/jero-boot' // 路由转发 devServer window._CONFIG['domianPreviewURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : ''
window._CONFIG['domianWebSocketURL'] = 'http://localhost:8080/jero-boot' window._CONFIG['domianWebSocketURL'] = localStorage.getItem('domianWebSocketURL') ? localStorage.getItem('domianWebSocketURL') : ''
// 单点登录地址 // 单点登录地址
window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download' window._CONFIG['staticDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/download'
window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe' window._CONFIG['pdfDomainURL'] = window._CONFIG['domianURL'] + '/sys/common/pdf/pdfPreviewIframe'
window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas' window._CONFIG['casPrefixUrl'] = 'http://cas.example.org:8443/cas'
// 预览文件地址 // 预览文件地址
window._CONFIG['onlinePreviewDomainURL'] = 'http://127.0.0.1:8012/onlinePreview' window._CONFIG['onlinePreviewDomainURL'] = localStorage.getItem('onlinePreviewDomainURL') ? localStorage.getItem('onlinePreviewDomainURL') : ''
jero-web/src/components/search/index.vue
+1 -1
View File
@@ -138,7 +138,7 @@
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3"> <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
{{ toggleSearchStatus ? $t('open') : $t('away') }} {{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a> </a>
</a-col> </a-col>
jero-web/src/components/tools/HeaderNotice.vue
+1 -1
View File
@@ -154,7 +154,7 @@
console.log('断开了：' + err) console.log('断开了：' + err)
self.connection() self.connection()
} }
}, 10000) }, 5000)
}, },
websocketOnerror: function(e) { websocketOnerror: function(e) {
console.log('WebSocket连接发生错误') console.log('WebSocket连接发生错误')
jero-web/src/store/modules/user.js
+63 -47
View File
@@ -1,7 +1,16 @@
import Vue from 'vue' import Vue from 'vue'
import { login, logout, phoneLogin, thirdLogin } from "@/api/login" 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 {
import { welcome } from "@/utils/util" 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 { queryPermissionsByUser } from '@/api/api'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
@@ -10,7 +19,7 @@ const user = {
token: '', token: '',
username: '', username: '',
realname: '', realname: '',
tenantid:'', tenantid: '',
welcome: '', welcome: '',
avatar: '', avatar: '',
permissionList: [], permissionList: [],
@@ -37,16 +46,16 @@ const user = {
}, },
SET_TENANT: (state, id) => { SET_TENANT: (state, id) => {
state.tenantid = id state.tenantid = id
}, }
}, },
actions: { actions: {
// CAS验证登录 // CAS验证登录
ValidateLogin({ commit }, userInfo) { ValidateLogin({ commit }, userInfo) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getAction("/sys/cas/client/validateLogin",userInfo).then(response => { getAction('/sys/cas/client/validateLogin', userInfo).then(response => {
console.log("----cas 登录--------",response); console.log('----cas 登录--------', response)
if(response.success){ if (response.success) {
const result = response.result const result = response.result
const userInfo = result.userInfo const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) 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) Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token) commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo) 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) commit('SET_AVATAR', userInfo.avatar)
resolve(response) resolve(response)
}else{ } else {
resolve(response) resolve(response)
} }
}).catch(error => { }).catch(error => {
@@ -69,19 +78,20 @@ const user = {
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(userInfo).then(response => { login(userInfo).then(response => {
if(response.code =='200'){ if (response.code == '200') {
const result = response.result const result = response.result
const userInfo = result.userInfo const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) 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_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
Vue.ls.set(USER_INFO, userInfo, 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) Vue.ls.set('domianWebSocketURL', result.domianWebSocketURL)
Vue.ls.set('onlinePreviewDomainURL', result.onlinePreviewDomainURL)
commit('SET_TOKEN', result.token) commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo) 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) commit('SET_AVATAR', userInfo.avatar)
resolve(response) resolve(response)
}else{ } else {
reject(response) reject(response)
} }
}).catch(error => { }).catch(error => {
@@ -92,46 +102,52 @@ const user = {
//手机号登录 //手机号登录
PhoneLogin({ commit }, userInfo) { PhoneLogin({ commit }, userInfo) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
phoneLogin(userInfo).then(response => { phoneLogin(userInfo).then(response => {
if(response.code =='200'){ if (response.code == '200') {
const result = response.result const result = response.result
const userInfo = result.userInfo const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) 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_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
Vue.ls.set(USER_INFO, userInfo, 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) Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token) commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo) 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) commit('SET_AVATAR', userInfo.avatar)
resolve(response) resolve(response)
}else{ } else {
reject(response) reject(response)
} }
}).catch(error => { }).catch(error => {
reject(error) reject(error)
})
}) })
})
}, },
// 获取用户信息 // 获取用户信息
GetPermissionList({ commit }) { GetPermissionList({ commit }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
queryPermissionsByUser().then(response => { queryPermissionsByUser().then(response => {
const menuData = response.result.menu; console.log(response)
const authData = response.result.auth; const menuData = response.result.menu
const allAuthData = response.result.allAuth; 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); //Vue.ls.set(USER_AUTH,authData);
sessionStorage.setItem(USER_AUTH,JSON.stringify(authData)); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData))
sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData)); sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData))
if (menuData && menuData.length > 0) { if (menuData && menuData.length > 0) {
//update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
menuData.forEach((item, index) => { menuData.forEach((item, index) => {
if (item["children"]) { if (item['children']) {
let hasChildrenMenu = item["children"].filter((i) => { let hasChildrenMenu = item['children'].filter((i) => {
return !i.hidden || i.hidden == false return !i.hidden || i.hidden == false
}) })
if (hasChildrenMenu == null || hasChildrenMenu.length == 0) { if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
item["hidden"] = true item['hidden'] = true
} }
} }
}) })
@@ -151,7 +167,7 @@ const user = {
// 登出 // 登出
Logout({ commit, state }) { Logout({ commit, state }) {
return new Promise((resolve) => { return new Promise((resolve) => {
let logoutToken = state.token; let logoutToken = state.token
commit('SET_TOKEN', '') commit('SET_TOKEN', '')
commit('SET_PERMISSIONLIST', []) commit('SET_PERMISSIONLIST', [])
Vue.ls.remove(ACCESS_TOKEN) Vue.ls.remove(ACCESS_TOKEN)
@@ -175,8 +191,8 @@ const user = {
// 第三方登录 // 第三方登录
ThirdLogin({ commit }, param) { ThirdLogin({ commit }, param) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
thirdLogin(param.token,param.thirdType).then(response => { thirdLogin(param.token, param.thirdType).then(response => {
if(response.code =='200'){ if (response.code == '200') {
const result = response.result const result = response.result
const userInfo = result.userInfo const userInfo = result.userInfo
Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
@@ -184,10 +200,10 @@ const user = {
Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
commit('SET_TOKEN', result.token) commit('SET_TOKEN', result.token)
commit('SET_INFO', userInfo) 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) commit('SET_AVATAR', userInfo.avatar)
resolve(response) resolve(response)
}else{ } else {
reject(response) reject(response)
} }
}).catch(error => { }).catch(error => {
@@ -195,7 +211,7 @@ const user = {
}) })
}) })
}, },
saveTenant({ commit }, id){ saveTenant({ commit }, id) {
Vue.ls.set(TENANT_ID, id, 7 * 24 * 60 * 60 * 1000) Vue.ls.set(TENANT_ID, id, 7 * 24 * 60 * 60 * 1000)
commit('SET_TENANT', id) commit('SET_TENANT', id)
} }
jero-web/src/views/documentManage/library/docDetail/index.vue
-2
View File
@@ -247,8 +247,6 @@
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
} else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') { } 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) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
window.open(url, '_blank') window.open(url, '_blank')
} else { } else {