!7 增加一个查询环境参数配置

Merge pull request !7 from 景南鑫/v1.8.2

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<String> 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)
+					&& loginEntity.getLoginUserName().equals(userName)
-					&& PropertiesUtil.getString("xxl.job.login.password").equals(password)) {
+					&& loginEntity.getLoginPassword().equals(password)) {
 				boolean ifRem = false;
 				if (StringUtils.isNotBlank(ifRemember) && "on".equals(ifRemember)) {
 					ifRem = true;
 				}
 				PermissionInterceptor.login(response, ifRem);
 			} else {
-				return new ReturnT<String>(500, "账号或密码错误");
+				return new ReturnT<String>(500, "账号或密码错误, Inner User: "+loginEntity.getLoginUserName() );
 			}
 		}
 		return ReturnT.SUCCESS;

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/LoginEntity.java

@@ -0,0 +1,25 @@
+package com.xxl.job.admin.controller;
+
+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;}
+
+
+}

xxl-job-admin/src/main/resources/xxl-job-admin.properties

@@ -1,20 +1,21 @@
 ### xxl-job db  (use & replace & in xml)
 xxl.job.db.driverClass=com.mysql.jdbc.Driver
-xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8
+#xxl.job.db.url=jdbc:mysql://localhost:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8
-xxl.job.db.user=root
+xxl.job.db.url=${xxl-job-db-url}
-xxl.job.db.password=root_pwd
+xxl.job.db.user=${xxl-job-db-user}
+xxl.job.db.password=${xxl-job-db-password}
 
 ### xxl-job email
-xxl.job.mail.host=smtp.163.com
+xxl.job.mail.host=${xxl-job-mail-host}
-xxl.job.mail.port=25
+xxl.job.mail.port=${xxl-job-mail-port}
-xxl.job.mail.username=ovono802302@163.com
+xxl.job.mail.username=${xxl-job-mail-username}
-xxl.job.mail.password=asdfzxcv
+xxl.job.mail.password=${xxl-job-mail-password}
-xxl.job.mail.sendFrom=ovono802302@163.com
+xxl.job.mail.sendFrom=${xxl-job-mail-sendFrom}
-xxl.job.mail.sendNick=《任务调度平台XXL-JOB》
+xxl.job.mail.sendNick=${xxl-job-mail-sendNick}
 
 ### xxl-job login
-xxl.job.login.username=admin
+xxl.job.login.username=${xxl-job-login-username}
-xxl.job.login.password=123456
+xxl.job.login.password=${xxl-job-login-password}
 
 ### xxl-job, access token
-xxl.job.accessToken=
+xxl.job.accessToken=${xxl-job-accessToken}