gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置导出时是否区分大小写时，为是时导出无显示问题解决，日志http网页关键字查询是选择关键字监测/封堵时界面对应列显示不同国际化问题解决。

Browse Source
This commit is contained in:
zhanghongqing
2019-01-27 12:46:18 +08:00
parent 923aca94a8
commit 14e3b828db
7 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -238,7 +238,13 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
BaseStringCfg base=(BaseStringCfg)list.get(i); BaseStringCfg base=(BaseStringCfg)list.get(i);
base.setIsHex(base.getIsHexbin()); 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***"," ")); base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
} }
return list; return list;
@@ -248,7 +254,13 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
BaseStringCfg base=(BaseStringCfg)list.get(i); BaseStringCfg base=(BaseStringCfg)list.get(i);
base.setIsHex(base.getIsHexbin()); 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; return list;
} }

7
src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java
View File

@@ -211,7 +211,12 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
ComplexkeywordCfg base=(ComplexkeywordCfg)list.get(i); ComplexkeywordCfg base=(ComplexkeywordCfg)list.get(i);
base.setIsHex(base.getIsHexbin()); 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***"," ")); base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
} }
return list; return list;

2
src/main/java/com/nis/util/excel/ExcelCsv.java
View File

@@ -312,7 +312,7 @@ public class ExcelCsv {
} }
if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){ if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){
Integer isCaseSenstive=Integer.parseInt(val.toString()); Integer isCaseSenstive=Integer.parseInt(val.toString());
if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){ if(isCaseSenstive.equals(0)){
val = msgProp.getProperty("case_insenstive","case_insenstive"); val = msgProp.getProperty("case_insenstive","case_insenstive");
}else if(isCaseSenstive.equals(1)){ }else if(isCaseSenstive.equals(1)){
val = msgProp.getProperty("case_senstive","case_senstive"); val = msgProp.getProperty("case_senstive","case_senstive");

2
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -2291,7 +2291,7 @@ public class ExportExcel {
} }
if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){ if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){
Integer isCaseSenstive=Integer.parseInt(val.toString()); Integer isCaseSenstive=Integer.parseInt(val.toString());
if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){ if(isCaseSenstive.equals(0)){
val = msgProp.getProperty("case_insenstive","case_insenstive"); val = msgProp.getProperty("case_insenstive","case_insenstive");
}else if(isCaseSenstive.equals(1)){ }else if(isCaseSenstive.equals(1)){
val = msgProp.getProperty("case_senstive","case_senstive"); val = msgProp.getProperty("case_senstive","case_senstive");

28
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -1859,7 +1859,12 @@ public class AppCfgController extends BaseController {
for (int i = 0; i < ipLists.size(); i++) { for (int i = 0; i < ipLists.size(); i++) {
AppTopicDomainCfg appTop = ipLists.get(i); AppTopicDomainCfg appTop = ipLists.get(i);
appTop.setIsHex(appTop.getIsHexbin()); 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()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class); classMap.put(entity.getMenuNameCode(), AppTopicDomainCfg.class);
@@ -1990,7 +1995,12 @@ public class AppCfgController extends BaseController {
for (AppHttpCfg http : ipLists) { for (AppHttpCfg http : ipLists) {
http.setIsHex(http.getIsHexbin()); 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***", " ")); http.setCfgKeywords(Functions.replace(http.getCfgKeywords(), "***and***", " "));
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(http.getSpecServiceId()); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(http.getSpecServiceId());
http.setAppName(app.getSpecServiceName()); http.setAppName(app.getSpecServiceName());
@@ -2058,7 +2068,12 @@ public class AppCfgController extends BaseController {
} }
for (AppDomainCfg domain : ipLists) { for (AppDomainCfg domain : ipLists) {
domain.setIsHex(domain.getIsHexbin()); 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()); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(domain.getSpecServiceId());
domain.setAppName(app.getSpecServiceName()); domain.setAppName(app.getSpecServiceName());
} }
@@ -2126,7 +2141,12 @@ public class AppCfgController extends BaseController {
for (AppSslCertCfg ssl : ipLists) { for (AppSslCertCfg ssl : ipLists) {
ssl.setIsHex(ssl.getIsHexbin()); 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***", " ")); ssl.setCfgKeywords(Functions.replace(ssl.getCfgKeywords(), "***and***", " "));
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(ssl.getSpecServiceId()); SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(ssl.getSpecServiceId());
ssl.setAppName(app.getSpecServiceName()); ssl.setAppName(app.getSpecServiceName());

14
src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
View File

@@ -424,7 +424,12 @@ public class AppFeatureCfgController extends BaseController {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
AppComplexFeatureCfg base = (AppComplexFeatureCfg) list.get(i); AppComplexFeatureCfg base = (AppComplexFeatureCfg) list.get(i);
base.setIsHex(base.getIsHexbin()); 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***", " ")); base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***", " "));
} }
return list; return list;
@@ -434,7 +439,12 @@ public class AppFeatureCfgController extends BaseController {
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
AppStringFeatureCfg base = (AppStringFeatureCfg) list.get(i); AppStringFeatureCfg base = (AppStringFeatureCfg) list.get(i);
base.setIsHex(base.getIsHexbin()); 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***", " ")); base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***", " "));
} }
return list; return list;

13
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -313,13 +313,16 @@
</td> </td>
<td>${log.cfgId }</td> <td>${log.cfgId }</td>
<td> <td>
<c:set var="actions">${log.action }</c:set>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}"> <c:choose>
<c:set var="actions">${dict.itemValue}</c:set> <c:when test="${dict.itemCode eq log.action and (log.service eq 152 or log.service eq 40)}">
</c:if> <spring:message code="keywords"/> <spring:message code="${dict.itemValue}"/>
</c:when>
<c:when test="${dict.itemCode eq log.action and (log.service ne 152 and log.service ne 40)}">
<spring:message code="${dict.itemValue}"/>
</c:when>
</c:choose>
</c:forEach> </c:forEach>
<spring:message code="${actions}"/>
</td> </td>
<td>${log.foundTime }</td> <td>${log.foundTime }</td>
<td>${log.recvTime }</td> <td>${log.recvTime }</td>