From 14e3b828dba0280c7921017f592633420d6c4885 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Sun, 27 Jan 2019 12:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=BA=E6=98=AF=E6=97=B6=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=A0=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=EF=BC=8C=E6=97=A5=E5=BF=97http=E7=BD=91=E9=A1=B5=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2=E6=98=AF=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E7=9B=91=E6=B5=8B/=E5=B0=81?= =?UTF-8?q?=E5=A0=B5=E6=97=B6=E7=95=8C=E9=9D=A2=E5=AF=B9=E5=BA=94=E5=88=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=8C=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/BaseStringCfg.java | 16 +++++++++-- .../configuration/ComplexkeywordCfg.java | 7 ++++- .../java/com/nis/util/excel/ExcelCsv.java | 2 +- .../java/com/nis/util/excel/ExportExcel.java | 2 +- .../configuration/AppCfgController.java | 28 ++++++++++++++++--- .../AppFeatureCfgController.java | 14 ++++++++-- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 13 +++++---- 7 files changed, 66 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index 8e14a2720..250147f3c 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -238,7 +238,13 @@ public class BaseStringCfg extends BaseCfg { for (int i = 0; i < list.size(); i++) { BaseStringCfg base=(BaseStringCfg)list.get(i); base.setIsHex(base.getIsHexbin()); - base.setIsCaseInsenstive(base.getIsHexbin()); +// base.setIsCaseInsenstive(base.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(base.getIsHexbin()==2){ + base.setIsCaseInsenstive(1); + }else{ + base.setIsCaseInsenstive(0); + } base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); } return list; @@ -248,7 +254,13 @@ public class BaseStringCfg extends BaseCfg { for (int i = 0; i < list.size(); i++) { BaseStringCfg base=(BaseStringCfg)list.get(i); base.setIsHex(base.getIsHexbin()); - base.setIsCaseInsenstive(base.getIsHexbin()); +// base.setIsCaseInsenstive(base.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(base.getIsHexbin()==2){ + base.setIsCaseInsenstive(1); + }else{ + base.setIsCaseInsenstive(0); + } } return list; } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index df8bba28c..f89a86e84 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -211,7 +211,12 @@ public class ComplexkeywordCfg extends BaseCfg{ for (int i = 0; i < list.size(); i++) { ComplexkeywordCfg base=(ComplexkeywordCfg)list.get(i); base.setIsHex(base.getIsHexbin()); - base.setIsCaseInsenstive(base.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(base.getIsHexbin()==2){ + base.setIsCaseInsenstive(1); + }else{ + base.setIsCaseInsenstive(0); + } base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," ")); } return list; diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 24809147b..4dbee6de1 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -312,7 +312,7 @@ public class ExcelCsv { } if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){ Integer isCaseSenstive=Integer.parseInt(val.toString()); - if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){ + if(isCaseSenstive.equals(0)){ val = msgProp.getProperty("case_insenstive","case_insenstive"); }else if(isCaseSenstive.equals(1)){ val = msgProp.getProperty("case_senstive","case_senstive"); diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index d891c014d..d9ada668d 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2291,7 +2291,7 @@ public class ExportExcel { } if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){ Integer isCaseSenstive=Integer.parseInt(val.toString()); - if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){ + if(isCaseSenstive.equals(0)){ val = msgProp.getProperty("case_insenstive","case_insenstive"); }else if(isCaseSenstive.equals(1)){ val = msgProp.getProperty("case_senstive","case_senstive"); diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 4a24d7427..aaf5f874c 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1859,7 +1859,12 @@ public class AppCfgController extends BaseController { for (int i = 0; i < ipLists.size(); i++) { AppTopicDomainCfg appTop = ipLists.get(i); appTop.setIsHex(appTop.getIsHexbin()); - appTop.setIsCaseInsenstive(appTop.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(appTop.getIsHexbin()==2){ + appTop.setIsCaseInsenstive(1); + }else{ + appTop.setIsCaseInsenstive(0); + } } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class); @@ -1990,7 +1995,12 @@ public class AppCfgController extends BaseController { for (AppHttpCfg http : ipLists) { http.setIsHex(http.getIsHexbin()); - http.setIsCaseInsenstive(http.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(http.getIsHexbin()==2){ + http.setIsCaseInsenstive(1); + }else{ + http.setIsCaseInsenstive(0); + } http.setCfgKeywords(Functions.replace(http.getCfgKeywords(), "***and***", " ")); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(http.getSpecServiceId()); http.setAppName(app.getSpecServiceName()); @@ -2058,7 +2068,12 @@ public class AppCfgController extends BaseController { } for (AppDomainCfg domain : ipLists) { domain.setIsHex(domain.getIsHexbin()); - domain.setIsCaseInsenstive(domain.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(domain.getIsHexbin()==2){ + domain.setIsCaseInsenstive(1); + }else{ + domain.setIsCaseInsenstive(0); + } SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(domain.getSpecServiceId()); domain.setAppName(app.getSpecServiceName()); } @@ -2126,7 +2141,12 @@ public class AppCfgController extends BaseController { for (AppSslCertCfg ssl : ipLists) { ssl.setIsHex(ssl.getIsHexbin()); - ssl.setIsCaseInsenstive(ssl.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(ssl.getIsHexbin()==2){ + ssl.setIsCaseInsenstive(1); + }else{ + ssl.setIsCaseInsenstive(0); + } ssl.setCfgKeywords(Functions.replace(ssl.getCfgKeywords(), "***and***", " ")); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(ssl.getSpecServiceId()); ssl.setAppName(app.getSpecServiceName()); diff --git a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java index ef626a469..b93e63115 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java @@ -424,7 +424,12 @@ public class AppFeatureCfgController extends BaseController { for (int i = 0; i < list.size(); i++) { AppComplexFeatureCfg base = (AppComplexFeatureCfg) list.get(i); base.setIsHex(base.getIsHexbin()); - base.setIsCaseInsenstive(base.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(base.getIsHexbin()==2){ + base.setIsCaseInsenstive(1); + }else{ + base.setIsCaseInsenstive(0); + } base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***", " ")); } return list; @@ -434,7 +439,12 @@ public class AppFeatureCfgController extends BaseController { for (int i = 0; i < list.size(); i++) { AppStringFeatureCfg base = (AppStringFeatureCfg) list.get(i); base.setIsHex(base.getIsHexbin()); - base.setIsCaseInsenstive(base.getIsHexbin()); + // '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX', + if(base.getIsHexbin()==2){ + base.setIsCaseInsenstive(1); + }else{ + base.setIsCaseInsenstive(0); + } base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***", " ")); } return list; diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index fd78f0ea8..95588eb31 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -313,13 +313,16 @@ ${log.cfgId } - ${log.action } - - ${dict.itemValue} - + + + + + + + + - ${log.foundTime } ${log.recvTime }