fix(xxl-job):登录用户名密码由数据库查询认证

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java

@@ -25,27 +25,24 @@ public class PermissionInterceptor extends HandlerInterceptorAdapter {
 
 	public static final String LOGIN_IDENTITY_KEY = "XXL_JOB_LOGIN_IDENTITY";
 	private static String LOGIN_IDENTITY_TOKEN;
+
 	public static String getLoginIdentityToken() {
-		if (LOGIN_IDENTITY_TOKEN == null) {
-			XxlJobAdminDao xxlJobAdminDao = XxlJobAdminConfig.getAdminConfig().getXxlJobAdminDao();
-			XxlJobAdmin admin = xxlJobAdminDao.findOne();
-			if (admin == null) {
-				return LOGIN_IDENTITY_TOKEN;
-			}
-			String username = admin.getUsername();
-			String password = admin.getPassword();
+		XxlJobAdminDao xxlJobAdminDao = XxlJobAdminConfig.getAdminConfig().getXxlJobAdminDao();
+		XxlJobAdmin admin = xxlJobAdminDao.findOne();
+		if (admin == null) {
+			return LOGIN_IDENTITY_TOKEN;
+		}
+		String username = admin.getUsername();
+		String password = admin.getPassword();
 
-			// login token
-			String tokenTmp = DigestUtils.md5DigestAsHex(String.valueOf(username + "_" + password).getBytes());		//.getBytes("UTF-8")
-			tokenTmp = new BigInteger(1, tokenTmp.getBytes()).toString(16);
+		// login token
+		String tokenTmp = DigestUtils.md5DigestAsHex(String.valueOf(username + "_" + password).getBytes());        //.getBytes("UTF-8")
+		tokenTmp = new BigInteger(1, tokenTmp.getBytes()).toString(16);
 
-			LOGIN_IDENTITY_TOKEN = tokenTmp;
-		}
-		return LOGIN_IDENTITY_TOKEN;
+		return tokenTmp;
 	}
 
 	public static boolean login(HttpServletResponse response, String username, String password, boolean ifRemember){
-
     	// login token
 		String tokenTmp = DigestUtils.md5DigestAsHex(String.valueOf(username + "_" + password).getBytes());
 		tokenTmp = new BigInteger(1, tokenTmp.getBytes()).toString(16);

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

@@ -36,8 +36,8 @@ xxl.job.mail.password=Chyezaq1234
 xxl.job.mail.sendNick=XXL-JOB
 
 ### xxl-job login
-xxl.job.login.username=admin
-xxl.job.login.password=123456
+#xxl.job.login.username=admin
+#xxl.job.login.password=123456
 
 ### xxl-job, access token
 xxl.job.accessToken=

xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobAdminMapper.xml

@@ -18,7 +18,7 @@
 	<select id="findOne" resultMap="XxlJobAdmin">
 		SELECT <include refid="Base_Column_List" />
 		FROM XXL_JOB_QRTZ_ADMIN AS t
-		ORDER BY t.order ASC LIMIT 1
+		ORDER BY t.id ASC LIMIT 1
 	</select>
 
 </mapper>
\ No newline at end of file

xxl-job-admin/src/test/java/com/xxl/job/admin/controller/JobInfoControllerTest.java

@@ -2,6 +2,8 @@ package com.xxl.job.admin.controller;
 
 import com.xxl.job.admin.controller.interceptor.PermissionInterceptor;
 import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
+import com.xxl.job.admin.core.model.XxlJobAdmin;
+import com.xxl.job.admin.dao.XxlJobAdminDao;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
@@ -19,11 +21,13 @@ public class JobInfoControllerTest extends AbstractSpringMvcTest {
 
   @Before
   public void login() throws Exception {
+    XxlJobAdminDao xxlJobAdminDao = XxlJobAdminConfig.getAdminConfig().getXxlJobAdminDao();
+    XxlJobAdmin admin = xxlJobAdminDao.findOne();
     MvcResult ret = mockMvc.perform(
         post("/login")
             .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-            .param("userName", XxlJobAdminConfig.getAdminConfig().getLoginUsername())
-            .param("password", XxlJobAdminConfig.getAdminConfig().getLoginPassword())
+            .param("userName", admin.getUsername())
+            .param("password", admin.getPassword())
     ).andReturn();
     cookie = ret.getResponse().getCookie(PermissionInterceptor.LOGIN_IDENTITY_KEY);
   }