diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java index c63f9cf7..f7346bf0 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -2,6 +2,7 @@ package com.xxl.job.admin.controller; import com.xxl.job.admin.controller.annotation.PermessionLimit; import com.xxl.job.admin.controller.interceptor.PermissionInterceptor; +import com.xxl.job.admin.core.LoginEntity; import com.xxl.job.admin.core.util.PropertiesUtil; import com.xxl.job.admin.service.XxlJobService; import com.xxl.job.core.biz.model.ReturnT; @@ -26,6 +27,8 @@ public class IndexController { @Resource private XxlJobService xxlJobService; + @Resource + private LoginEntity loginEntity; @RequestMapping("/") public String index(Model model) { @@ -58,15 +61,15 @@ public class IndexController { public ReturnT loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){ if (!PermissionInterceptor.ifLogin(request)) { if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(password) - && PropertiesUtil.getString("xxl.job.login.username").equals(userName) - && PropertiesUtil.getString("xxl.job.login.password").equals(password)) { + && loginEntity.getLoginUserName().equals(userName) + && loginEntity.getLoginPassword().equals(password)) { boolean ifRem = false; if (StringUtils.isNotBlank(ifRemember) && "on".equals(ifRemember)) { ifRem = true; } PermissionInterceptor.login(response, ifRem); } else { - return new ReturnT(500, "账号或密码错误"); + return new ReturnT(500, "账号或密码错误, Inner User: "+loginEntity.getLoginUserName() ); } } return ReturnT.SUCCESS; diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java new file mode 100644 index 00000000..a88cadd8 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/LoginEntity.java @@ -0,0 +1,23 @@ +package com.xxl.job.admin.core; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +/** + * Created by Rock on 2018-08-17. + */ +@Component +public class LoginEntity { + + + @Value("${xxl.job.login.username}") + private String loginUserName; + @Value("${xxl.job.login.password}") + private String loginPassword; + + public String getLoginUserName() { return this.loginUserName;} + + public String getLoginPassword() { return this.loginPassword;} + + +}