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

(1)maat转换工具配置文件新增属性

Browse Source 
(2)修复maat转换工具增强字符串单域审核失败bug
This commit is contained in:
wangxin
2018-03-27 17:03:21 +08:00
parent 2e8861d3fa
commit 053b3310f3
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/maat-tools-0.0.1-SNAPSHOT.jar
View File

Binary file not shown.

3
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -1,5 +1,4 @@
package com.nis.web.controller.configuration; package com.nis.web.controller.configuration;
import java.lang.annotation.Target;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -11,12 +10,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo; import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.RequestInfo;
import com.nis.main.ConvertTool; import com.nis.main.ConvertTool;

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

@@ -9,12 +9,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo; import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.RequestInfo;
import com.nis.main.ConvertTool; import com.nis.main.ConvertTool;

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

@@ -10,13 +10,11 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.ServiceConfigInfo; import com.nis.domain.ServiceConfigInfo;
import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.ServiceDictInfo;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.RequestInfo;
import com.nis.main.ConvertTool; import com.nis.main.ConvertTool;
import com.nis.util.Constants; import com.nis.util.Constants;

6
src/main/resources/matt.properties
View File

@@ -50,4 +50,10 @@ readTimeout=5000
saveConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/configSources saveConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/configSources
#将配置置为失效的接口地址 #将配置置为失效的接口地址
invalidConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/configSources invalidConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/configSources
#保存dns欺骗ip的后台地址
saveDnsConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/dnsFakeIpSources
#获取dns欺骗ip的主键id
get_fakeIpId_url=http://10.0.6.30:8080/maatRest/service/cfg/v1/getCompileId
#设置dns欺骗ip为无效的url
invalidDnsConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/dnsFakeIpSources