xueli.xue пре 10 година
родитељ
комит
00465f53c6

+ 6 - 2
xxl-job-admin/src/main/java/com/xxl/job/controller/IndexController.java Прегледај датотеку

42
 	@RequestMapping(value="login", method=RequestMethod.POST)
42
 	@RequestMapping(value="login", method=RequestMethod.POST)
43
 	@ResponseBody
43
 	@ResponseBody
44
 	@PermessionLimit(limit=false)
44
 	@PermessionLimit(limit=false)
45
-	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password){
45
+	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
46
 		if (!PermissionInterceptor.ifLogin(request)) {
46
 		if (!PermissionInterceptor.ifLogin(request)) {
47
 			if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(password)
47
 			if (StringUtils.isNotBlank(userName) && StringUtils.isNotBlank(password)
48
 					&& "admin".equals(userName) && "123456".equals(password)) {
48
 					&& "admin".equals(userName) && "123456".equals(password)) {
49
-				PermissionInterceptor.login(response);
49
+				boolean ifRem = false;
50
+				if (StringUtils.isNotBlank(ifRemember) && "on".equals(ifRemember)) {
51
+					ifRem = true;
52
+				}
53
+				PermissionInterceptor.login(response, ifRem);
50
 			} else {
54
 			} else {
51
 				return new ReturnT<String>(500, "账号或密码错误");
55
 				return new ReturnT<String>(500, "账号或密码错误");
52
 			}
56
 			}

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/controller/interceptor/PermissionInterceptor.java Прегледај датотеку

18
 	public static final String LOGIN_IDENTITY_KEY = "LOGIN_IDENTITY";
18
 	public static final String LOGIN_IDENTITY_KEY = "LOGIN_IDENTITY";
19
 	public static final String LOGIN_IDENTITY_VAL = "sdf!121sdf$78sd!8";
19
 	public static final String LOGIN_IDENTITY_VAL = "sdf!121sdf$78sd!8";
20
 	
20
 	
21
-	public static boolean login(HttpServletResponse response){
22
-		CookieUtil.set(response, LOGIN_IDENTITY_KEY, LOGIN_IDENTITY_VAL);
21
+	public static boolean login(HttpServletResponse response, boolean ifRemember){
22
+		CookieUtil.set(response, LOGIN_IDENTITY_KEY, LOGIN_IDENTITY_VAL, ifRemember);
23
 		return true;
23
 		return true;
24
 	}
24
 	}
25
 	public static void logout(HttpServletRequest request, HttpServletResponse response){
25
 	public static void logout(HttpServletRequest request, HttpServletResponse response){

+ 11 - 2
xxl-job-admin/src/main/java/com/xxl/job/core/util/CookieUtil.java Прегледај датотеку

19
 	 * @param response
19
 	 * @param response
20
 	 * @param key
20
 	 * @param key
21
 	 * @param value
21
 	 * @param value
22
+	 * @param ifRemember 
22
 	 */
23
 	 */
23
-	public static void set(HttpServletResponse response, String key, String value) {
24
+	public static void set(HttpServletResponse response, String key, String value, boolean ifRemember) {
25
+		
26
+		int age = COOKIE_MAX_AGE;
27
+		if (ifRemember) {
28
+			age = COOKIE_MAX_AGE;
29
+		} else {
30
+			age = -1;
31
+		}
32
+		
24
 		Cookie cookie = new Cookie(key, value);
33
 		Cookie cookie = new Cookie(key, value);
25
-		cookie.setMaxAge(COOKIE_MAX_AGE);	// Cookie过期时间,单位/秒
34
+		cookie.setMaxAge(age);				// Cookie过期时间,单位/秒
26
 		cookie.setPath(COOKIE_PATH);		// Cookie适用的路径
35
 		cookie.setPath(COOKIE_PATH);		// Cookie适用的路径
27
 		response.addCookie(cookie);
36
 		response.addCookie(cookie);
28
 	}
37
 	}

+ 1 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/login.ftl Прегледај датотеку

26
 					<div class="col-xs-8">
26
 					<div class="col-xs-8">
27
 		              	<div class="checkbox icheck">
27
 		              	<div class="checkbox icheck">
28
 		                	<label>
28
 		                	<label>
29
-		                  		<input type="checkbox"> Remember Me
29
+		                  		<input type="checkbox" name="ifRemember" > Remember Me
30
 		                	</label>
30
 		                	</label>
31
 						</div>
31
 						</div>
32
 		            </div><!-- /.col -->
32
 		            </div><!-- /.col -->