From 8b41455bd3ca1d197b86428186f8fd62d4a50fb6 Mon Sep 17 00:00:00 2001
From: Nick <1528282042@qq.com>
Date: Fri, 27 Mar 2020 14:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=98=BF=E9=87=8C=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E8=A7=84=E8=8C=83=E7=A8=8D=E5=BE=AE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E4=B8=8B=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/me/zhengjie/config/RedisConfig.java         | 2 ++
 .../zhengjie/modules/mnt/service/impl/DeployServiceImpl.java  | 2 +-
 .../me/zhengjie/modules/security/rest/AuthController.java     | 1 +
 eladmin-system/src/main/resources/config/application-prod.yml | 2 +-
 sql/eladmin-user.sql                                          | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
index c6be7dda..ea86d9e5 100644
--- a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
+++ b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
@@ -24,6 +24,8 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.RedisSerializer;
+
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java
index 47e95a39..85017df6 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/service/impl/DeployServiceImpl.java
@@ -48,7 +48,7 @@ public class DeployServiceImpl implements DeployService {
 
 	private final DeployHistoryService deployHistoryService;
 
-	// 循环次数
+	/** 循环次数*/
 	private final Integer count = 30;
 
 	public DeployServiceImpl(DeployRepository deployRepository, DeployMapper deployMapper, ServerDeployService serverDeployService, DeployHistoryService deployHistoryService) {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
index 6a0e5631..c29ca0cd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthController.java
@@ -6,6 +6,7 @@ import cn.hutool.crypto.asymmetric.RSA;
 import com.wf.captcha.ArithmeticCaptcha;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.aop.log.Log;
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
index f9017058..bd624ddf 100644
--- a/eladmin-system/src/main/resources/config/application-prod.yml
+++ b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: root
-      password: 123456
+      password: root
 
       # 初始化配置
       initial-size: 3
diff --git a/sql/eladmin-user.sql b/sql/eladmin-user.sql
index 9ae6f131..d33072a6 100644
--- a/sql/eladmin-user.sql
+++ b/sql/eladmin-user.sql
@@ -1,2 +1,2 @@
-# 用户加密方式变动，改为 BCryptPasswordEncoder方式： SHA-256 +随机盐+密钥对密码进行加密，替换后的明文密码为 123456
-update user set `password` = "$2a$10$HhxyGZy.ulf3RvAwaHUGb.k.2i9PBpv4YbLMJWp8pES7pPhTyRCF." WHERE `password` = "e10adc3949ba59abbe56e057f20f883e"
\ No newline at end of file
+--用户加密方式变动，改为 BCryptPasswordEncoder方式： SHA-256 +随机盐+密钥对密码进行加密，替换后的明文密码为 123456
+update `user` set `password` = "$2a$10$HhxyGZy.ulf3RvAwaHUGb.k.2i9PBpv4YbLMJWp8pES7pPhTyRCF." WHERE `password` = "e10adc3949ba59abbe56e057f20f883e"
\ No newline at end of file