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

P2P IP与P2P Hash导入模板定义

Browse Source
This commit is contained in:
duandongmei
2018-10-23 17:54:30 +08:00
parent 2cbcd7233f
commit ba957eda17
10 changed files with 167 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,52 @@ public class ExportExcel {
public String[] validRegionFieldAndSetComment(String headerStr,String commentStr,FunctionRegionDict region,FunctionServiceDict service,Properties msgProp){
int index=0;
String[] titleInfo=new String[3];
//p2p_hash_type
if("p2p_hash_type".equals(headerStr)){
commentStr="";
List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("P2P_HASH_TYPE");
if(ratelimit !=null && ratelimit.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n";
index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）\n";
index++;
}
}
}
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
}
//p2p_ip_config_type
if("p2p_ip_config_type".equals(headerStr)){
commentStr="";
List<SysDataDictionaryItem> ratelimit=DictUtils.getDictList("P2P_IP_TYPE");
if(ratelimit !=null && ratelimit.size()>0){
for (SysDataDictionaryItem sysDataDictionaryItem : ratelimit) {
if(StringUtil.isEmpty(msgProp.getProperty(sysDataDictionaryItem.getItemValue()))){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+sysDataDictionaryItem.getItemValue()+"）\n";
index++;
}else{
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）\n";
index++;
}
}
}
if(StringUtil.isEmpty(commentStr)){
headerStr="";
commentStr="";
}else{
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
}
}
//ratelimit
if("ratelimit".equals(headerStr)){
commentStr="";
@@ -743,11 +789,13 @@ public class ExportExcel {
for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) {
if(sysDataDictionaryItem.getItemCode().equals("0")){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）"+"\n";
list.add(sysDataDictionaryItem.getItemCode());
index++;
}
if(region.getConfigHex().split(",").length>1){
if(sysDataDictionaryItem.getItemCode().equals("1")){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）"+"\n";
list.add(sysDataDictionaryItem.getItemCode());
index++;
}
}
@@ -756,6 +804,7 @@ public class ExportExcel {
for (SysDataDictionaryItem sysDataDictionaryItem : isCaseSenstive) {
if(sysDataDictionaryItem.getItemCode().equals("1")){
commentStr=commentStr+sysDataDictionaryItem.getItemCode()+"（"+msgProp.getProperty(sysDataDictionaryItem.getItemValue())+"）"+"\n";
list.add(sysDataDictionaryItem.getItemCode());
index++;
}
}

11
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -57,6 +57,8 @@ import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpCfgTemplate;
import com.nis.domain.configuration.template.IpPayloadTemplate;
import com.nis.domain.configuration.template.IpRateLimitTemplate;
import com.nis.domain.configuration.template.P2pHashStringTemplate;
import com.nis.domain.configuration.template.P2pIpTemplate;
import com.nis.domain.configuration.template.StringAllTemplate;
import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.log.SearchReport;
@@ -2783,13 +2785,22 @@ public class BaseController {
}else if(regionDict.getFunctionId().equals(212)) {
List<IpPayloadTemplate> list = ei.getDataList(IpPayloadTemplate.class);
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP
List<P2pIpTemplate> list = ei.getDataList(P2pIpTemplate.class);
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}else {
List<IpAllTemplate> list = ei.getDataList(IpAllTemplate.class);
ipPortCfgs = this.checkIpCfg(serviceDict, regionDict, list);
}
}else if(regionDict.getRegionType().equals(2)) {//字符串类
if(regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())){ //P2p hash
List<P2pHashStringTemplate> list = ei.getDataList(P2pHashStringTemplate.class);
stringCfgs=this.checkStringCfg(serviceDict, regionDict, list);
}else{
List<StringAllTemplate> list = ei.getDataList(StringAllTemplate.class);
stringCfgs=this.checkStringCfg(serviceDict, regionDict, list);
}
}else if(regionDict.getRegionType().equals(3)) {//增强字符串类
List<ComplexStringAllTemplate> list = ei.getDataList(ComplexStringAllTemplate.class);
complexkeywordCfgs=this.checkComplexStringCfg(serviceDict, regionDict, list);

15
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -34,6 +34,8 @@ import com.nis.domain.configuration.template.DnsIpTemplate;
import com.nis.domain.configuration.template.IpAllTemplate;
import com.nis.domain.configuration.template.IpPayloadTemplate;
import com.nis.domain.configuration.template.IpRateLimitTemplate;
import com.nis.domain.configuration.template.P2pHashStringTemplate;
import com.nis.domain.configuration.template.P2pIpTemplate;
import com.nis.domain.configuration.template.StringAllTemplate;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
@@ -263,6 +265,11 @@ public class IpController extends BaseController{
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsIpTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else if(regionDict.getFunctionId().equals(510) && "p2p_ip".equals(regionDict.getConfigServiceType())){ //P2p IP
List<P2pIpTemplate> classList=new ArrayList<P2pIpTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, P2pIpTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else{
List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllTemplate.class, 2);
@@ -272,11 +279,19 @@ public class IpController extends BaseController{
}
//str类模板
if(regionDict.getRegionType().equals(2)){
if(regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())){ //P2p hash
List<P2pHashStringTemplate> classList=new ArrayList<P2pHashStringTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, P2pHashStringTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else{
List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}
}
//district类模板
if(regionDict.getRegionType().equals(3)){
if(regionDict.getFunctionId().equals(7)){//DNS DISTRICT STRING

4
src/main/resources/messages/message_en.properties
View File

@@ -1276,8 +1276,8 @@ example_tip=For Example
rule_desc_tip=Rule description
port_comment_tip=Port must between 0 and 65535
port_mask_comment_tip=Port and port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter \n invisible characters.
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
ipv4_mask_range_tip=IP mask must between 16 and 32
ipv6_mask_range_tip=IP Mask must between 2 and 128

4
src/main/resources/messages/message_ru.properties
View File

@@ -1296,8 +1296,8 @@ example_tip=For Example
rule_desc_tip=Rule description
port_comment_tip=Port must between 0 and 65535
port_mask_comment_tip=Port and port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter \n invisible characters.
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
ipv4_mask_range_tip=IP mask must between 16 and 32
ipv6_mask_range_tip=IP Mask must between 2 and 128

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1271,8 +1271,8 @@ example_tip=For Example
rule_desc_tip=Rule description
port_comment_tip=Port must between 0 and 65535
port_mask_comment_tip=Port and port mask must between 0 and 65535
multi_keywords_tip=Allow multiple keywords to be entered \n and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter \n invisible characters.
multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
single_keyword_tip=Only single key input is allowed.
ipv4_mask_range_tip=IP mask must between 16 and 32
ipv6_mask_range_tip=IP Mask must between 2 and 128

21
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -114,6 +114,23 @@
onClick="javascript:window.location='${ctx}/ntc/av/contUrlForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -485,6 +502,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/av/contUrlList?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

21
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -114,6 +114,23 @@
onClick="javascript:window.location='${ctx}/ntc/av/voipForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -484,6 +501,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/av/voipList?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

21
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
View File

@@ -91,6 +91,23 @@
onClick="javascript:window.location='${ctx}/ntc/fileTransfer/p2pForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -457,6 +474,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>

21
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -93,6 +93,23 @@
onClick="javascript:window.location='${ctx}/ntc/other/bgpForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -464,6 +481,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/fileTransfer/p2pList?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>