Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
zhangshilin
2018-03-28 08:44:49 +08:00
67 changed files with 2897 additions and 1083 deletions

View File

@@ -35,3 +35,26 @@ hasLastUpdate=true
#配置状态更新的字段
updateFields=IS_VALID,OP_TIME
#maat configurations
#从后台服务获取compileid的url地址
get_compileId_url=http://10.0.6.30:8080/maatRest/service/cfg/v1/getCompileId
#从后台服务获取groupid的url地址
get_groupId_url=http://10.0.6.30:8080/maatRest/service/cfg/v1/getCompileId
#从后台服务获取regionid的url地址
get_regionId_url=http://10.0.6.30:8080/maatRest/service/cfg/v1/getCompileId
#http连接超时时间
httpConnectTimeout=5000
#http读超时时间
readTimeout=5000
#向后台提交配置的地址(post形式提交)
saveConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/configSources
#将配置置为失效的接口地址
invalidConfigUrl=http://10.0.6.30:8080/maatRest/service/cfg/v1/invalidConfigSource
#保存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