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

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

Browse Source 
(cherry picked from commit 14e3b828db)
This commit is contained in:
zhanghongqing
2019-01-27 04:46:18 +00:00
committed by 王鑫
parent faf8f45585
commit 776dc47ad6
7 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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++) {
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());

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++) {
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;