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

intercept列表展示与导出替换为国际化code

Browse Source
This commit is contained in:
wangxin
2019-06-25 15:13:41 +08:00
parent e82e69edbc
commit ca17b49bf8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -597,7 +597,7 @@ public class ObjectGroupService extends BaseService {
}else if(c.getUserRegion1().equalsIgnoreCase("http")){ }else if(c.getUserRegion1().equalsIgnoreCase("http")){
c.setUserRegion1("HTTP"); c.setUserRegion1("HTTP");
}else if(c.getUserRegion1().equalsIgnoreCase("intercept")){ }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
c.setUserRegion1("Intercept"); c.setUserRegion1(msgProp.getProperty("intercept","intercept"));
} }
} }
if(StringUtils.isNotBlank(groupIds.toString())){ if(StringUtils.isNotBlank(groupIds.toString())){
@@ -666,7 +666,7 @@ public class ObjectGroupService extends BaseService {
}else if(c.getUserRegion1().equalsIgnoreCase("http")){ }else if(c.getUserRegion1().equalsIgnoreCase("http")){
c.setUserRegion1("HTTP"); c.setUserRegion1("HTTP");
}else if(c.getUserRegion1().equalsIgnoreCase("intercept")){ }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
c.setUserRegion1("Intercept"); c.setUserRegion1(msgProp.getProperty("intercept","intercept"));
} }
} }
if(StringUtils.isNotBlank(groupIds.toString())){ if(StringUtils.isNotBlank(groupIds.toString())){

2
src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
View File

@@ -484,7 +484,7 @@
<td> <td>
<c:if test="${cfg.userRegion1 eq 'http'}">HTTP</c:if> <c:if test="${cfg.userRegion1 eq 'http'}">HTTP</c:if>
<c:if test="${cfg.userRegion1 eq 'https'}">HTTPS</c:if> <c:if test="${cfg.userRegion1 eq 'https'}">HTTPS</c:if>
<c:if test="${cfg.userRegion1 eq 'intercept'}">Intercept</c:if> <c:if test="${cfg.userRegion1 eq 'intercept'}"><spring:message code="intercept"/></c:if>
</td> </td>
<td commonGroupIds='${cfg.commonGroupIds}'>${fn:substring(cfg.userRegion.ipGroup,1,fn:length(cfg.userRegion.ipGroup)-1)}</td> <td commonGroupIds='${cfg.commonGroupIds}'>${fn:substring(cfg.userRegion.ipGroup,1,fn:length(cfg.userRegion.ipGroup)-1)}</td>
<td subscribeIdGroup>${fn:substring(cfg.userRegion.subscribeIdGroup,1,fn:length(cfg.userRegion.subscribeIdGroup)-1)}</td> <td subscribeIdGroup>${fn:substring(cfg.userRegion.subscribeIdGroup,1,fn:length(cfg.userRegion.subscribeIdGroup)-1)}</td>