'commit'

dsRes/src/main/java/com/dsideal/resource/Interceptor/CheckIdsInterceptor.java

@@ -1,24 +1,23 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
 
 /**
  * 参数需要是数字注解验证
- * @author Administrator
  *
+ * @author Administrator
  */
-public class CheckIdsInterceptor implements Interceptor
+public class CheckIdsInterceptor implements Interceptor {
-{
     @Override
     public void intercept(Invocation inv) {
         CheckIdsInterface annotation = inv.getMethod().getAnnotation(CheckIdsInterface.class);
         if (annotation != null) {
             isNumber(annotation, inv);
-        }
+        } else {
-        else{
             inv.invoke();
         }
     }
@@ -42,17 +41,14 @@ public class CheckIdsInterceptor implements Interceptor
         for (String v : value) {
             String parameter = con.getPara(v);
             if (parameter == null || parameter.trim().length() == 0) {
-                con.renderJson(CommonUtil.returnMessageJson(false,"传入的参数"+v+"为空！"));
+                con.renderJson(RetKit.renderFail("传入的参数" + v + "为空！"));
             }
             //如果不是数字，那么退出
-            else
+            else {
-            {
+                String[] global_ids = parameter.split(",");
-                String[] global_ids=parameter.split(",");
+                for (int i = 0; i < global_ids.length; i++) {
-                for(int i=0;i<global_ids.length;i++)
+                    if (!CommonUtil.isNumeric(global_ids[i])) {
-                {
+                        con.renderJson(RetKit.renderFail("传入的参数" + global_ids[i] + "不是数字！"));
-                    if(!CommonUtil.isNumeric(global_ids[i]))
-                    {
-                        con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+global_ids[i]+"不是数字！"));
                     }
                 }
             }

dsRes/src/main/java/com/dsideal/resource/Interceptor/EmptyInterceptor.java

@@ -1,6 +1,7 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
@@ -46,7 +47,7 @@ public class EmptyInterceptor implements Interceptor
         if(isTrue){
             inv.invoke();
         }else{
-            con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+key+"参数为空！"));
+            con.renderJson(RetKit.renderFail("传入的"+key+"参数为空！"));
         }
     }
 

dsRes/src/main/java/com/dsideal/resource/Interceptor/IsGuidInterceptor.java

@@ -1,9 +1,11 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
+
 @SuppressWarnings("unchecked")
 public class IsGuidInterceptor implements Interceptor {
     @Override
@@ -34,11 +36,10 @@ public class IsGuidInterceptor implements Interceptor {
                 break;
             }
         }
-        if(isTrue){
+        if (isTrue) {
             inv.invoke();
-        }else{
+        } else {
-            con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+key+"不是一个GUID！"));
+            con.renderJson(RetKit.renderFail("传入的" + key + "不是一个GUID！"));
         }
-
     }
 }

dsRes/src/main/java/com/dsideal/resource/Interceptor/IsNumbericInterceptor.java

@@ -1,6 +1,7 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
@@ -52,7 +53,7 @@ public class IsNumbericInterceptor implements Interceptor
         if(isTrue){
             inv.invoke();
         }else{
-            con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+key+"参数为空或不是数字！"));
+            con.renderJson(RetKit.renderFail("传入的"+key+"参数为空或不是数字！"));
         }
     }
 }

dsRes/src/main/java/com/dsideal/resource/Interceptor/IsSysAdminInterceptor.java

@@ -1,6 +1,7 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
@@ -41,7 +42,7 @@ public class IsSysAdminInterceptor implements Interceptor {
         if (isTrue) {
             inv.invoke();
         } else {
-            con.renderJson(CommonUtil.returnMessageJson(false, "您的身份有误，未被识别为管理员或管理员权限不足，无法进行操作！identity_id_cookie:" + con.getCookie("identity_id")));
+            con.renderJson(RetKit.renderFail("您的身份有误，未被识别为管理员或管理员权限不足，无法进行操作！identity_id_cookie:" + con.getCookie("identity_id")));
         }
     }
 }

dsRes/src/main/java/com/dsideal/resource/Interceptor/JwtCheckInterceptor.java

@@ -1,6 +1,7 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
@@ -54,7 +55,7 @@ public class JwtCheckInterceptor implements Interceptor {
         if (isTrue) {
             inv.invoke();
         } else {
-            con.renderJson(CommonUtil.returnMessageJson(false, "此接口需要登录后操作！"));
+            con.renderJson(RetKit.renderFail("此接口需要登录后操作！"));
         }
     }
 }

dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterceptor.java

