From 6dea372e6af7f042c1df2b6b76881bdfde97758b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 13 Sep 2023 09:14:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/auth/SysUserController.java | 8 ++++---- src/main/java/com/glxp/api/entity/auth/AuthAdmin.java | 2 +- src/main/resources/application-dev.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 76736556..00555858 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -282,7 +282,7 @@ public class SysUserController extends BaseController { } AuthAdmin authAdmin = new AuthAdmin(); - BeanUtil.copyProperties(authUserSaveRequest, authAdmin); + BeanUtils.copyProperties(authUserSaveRequest, authAdmin); if (authAdmin.getPassWord() != null) { authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); } @@ -295,9 +295,9 @@ public class SysUserController extends BaseController { // 修改角色(供应商账号) AuthAdmin byId = userService.findById(authUserSaveRequest.getId()); - if("110".equals(byId.getCustomerId())){ - userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); - } + if ("110".equals(byId.getCustomerId())) { + userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); + } userService.updateAuthAdmin(authAdmin); diff --git a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index 64345ab3..d9de5ed7 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -59,4 +59,4 @@ public class AuthAdmin { public boolean isAdmin() { return Constant.ADMIN_ID.equals(this.id + ""); } -} \ No newline at end of file +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c57b24dd..f0db8fbc 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_px?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60