From dfd3a18175d16acdb456bb1d2387445163f027ec Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 18 May 2022 10:03:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/project/checkSpecialCharacters/CheckUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java index aa20f42..c368a71 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.lang.reflect.Field; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,7 +26,7 @@ public class CheckUtil { private static int checkLengh; //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 public static void checkEntrust(PurpImplementSendVO implementSendVO) { - log.error("---------对"+checkValue+"..等---------------校验非法字符----------------------------"); + log.error("---------对"+Arrays.toString(checkValue)+"..等字符---------------校验非法字符----------------------------"); if(implementSendVO.getPurpImplementName()!=null){ log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName()); check(implementSendVO.getPurpImplementName()); @@ -107,7 +108,9 @@ public class CheckUtil { } public static void main(String args[]){ - check("whw综合评分"); + String checkValue[] = {"\t","\n","\r","<",">","|","\\","?",":","*","\""}; + System.out.println(checkValue); + System.out.println(Arrays.toString(checkValue)); } } From 8b5ca5f037725e320e447ee4756ffdd351323b09 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 18 May 2022 10:23:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkSpecialCharacters/CheckUtil.java | 26 ++++++++++--------- .../ProjectEntrustInquiryServiceImpl.java | 4 +-- .../impl/ProjectEntrustServiceImpl.java | 2 +- .../controller/ProjectRecordController.java | 4 +-- .../impl/ProjectRecordServiceImpl.java | 2 +- .../controller/ProjectSectionController.java | 8 +++--- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java index c368a71..4bbf3e9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java @@ -10,6 +10,7 @@ import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecord; import com.chinaunicom.mall.ebtp.project.projectsection.entity.ProjectSection; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; import java.lang.reflect.Field; @@ -21,11 +22,12 @@ import java.util.Map; @Service public class CheckUtil { @Value("${check.porject.value}") - private static String checkValue[];//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} + private String checkValue[];//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} @Value("${check.porject.length}") // = 200; - private static int checkLengh; + private int checkLengh; + //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 - public static void checkEntrust(PurpImplementSendVO implementSendVO) { + public void checkEntrust(PurpImplementSendVO implementSendVO) { log.error("---------对"+Arrays.toString(checkValue)+"..等字符---------------校验非法字符----------------------------"); if(implementSendVO.getPurpImplementName()!=null){ log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName()); @@ -37,14 +39,14 @@ public class CheckUtil { sectionList.forEach(s->{ log.error("------------------------校验非法字符----------------------------标段名称:"+s.getPurpName()); log.error("------------------------校验非法字符----------------------------标段编号:"+s.getPurpNo()); - CheckUtil.check(s.getPurpName()); - CheckUtil.check(s.getPurpNo()); - CheckUtil.checkBdNameLengh("标段名称+标段编号",s.getPurpName()+s.getPurpNo()); + this.check(s.getPurpName()); + this.check(s.getPurpNo()); + this.checkBdNameLengh("标段名称+标段编号",s.getPurpName()+s.getPurpNo()); }); } } //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 - public static void checkInquiryVO(Map map) { + public void checkInquiryVO(Map map) { log.error("------------------------校验非法字符----------------------------"); if(map.get("projectRecord")!=null){ ProjectRecord record = (ProjectRecord)map.get("projectRecord"); @@ -57,14 +59,14 @@ public class CheckUtil { sectionList.forEach(s->{ log.error("------------------------校验非法字符----------------------------标段名称:"+s.getBidSectName()); log.error("------------------------校验非法字符----------------------------标段编号:"+s.getBidSectBizNum()); - CheckUtil.check(s.getBidSectName()); - CheckUtil.check(s.getBidSectBizNum()); - CheckUtil.checkBdNameLengh("标段名称+标段编号",s.getBidSectName()+s.getBidSectBizNum()); + this.check(s.getBidSectName()); + this.check(s.getBidSectBizNum()); + this.checkBdNameLengh("标段名称+标段编号",s.getBidSectName()+s.getBidSectBizNum()); }); } } - public static void check(String s) { + public void check(String s) { //< > | \ / ? : * " if (s!=null&&s instanceof String) { log.info("----------校验参数--------"+s); @@ -75,7 +77,7 @@ public class CheckUtil { } } - public static void checkBdNameLengh(String name,String value) { + public void checkBdNameLengh(String name,String value) { log.info("-----长度限制"+checkLengh+"-----对"+name+"进行校验--------"); CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托,"+name+"长度过长", getLength(value)>checkLengh) ; diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java index 8664ab4..b6d46f9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -226,8 +226,8 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){ - CheckUtil.check(projectRecord.getProjectName()); + new CheckUtil().check(projectRecord.getProjectName()); boolean save = projectRecordService.save(projectRecord); return BaseResponse.success(save); @@ -64,7 +64,7 @@ public class ProjectRecordController{ @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update( @ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){ - CheckUtil.check(projectRecord.getProjectName()); + new CheckUtil().check(projectRecord.getProjectName()); return BaseResponse.success(projectRecordService.updateProject(projectRecord)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 68f6e95..20b501d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -1024,7 +1024,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){ - CheckUtil.check(projectSection.getBidSectName()); - CheckUtil.check(projectSection.getBidSectBizNum()); + new CheckUtil().check(projectSection.getBidSectName()); + new CheckUtil().check(projectSection.getBidSectBizNum()); boolean save = projectSectionService.save(projectSection); return BaseResponse.success(save); @@ -62,8 +62,8 @@ public class ProjectSectionController{ @PutMapping("") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectSectionVO projectSection){ - CheckUtil.check(projectSection.getBidSectName()); - CheckUtil.check(projectSection.getBidSectBizNum()); + new CheckUtil().check(projectSection.getBidSectName()); + new CheckUtil().check(projectSection.getBidSectBizNum()); return BaseResponse.success(projectSectionService.update(projectSection)); } From 60d467de48c2d41dd3d8ef9e06edcaf9ea0c4e51 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 18 May 2022 10:37:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectEntrustInquiryServiceImpl.java | 7 +++++-- .../service/impl/ProjectEntrustServiceImpl.java | 5 +++-- .../controller/ProjectRecordController.java | 9 ++++++--- .../service/impl/ProjectRecordServiceImpl.java | 4 +++- .../controller/ProjectSectionController.java | 13 ++++++++----- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java index b6d46f9..1370912 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java @@ -62,6 +62,9 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectRecordVO projectRecord){ - new CheckUtil().check(projectRecord.getProjectName()); + checkUtil.check(projectRecord.getProjectName()); boolean save = projectRecordService.save(projectRecord); return BaseResponse.success(save); @@ -64,7 +67,7 @@ public class ProjectRecordController{ @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update( @ApiParam(value = "对象数据", required = true) @RequestBody ProjectRecordVO projectRecord){ - new CheckUtil().check(projectRecord.getProjectName()); + checkUtil.check(projectRecord.getProjectName()); return BaseResponse.success(projectRecordService.updateProject(projectRecord)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java index 20b501d..c5224bc 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java @@ -124,6 +124,8 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl insert(@ApiParam(value = "对象数据", required = true) @RequestBody @Valid ProjectSectionVO projectSection){ - new CheckUtil().check(projectSection.getBidSectName()); - new CheckUtil().check(projectSection.getBidSectBizNum()); + checkUtil.check(projectSection.getBidSectName()); + checkUtil.check(projectSection.getBidSectBizNum()); boolean save = projectSectionService.save(projectSection); return BaseResponse.success(save); @@ -62,8 +65,8 @@ public class ProjectSectionController{ @PutMapping("") @PreAuthorize("hasAnyAuthority('ebtp-purchase','ebtp-agency-project-manager')") public BaseResponse update(@ApiParam(value = "对象数据", required = true) @RequestBody ProjectSectionVO projectSection){ - new CheckUtil().check(projectSection.getBidSectName()); - new CheckUtil().check(projectSection.getBidSectBizNum()); + checkUtil.check(projectSection.getBidSectName()); + checkUtil.check(projectSection.getBidSectBizNum()); return BaseResponse.success(projectSectionService.update(projectSection)); } From cfb8cee6f760f479817eb349d1a8139e2d160cf6 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Wed, 18 May 2022 10:57:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/checkSpecialCharacters/CheckUtil.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java index 4bbf3e9..818d630 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java @@ -22,13 +22,13 @@ import java.util.Map; @Service public class CheckUtil { @Value("${check.porject.value}") - private String checkValue[];//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} + private String checkValue;//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} @Value("${check.porject.length}") // = 200; private int checkLengh; //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 public void checkEntrust(PurpImplementSendVO implementSendVO) { - log.error("---------对"+Arrays.toString(checkValue)+"..等字符---------------校验非法字符----------------------------"); + log.error("---------对"+checkValue+"..等字符---------------校验非法字符----------------------------"); if(implementSendVO.getPurpImplementName()!=null){ log.error("------------------------校验非法字符----------------------------项目名称:"+implementSendVO.getPurpImplementName()); check(implementSendVO.getPurpImplementName()); @@ -70,7 +70,8 @@ public class CheckUtil { //< > | \ / ? : * " if (s!=null&&s instanceof String) { log.info("----------校验参数--------"+s); - for(String s1:checkValue){ + List values = JSON.parseArray(checkValue,String.class); + for(String s1:values){ CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托项目名称或标段名称存在特殊字符，无法执行", s.toString().indexOf(s1)>0) ; } @@ -110,9 +111,10 @@ public class CheckUtil { } public static void main(String args[]){ - String checkValue[] = {"\t","\n","\r","<",">","|","\\","?",":","*","\""}; - System.out.println(checkValue); - System.out.println(Arrays.toString(checkValue)); + String checkValue = "[\"\\t\",\"\\n\",\"\\r\",\"<\",\">\",\"|\",\"\\\\\",\"?\",\":\",\"*\",\"\\\"\"]"; + + List values = JSON.parseArray(checkValue,String.class); + System.out.println(values); } } From 8be6f5d7028ffbdaccb83ffb867ac76df7f5fcc9 Mon Sep 17 00:00:00 2001 From: zhangqinbin <181961702@qq.com> Date: Mon, 23 May 2022 10:33:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AF=B9=E5=A7=94=E6=89=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E3=80=81=E6=A0=87=E6=AE=B5=E7=BC=96=E5=8F=B7=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checkSpecialCharacters/CheckUtil.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java index 818d630..fe1fcbe 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/checkSpecialCharacters/CheckUtil.java @@ -25,6 +25,8 @@ public class CheckUtil { private String checkValue;//"= {"\t","\n","\r","<",">","|","\\","?",":","*","\""} @Value("${check.porject.length}") // = 200; private int checkLengh; + @Value("${check.porject.checkBoolen}") // = 200; + private Boolean checkBoolen = false; //zhqbin 20220428 update 增加对委托项目名称\t\r\n字符校验 public void checkEntrust(PurpImplementSendVO implementSendVO) { @@ -68,20 +70,26 @@ public class CheckUtil { public void check(String s) { //< > | \ / ? : * " - if (s!=null&&s instanceof String) { + if (s!=null&&s instanceof String&&checkBoolen) { log.info("----------校验参数--------"+s); List values = JSON.parseArray(checkValue,String.class); for(String s1:values){ CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托项目名称或标段名称存在特殊字符，无法执行", s.toString().indexOf(s1)>0) ; } + }else{ + log.info("-----checkBoolen : " + checkBoolen + "---- 不校验"); } } public void checkBdNameLengh(String name,String value) { - log.info("-----长度限制"+checkLengh+"-----对"+name+"进行校验--------"); - CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托,"+name+"长度过长", - getLength(value)>checkLengh) ; + if(checkBoolen) { + log.info("-----长度限制" + checkLengh + "-----对" + name + "进行校验--------"); + CommonExceptionEnum.FRAME_EXCEPTION_COMMON_DATA_OTHER_ERROR.customValidName("该委托," + name + "长度过长", + getLength(value) > checkLengh); + }else{ + log.info("-----checkBoolen : " + checkBoolen + "---- 不校验"); + } } /**