From 7cc0093890fa439f289a15d9709492a1c80e49f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 16 Oct 2024 10:13:14 +0800 Subject: [PATCH] 'commit' --- .../Interceptor/CheckIdsInterceptor.java | 24 +++---- .../Interceptor/EmptyInterceptor.java | 3 +- .../Interceptor/IsGuidInterceptor.java | 9 +-- .../Interceptor/IsNumbericInterceptor.java | 3 +- .../Interceptor/IsSysAdminInterceptor.java | 3 +- .../Interceptor/JwtCheckInterceptor.java | 3 +- .../Interceptor/LayUiPageInfoInterceptor.java | 69 ------------------- .../Interceptor/LayUiPageInfoInterface.java | 10 --- .../Interceptor/LengthInterceptor.java | 30 ++++---- .../com/dsideal/resource/ResApplication.java | 3 - 10 files changed, 36 insertions(+), 121 deletions(-) delete mode 100644 dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterceptor.java delete mode 100644 dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterface.java diff --git a/dsRes/src/main/java/com/dsideal/resource/Interceptor/CheckIdsInterceptor.java b/dsRes/src/main/java/com/dsideal/resource/Interceptor/CheckIdsInterceptor.java index a1bef43a..1156af91 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Interceptor/CheckIdsInterceptor.java +++ b/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 - { - String[] global_ids=parameter.split(","); - for(int i=0;i 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参数为空！")); - } - } -} \ No newline at end of file diff --git a/dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterface.java b/dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterface.java deleted file mode 100644 index eb30dece..00000000 --- a/dsRes/src/main/java/com/dsideal/resource/Interceptor/LayUiPageInfoInterface.java +++ /dev/null @@ -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(); -} \ No newline at end of file diff --git a/dsRes/src/main/java/com/dsideal/resource/Interceptor/LengthInterceptor.java b/dsRes/src/main/java/com/dsideal/resource/Interceptor/LengthInterceptor.java index 3397f072..86a3fb92 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Interceptor/LengthInterceptor.java +++ b/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) - { - now_length=0; + if (parameter == null) { + now_length = 0; + } else { + now_length = parameter.trim().length(); } - else - { - now_length=parameter.trim().length(); - } - if(now_lengthmax){ - con.renderJson(CommonUtil.returnMessageJson(false,"传入的"+para+"参数长度不能大于"+max+",现在长度"+now_length+"！")); + } else if (now_length > max) { + con.renderJson(RetKit.renderFail("传入的" + para + "参数长度不能大于" + max + ",现在长度" + now_length + "！")); return; } } diff --git a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java index bad4f7c2..46541a17 100644 --- a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java +++ b/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());