xuxueli 6 anni fa
parent
commit
71bf1c1258

+ 4 - 4
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java Vedi File

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
-import com.xxl.job.admin.controller.annotation.PermessionLimit;
3
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
4
 import com.xxl.job.admin.service.LoginService;
4
 import com.xxl.job.admin.service.LoginService;
5
 import com.xxl.job.admin.service.XxlJobService;
5
 import com.xxl.job.admin.service.XxlJobService;
6
 import com.xxl.job.core.biz.model.ReturnT;
6
 import com.xxl.job.core.biz.model.ReturnT;
50
     }
50
     }
51
 	
51
 	
52
 	@RequestMapping("/toLogin")
52
 	@RequestMapping("/toLogin")
53
-	@PermessionLimit(limit=false)
53
+	@PermissionLimit(limit=false)
54
 	public String toLogin(HttpServletRequest request, HttpServletResponse response) {
54
 	public String toLogin(HttpServletRequest request, HttpServletResponse response) {
55
 		if (loginService.ifLogin(request, response) != null) {
55
 		if (loginService.ifLogin(request, response) != null) {
56
 			return "redirect:/";
56
 			return "redirect:/";
60
 	
60
 	
61
 	@RequestMapping(value="login", method=RequestMethod.POST)
61
 	@RequestMapping(value="login", method=RequestMethod.POST)
62
 	@ResponseBody
62
 	@ResponseBody
63
-	@PermessionLimit(limit=false)
63
+	@PermissionLimit(limit=false)
64
 	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
64
 	public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember){
65
 		boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
65
 		boolean ifRem = (ifRemember!=null && ifRemember.trim().length()>0 && "on".equals(ifRemember))?true:false;
66
 		return loginService.login(request, response, userName, password, ifRem);
66
 		return loginService.login(request, response, userName, password, ifRem);
68
 	
68
 	
69
 	@RequestMapping(value="logout", method=RequestMethod.POST)
69
 	@RequestMapping(value="logout", method=RequestMethod.POST)
70
 	@ResponseBody
70
 	@ResponseBody
71
-	@PermessionLimit(limit=false)
71
+	@PermissionLimit(limit=false)
72
 	public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
72
 	public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response){
73
 		return loginService.logout(request, response);
73
 		return loginService.logout(request, response);
74
 	}
74
 	}

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java Vedi File

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
-import com.xxl.job.admin.controller.annotation.PermessionLimit;
3
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
4
 import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
4
 import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
5
 import com.xxl.job.core.biz.AdminBiz;
5
 import com.xxl.job.core.biz.AdminBiz;
6
 import org.springframework.beans.factory.InitializingBean;
6
 import org.springframework.beans.factory.InitializingBean;
25
     }
25
     }
26
 
26
 
27
     @RequestMapping(AdminBiz.MAPPING)
27
     @RequestMapping(AdminBiz.MAPPING)
28
-    @PermessionLimit(limit=false)
28
+    @PermissionLimit(limit=false)
29
     public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
29
     public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
30
         XxlJobDynamicScheduler.invokeAdminService(request, response);
30
         XxlJobDynamicScheduler.invokeAdminService(request, response);
31
     }
31
     }

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java Vedi File

131
 	
131
 	
132
 	@RequestMapping("/trigger")
132
 	@RequestMapping("/trigger")
133
 	@ResponseBody
133
 	@ResponseBody
134
-	//@PermessionLimit(limit = false)
134
+	//@PermissionLimit(limit = false)
135
 	public ReturnT<String> triggerJob(int id, String executorParam) {
135
 	public ReturnT<String> triggerJob(int id, String executorParam) {
136
 		// force cover job param
136
 		// force cover job param
137
 		if (executorParam == null) {
137
 		if (executorParam == null) {

+ 6 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java Vedi File

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
-import com.xxl.job.admin.controller.annotation.PermessionLimit;
3
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
4
 import com.xxl.job.admin.core.model.XxlJobGroup;
4
 import com.xxl.job.admin.core.model.XxlJobGroup;
5
 import com.xxl.job.admin.core.model.XxlJobUser;
5
 import com.xxl.job.admin.core.model.XxlJobUser;
6
 import com.xxl.job.admin.core.util.I18nUtil;
6
 import com.xxl.job.admin.core.util.I18nUtil;
35
     private XxlJobGroupDao xxlJobGroupDao;
35
     private XxlJobGroupDao xxlJobGroupDao;
36
 
36
 
37
     @RequestMapping
37
     @RequestMapping
38
-    @PermessionLimit(adminuser = true)
38
+    @PermissionLimit(adminuser = true)
39
     public String index(Model model) {
39
     public String index(Model model) {
40
 
40
 
41
         // 执行器列表
41
         // 执行器列表
47
 
47
 
48
     @RequestMapping("/pageList")
48
     @RequestMapping("/pageList")
49
     @ResponseBody
49
     @ResponseBody
50
-    @PermessionLimit(adminuser = true)
50
+    @PermissionLimit(adminuser = true)
51
     public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
51
     public Map<String, Object> pageList(@RequestParam(required = false, defaultValue = "0") int start,
52
                                         @RequestParam(required = false, defaultValue = "10") int length,
52
                                         @RequestParam(required = false, defaultValue = "10") int length,
53
                                         String username, int role) {
53
                                         String username, int role) {
66
 
66
 
67
     @RequestMapping("/add")
67
     @RequestMapping("/add")
68
     @ResponseBody
68
     @ResponseBody
69
-    @PermessionLimit(adminuser = true)
69
+    @PermissionLimit(adminuser = true)
70
     public ReturnT<String> add(XxlJobUser xxlJobUser) {
70
     public ReturnT<String> add(XxlJobUser xxlJobUser) {
71
 
71
 
72
         // valid username
72
         // valid username
101
 
101
 
102
     @RequestMapping("/update")
102
     @RequestMapping("/update")
103
     @ResponseBody
103
     @ResponseBody
104
-    @PermessionLimit(adminuser = true)
104
+    @PermissionLimit(adminuser = true)
105
     public ReturnT<String> update(HttpServletRequest request, XxlJobUser xxlJobUser) {
105
     public ReturnT<String> update(HttpServletRequest request, XxlJobUser xxlJobUser) {
106
 
106
 
107
         // avoid opt login seft
107
         // avoid opt login seft
129
 
129
 
130
     @RequestMapping("/remove")
130
     @RequestMapping("/remove")
131
     @ResponseBody
131
     @ResponseBody
132
-    @PermessionLimit(adminuser = true)
132
+    @PermissionLimit(adminuser = true)
133
     public ReturnT<String> remove(HttpServletRequest request, int id) {
133
     public ReturnT<String> remove(HttpServletRequest request, int id) {
134
 
134
 
135
         // avoid opt login seft
135
         // avoid opt login seft

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermessionLimit.java → xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java Vedi File

1
-package com.xxl.job.admin.controller.annotation;
2
-
3
-
4
-import java.lang.annotation.ElementType;
5
-import java.lang.annotation.Retention;
6
-import java.lang.annotation.RetentionPolicy;
7
-import java.lang.annotation.Target;
8
-
9
-/**
10
- * 权限限制
11
- * @author xuxueli 2015-12-12 18:29:02
12
- */
13
-@Target(ElementType.METHOD)
14
-@Retention(RetentionPolicy.RUNTIME)
15
-public @interface PermessionLimit {
16
-	
17
-	/**
18
-	 * 登录拦截 (默认拦截)
19
-	 */
20
-	boolean limit() default true;
21
-
22
-	/**
23
-	 * 要求管理员权限
24
-	 *
25
-	 * @return
26
-	 */
27
-	boolean adminuser() default false;
28
-
1
+package com.xxl.job.admin.controller.annotation;
2
+
3
+
4
+import java.lang.annotation.ElementType;
5
+import java.lang.annotation.Retention;
6
+import java.lang.annotation.RetentionPolicy;
7
+import java.lang.annotation.Target;
8
+
9
+/**
10
+ * 权限限制
11
+ * @author xuxueli 2015-12-12 18:29:02
12
+ */
13
+@Target(ElementType.METHOD)
14
+@Retention(RetentionPolicy.RUNTIME)
15
+public @interface PermissionLimit {
16
+	
17
+	/**
18
+	 * 登录拦截 (默认拦截)
19
+	 */
20
+	boolean limit() default true;
21
+
22
+	/**
23
+	 * 要求管理员权限
24
+	 *
25
+	 * @return
26
+	 */
27
+	boolean adminuser() default false;
28
+
29
 }
29
 }

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java Vedi File

1
 package com.xxl.job.admin.controller.interceptor;
1
 package com.xxl.job.admin.controller.interceptor;
2
 
2
 
3
-import com.xxl.job.admin.controller.annotation.PermessionLimit;
3
+import com.xxl.job.admin.controller.annotation.PermissionLimit;
4
 import com.xxl.job.admin.core.model.XxlJobUser;
4
 import com.xxl.job.admin.core.model.XxlJobUser;
5
 import com.xxl.job.admin.core.util.I18nUtil;
5
 import com.xxl.job.admin.core.util.I18nUtil;
6
 import com.xxl.job.admin.service.LoginService;
6
 import com.xxl.job.admin.service.LoginService;
34
 		boolean needLogin = true;
34
 		boolean needLogin = true;
35
 		boolean needAdminuser = false;
35
 		boolean needAdminuser = false;
36
 		HandlerMethod method = (HandlerMethod)handler;
36
 		HandlerMethod method = (HandlerMethod)handler;
37
-		PermessionLimit permission = method.getMethodAnnotation(PermessionLimit.class);
37
+		PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
38
 		if (permission!=null) {
38
 		if (permission!=null) {
39
 			needLogin = permission.limit();
39
 			needLogin = permission.limit();
40
 			needAdminuser = permission.adminuser();
40
 			needAdminuser = permission.adminuser();