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

(1)修复app等选择行为的时候表达式为与表达式

Browse Source 
(2)http,dns,mail,ftp,url配置导入提交
This commit is contained in:
wangxin
2018-10-20 23:38:56 +08:00
parent 16e8b9b855
commit 3be9eb7aea
12 changed files with 450 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,7 @@ public class IpController extends BaseController{
if(regionDict.getRegionType().equals(3)){
if(regionDict.getFunctionId().equals(7)){//DNS DISTRICT STRING
List<DnsComplexStringTemplate> classList=new ArrayList<DnsComplexStringTemplate>();
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllTemplate.class, 2);
ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, DnsComplexStringTemplate.class, 2);
excel.setDataList(this.getMsgProp(),classList,null).
write(request,response, fileName).dispose();
}else{