Quellcode durchsuchen

update document

xuxueli vor 6 Jahren
Ursprung
Commit
649170d58d

+ 4 - 4
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java Datei anzeigen

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

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java Datei anzeigen

@@ -1,6 +1,6 @@
1 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 4
 import com.xxl.job.admin.core.schedule.XxlJobDynamicScheduler;
5 5
 import com.xxl.job.core.biz.AdminBiz;
6 6
 import org.springframework.beans.factory.InitializingBean;
@@ -25,7 +25,7 @@ public class JobApiController implements InitializingBean {
25 25
     }
26 26
 
27 27
     @RequestMapping(AdminBiz.MAPPING)
28
-    @PermessionLimit(limit=false)
28
+    @PermissionLimit(limit=false)
29 29
     public void api(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
30 30
         XxlJobDynamicScheduler.invokeAdminService(request, response);
31 31
     }

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java Datei anzeigen

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

+ 6 - 6
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java Datei anzeigen

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

@@ -1,29 +1,29 @@
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 Datei anzeigen

@@ -1,6 +1,6 @@
1 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 4
 import com.xxl.job.admin.core.model.XxlJobUser;
5 5
 import com.xxl.job.admin.core.util.I18nUtil;
6 6
 import com.xxl.job.admin.service.LoginService;
@@ -34,7 +34,7 @@ public class PermissionInterceptor extends HandlerInterceptorAdapter {
34 34
 		boolean needLogin = true;
35 35
 		boolean needAdminuser = false;
36 36
 		HandlerMethod method = (HandlerMethod)handler;
37
-		PermessionLimit permission = method.getMethodAnnotation(PermessionLimit.class);
37
+		PermissionLimit permission = method.getMethodAnnotation(PermissionLimit.class);
38 38
 		if (permission!=null) {
39 39
 			needLogin = permission.limit();
40 40
 			needAdminuser = permission.adminuser();