manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

其它各种优化，性能优化，增强autoconfigure，简化 Application.java；新增PwdUtils工具类

Browse Source
This commit is contained in:
thinkgem
2018-10-13 22:25:41 +08:00
parent 57f67c0a0e
commit 1d250a126a
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -33,7 +33,7 @@ import com.jeesite.common.web.CookieUtils;
import com.jeesite.common.web.http.ServletUtils; import com.jeesite.common.web.http.ServletUtils;
import com.jeesite.modules.sys.entity.Menu; import com.jeesite.modules.sys.entity.Menu;
import com.jeesite.modules.sys.entity.User; 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.UserUtils;
/** /**
@@ -280,7 +280,7 @@ public class LoginController extends BaseController{
} }
// 初始密码策略和密码修改策略验证（0：关闭；1：提醒用户；2：强制修改初始或旧密码） // 初始密码策略和密码修改策略验证（0：关闭；1：提醒用户；2：强制修改初始或旧密码）
String passwordModifyUrl = UserService.passwordModifyValid(user, model); String passwordModifyUrl = PwdUtils.passwordModifyValid(user, model);
if (passwordModifyUrl != null){ if (passwordModifyUrl != null){
try { try {
request.getRequestDispatcher(passwordModifyUrl).forward(request, response); request.getRequestDispatcher(passwordModifyUrl).forward(request, response);

7
modules/core/src/main/java/com/jeesite/modules/sys/web/user/AccountController.java
View File

@@ -25,6 +25,7 @@ import com.jeesite.common.service.ServiceException;
import com.jeesite.common.web.BaseController; import com.jeesite.common.web.BaseController;
import com.jeesite.modules.sys.entity.User; import com.jeesite.modules.sys.entity.User;
import com.jeesite.modules.sys.service.UserService; 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.UserUtils;
import com.jeesite.modules.sys.utils.ValidCodeUtils; import com.jeesite.modules.sys.utils.ValidCodeUtils;
@@ -201,9 +202,9 @@ public class AccountController extends BaseController{
// 验证三个密保问题是否正确。 // 验证三个密保问题是否正确。
User u = UserUtils.getByLoginCode(user.getLoginCode()); User u = UserUtils.getByLoginCode(user.getLoginCode());
if (!(u != null && loginCode.equals(user.getLoginCode()) if (!(u != null && loginCode.equals(user.getLoginCode())
&& UserService.validatePassword(user.getPwdQuestionAnswer(), u.getPwdQuestionAnswer()) && PwdUtils.validatePassword(user.getPwdQuestionAnswer(), u.getPwdQuestionAnswer())
&& UserService.validatePassword(user.getPwdQuestionAnswer2(), u.getPwdQuestionAnswer2()) && PwdUtils.validatePassword(user.getPwdQuestionAnswer2(), u.getPwdQuestionAnswer2())
&& UserService.validatePassword(user.getPwdQuestionAnswer3(), u.getPwdQuestionAnswer3()))) { && PwdUtils.validatePassword(user.getPwdQuestionAnswer3(), u.getPwdQuestionAnswer3()))) {
return renderResult(Global.FALSE, "您填写的密保问题答案不正确！"); return renderResult(Global.FALSE, "您填写的密保问题答案不正确！");
} }

2
modules/core/src/test/java/com/jeesite/test/ApplicationTest.java
View File

@@ -15,7 +15,7 @@ import com.jeesite.common.io.PropertiesUtils;
* @version 2018-1-8 * @version 2018-1-8
*/ */
@ActiveProfiles("test") @ActiveProfiles("test")
@SpringBootApplication(scanBasePackages={"com.jeesite.modules"}) @SpringBootApplication
public class ApplicationTest { public class ApplicationTest {
public static void main(String[] args) { public static void main(String[] args) {

6
web/src/main/java/com/jeesite/modules/Application.java
View File

@@ -9,11 +9,11 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/** /**
* Web Application * Application
* @author ThinkGem * @author ThinkGem
* @version 2018-9-9 * @version 2018-10-13
*/ */
@SpringBootApplication(scanBasePackages={"com.jeesite.modules"}) @SpringBootApplication
public class Application extends SpringBootServletInitializer { public class Application extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {