From c67b054a755ae69f660c30d5ec2c065e7ba37a23 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Fri, 4 Jun 2021 09:50:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(core):=20=E5=8D=87=E7=BA=A7mysql=20controll?=
 =?UTF-8?q?er=E6=B7=BB=E5=8A=A0=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

升级mysql controller添加名称
---
 .../core/apiservice/controller/busi/SysUserController.java       | 9 +++++----
 pom.xml                                                          | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
index 1c30f3f..c8ea0f9 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
@@ -485,21 +485,22 @@ public class SysUserController extends CoreBaseController {
 
     /**
      * 根据id重置用户密码,自己设置密码
+     *
      * @param id 用户id
      * @return 处理结果
      */
     @PostMapping("/reset-pwd/{id}/{password}")
-    @ApiOperation(value = "密码重置(输入)",notes = "根据id和录入密码重置用户密码")
-    public ResultBean updateResetPassword(@PathVariable String id,@PathVariable String password){
+    @ApiOperation(value = "密码重置(输入)", notes = "根据id和录入密码重置用户密码")
+    public ResultBean updateResetPassword(@PathVariable("id") String id, @PathVariable("password") String password) {
         try {
             startMultiService();
 
             SysUser user = sysUserService.getSysUserById(Long.parseLong(id));
-            if(user != null){
+            if (user != null) {
                 Integer num = personnelService.checkSysUserResetPassword(user);
                 num = CommonConstWords.CONFIG_PWD_RESET_PASSWORD_DEFAULT - num;
 
-                userPasswordService.updatePasswordResetLastModifyTime(user.getId(),password);
+                userPasswordService.updatePasswordResetLastModifyTime(user.getId(), password);
                 LOGGER.info("系统提示：{} 使用密码重置功能帮{}重置了{}账号的密码，新密码是：{}",
                         getSessionUser().getUserName(),user.getUserName(),user.getUserLoginName(),password);
 
diff --git a/pom.xml b/pom.xml
index 2664636..addf3e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.49</version>
+                <version>8.0.11</version>
             </dependency>
 
             <!-- oracle -->