Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200506-zlp-1

Browse Source 
数据库新增为开发库，与测试库分离
更新前端store/modules
This commit is contained in:
paidaxing444 2020-05-06 10:44:06 +08:00
parent 6e7c84d397
commit 69194ad6df
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/store/modules/permission.js
View File

@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) {
} }
export const loadView = (view) => { // 路由懒加载 export const loadView = (view) => { // 路由懒加载
return () => import(`@/views/${view}`) return (resolve) => require([`@/views/${view}`], resolve)
} }
export default permission export default permission

2
ruoyi-ui/src/store/modules/user.js
View File

@ -58,7 +58,7 @@ const user = {
} else { } else {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit('SET_ROLES', ['ROLE_DEFAULT'])
} }
commit('SET_NAME', user.username) commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
resolve(res) resolve(res)
}).catch(error => { }).catch(error => {

2
ruoyi/src/main/resources/application-druid.yml
View File

@ -6,7 +6,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://120.53.14.147:3306/benyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://120.53.14.147:3306/benyi-vue-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: tsbz2020! password: tsbz2020!
# 从库数据源 # 从库数据源