From 69194ad6dffa35e48043a06e4ffcce6a28caeda3 Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Wed, 6 May 2020 10:44:06 +0800
Subject: [PATCH] =?UTF-8?q?20200506-zlp-1=20=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BA=E5=BC=80=E5=8F=91=E5=BA=93=EF=BC=8C?=
=?UTF-8?q?=E4=B8=8E=E6=B5=8B=E8=AF=95=E5=BA=93=E5=88=86=E7=A6=BB=20?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AFstore/modules?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/store/modules/permission.js | 2 +-
ruoyi-ui/src/store/modules/user.js | 2 +-
ruoyi/src/main/resources/application-druid.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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!
# 从库数据源