diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index eb311642a..deed45193 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) { } export const loadView = (view) => { // 路由懒加载 - return () => import(`@/views/${view}`) + return (resolve) => require([`@/views/${view}`], resolve) } export default permission diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 20f44bf46..dd2b6dbef 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -58,7 +58,7 @@ const user = { } else { commit('SET_ROLES', ['ROLE_DEFAULT']) } - commit('SET_NAME', user.username) + commit('SET_NAME', user.userName) commit('SET_AVATAR', avatar) resolve(res) }).catch(error => { diff --git a/ruoyi/src/main/resources/application-druid.yml b/ruoyi/src/main/resources/application-druid.yml index 1a940ed08..a64e11535 100644 --- a/ruoyi/src/main/resources/application-druid.yml +++ b/ruoyi/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 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 password: tsbz2020! # 从库数据源