@@ -1,69 +0,0 @@
-package com.dsideal.resource.Interceptor;
-
-import com.dsideal.resource.Util.CommonUtil;
-import com.jfinal.aop.Interceptor;
-import com.jfinal.aop.Invocation;
-import com.jfinal.core.Controller;
-
-/**
- * 检查是不是符合layui的分页查询规则
- *
- * @author Administrator
- */
-public class LayUiPageInfoInterceptor implements Interceptor {
-    @Override
-    public void intercept(Invocation inv) {
-        LayUiPageInfoInterface annotation = inv.getMethod().getAnnotation(LayUiPageInfoInterface.class);
-        if (annotation != null) {
-            checkLayUiPageInfo(annotation, inv);
-        } else {
-            inv.invoke();
-        }
-    }
-
-    public void checkLayUiPageInfo(LayUiPageInfoInterface annotation, Invocation inv) {
-        Controller con = inv.getController();
-        String header = con.getHeader("Content-Type"); //取出head头
-        if (header != null && header.indexOf("multipart/form-data") != -1) { //判断是否是form-data
-            inv.invoke();
-        }
-        String[] value = annotation.value();
-
-        String o_page = null;
-        String o_limit = null;
-
-        for (String v : value) {
-            String parameter = con.getPara(v);
-            if (v.equals("page")) {
-                o_page = parameter;
-            }
-            if (v.equals("limit")) {
-                o_limit = parameter;
-            }
-        }
-        if (o_page != null && o_limit != null) {
-            if (!CommonUtil.isNumeric(o_page)) {
-                con.renderJson(CommonUtil.returnMessageJson(false, "传入的page参数不是数字！"));
-            }
-            if (!CommonUtil.isNumeric(o_limit)) {
-                con.renderJson(CommonUtil.returnMessageJson(false, "传入的limit参数不是数字！"));
-            }
-            //检查大小
-            int page = Integer.parseInt(o_page);
-            int limit = Integer.parseInt(o_limit);
-
-            if (limit > 100) {
-                con.renderJson(CommonUtil.returnMessageJson(false, "传入的limit参数大于100，被禁止！"));
-            }
-            if (limit < 1) {
-                con.renderJson(CommonUtil.returnMessageJson(false, "传入的limit参数小于1，被禁止！"));
-            }
-            //放行
-            inv.invoke();
-        } else if (o_page == null) {
-            con.renderJson(CommonUtil.returnMessageJson(false, "传入的page参数为空！"));
-        } else if (o_limit == null) {
-            con.renderJson(CommonUtil.returnMessageJson(false, "传入的limit参数为空！"));
-        }
-    }
-}

dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterface.java

@@ -1,10 +0,0 @@
-package com.dsideal.resource.Interceptor;
-
-import java.lang.annotation.*;
-
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD})
-public @interface LayUiPageInfoInterface {
-    String[] value();
-}

dsRes/src/main/java/com/dsideal/resource/Interceptor/LengthInterceptor.java

@@ -1,6 +1,7 @@
 package com.dsideal.resource.Interceptor;
 
 import com.dsideal.resource.Util.CommonUtil;
+import com.dsideal.resource.Util.RetKit;
 import com.jfinal.aop.Interceptor;
 import com.jfinal.aop.Invocation;
 import com.jfinal.core.Controller;
@@ -29,31 +30,26 @@ public class LengthInterceptor implements Interceptor {
         }
         String[] jsonCheckParas = annotation.value();
         for (String joStr : jsonCheckParas) {
-            String[] arr=joStr.split(",");
+            String[] arr = joStr.split(",");
             //哪个参数
-            String para=arr[0];
+            String para = arr[0];
             //最少多长位
-            int min=Integer.parseInt(arr[1]);
+            int min = Integer.parseInt(arr[1]);
             //最大多少位
-            int max=Integer.parseInt(arr[2]);
+            int max = Integer.parseInt(arr[2]);
             String parameter = con.getPara(para);
             //如果参数不存在，视为n_min=0
             int now_length;
-            if(parameter==null)
+            if (parameter == null) {
-            {
+                now_length = 0;
-                now_length=0;
+            } else {
+                now_length = parameter.trim().length();
             }
-            else
+            if (now_length < min) {
-            {
+                con.renderJson(RetKit.renderFail("传入的" + para + "参数长度不能小于" + min + ",现在长度" + now_length + "！"));
-                now_length=parameter.trim().length();
-            }
-            if(now_length<min)
-            {
-                con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+para+"参数长度不能小于"+min+",现在长度"+now_length+"！"));
                 return;
-            }
+            } else if (now_length > max) {
-            else if(now_length>max){
+                con.renderJson(RetKit.renderFail("传入的" + para + "参数长度不能大于" + max + ",现在长度" + now_length + "！"));
-                con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+para+"参数长度不能大于"+max+",现在长度"+now_length+"！"));
                 return;
             }
         }

dsRes/src/main/java/com/dsideal/resource/ResApplication.java

@@ -138,9 +138,6 @@ public class ResApplication extends JFinalConfig {
         //注册非空拦截器
         me.add(new EmptyInterceptor());
 
-        //注册layui的分页检查器
-        me.add(new LayUiPageInfoInterceptor());
-
         //注册Ids检查是不是数字的检查器
         me.add(new CheckIdsInterceptor());