From 1d250a126a86f090c7468d33a308e5cfe429b577 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 13 Oct 2018 22:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=90=84=E7=A7=8D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BAautoconfigure=EF=BC=8C=E7=AE=80=E5=8C=96=20Ap?=
 =?UTF-8?q?plication.java=EF=BC=9B=E6=96=B0=E5=A2=9EPwdUtils=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/sys/web/LoginController.java  | 4 ++--
 .../jeesite/modules/sys/web/user/AccountController.java    | 7 ++++---
 .../src/test/java/com/jeesite/test/ApplicationTest.java    | 2 +-
 web/src/main/java/com/jeesite/modules/Application.java     | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
index 7fbc2eae..e7e8112b 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
@@ -33,7 +33,7 @@ import com.jeesite.common.web.CookieUtils;
 import com.jeesite.common.web.http.ServletUtils;
 import com.jeesite.modules.sys.entity.Menu;
 import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.service.UserService;
+import com.jeesite.modules.sys.utils.PwdUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 
 /**
@@ -280,7 +280,7 @@ public class LoginController extends BaseController{
 		}
 		
 		// 初始密码策略和密码修改策略验证（0：关闭；1：提醒用户；2：强制修改初始或旧密码）
-		String passwordModifyUrl = UserService.passwordModifyValid(user, model);
+		String passwordModifyUrl = PwdUtils.passwordModifyValid(user, model);
 		if (passwordModifyUrl != null){
 			try {
 				request.getRequestDispatcher(passwordModifyUrl).forward(request, response);
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
index 4d7174d4..036feda0 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
@@ -25,6 +25,7 @@ import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.service.UserService;
+import com.jeesite.modules.sys.utils.PwdUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
 import com.jeesite.modules.sys.utils.ValidCodeUtils;
 
@@ -201,9 +202,9 @@ public class AccountController extends BaseController{
 		// 验证三个密保问题是否正确。
 		User u = UserUtils.getByLoginCode(user.getLoginCode());
 		if (!(u != null && loginCode.equals(user.getLoginCode())
-				&& UserService.validatePassword(user.getPwdQuestionAnswer(), u.getPwdQuestionAnswer())
-				&& UserService.validatePassword(user.getPwdQuestionAnswer2(), u.getPwdQuestionAnswer2())
-				&& UserService.validatePassword(user.getPwdQuestionAnswer3(), u.getPwdQuestionAnswer3()))) {
+				&& PwdUtils.validatePassword(user.getPwdQuestionAnswer(), u.getPwdQuestionAnswer())
+				&& PwdUtils.validatePassword(user.getPwdQuestionAnswer2(), u.getPwdQuestionAnswer2())
+				&& PwdUtils.validatePassword(user.getPwdQuestionAnswer3(), u.getPwdQuestionAnswer3()))) {
 			return renderResult(Global.FALSE, "您填写的密保问题答案不正确！");
 		}
 		
diff --git a/modules/core/src/test/java/com/jeesite/test/ApplicationTest.java b/modules/core/src/test/java/com/jeesite/test/ApplicationTest.java
index b47a7f23..4f2387b0 100644
--- a/modules/core/src/test/java/com/jeesite/test/ApplicationTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/ApplicationTest.java
@@ -15,7 +15,7 @@ import com.jeesite.common.io.PropertiesUtils;
  * @version 2018-1-8
  */
 @ActiveProfiles("test")
-@SpringBootApplication(scanBasePackages={"com.jeesite.modules"})
+@SpringBootApplication
 public class ApplicationTest {
 	
 	public static void main(String[] args) {
diff --git a/web/src/main/java/com/jeesite/modules/Application.java b/web/src/main/java/com/jeesite/modules/Application.java
index 39ad74c8..36a91ef4 100644
--- a/web/src/main/java/com/jeesite/modules/Application.java
+++ b/web/src/main/java/com/jeesite/modules/Application.java
@@ -9,11 +9,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 /**
- * Web Application
+ * Application
  * @author ThinkGem
- * @version 2018-9-9
+ * @version 2018-10-13
  */
-@SpringBootApplication(scanBasePackages={"com.jeesite.modules"})
+@SpringBootApplication
 public class Application extends SpringBootServletInitializer {
 	
 	public static void main(String[] args) {