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

(1)修改IP配置dns_res_strategy的pojo类型为Integer

Browse Source 
(2)DnsIpCfgDao.xml的dns_res_strategy类型由VARCHAR 改为Integer
(3)IP白名单导入配置去掉界面无用的字段
(4)配置日志总量查询超时调整为10秒
This commit is contained in:
wangxin
2018-07-30 18:14:22 +08:00
parent 7a463cae23
commit 02c3e5dbeb
9 changed files with 110 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ public class CommonController extends BaseController {
ip.setCreatorId(ipCfg.getCurrentUser().getId());
ip.setCreateTime(date);
ip.setCompileId(ipCfgService.getCompileId());
ip.setDnsStrategyId((long)cfg.getDnsStrategyId().intValue());
ip.setDnsStrategyId(cfg.getDnsStrategyId());
ipList.add(ip);
}
ipCfgService.saveBatch(ipList, IpCfgDao.class);

5
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -22,6 +22,7 @@ import com.nis.domain.Page;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.template.WhiteListIpTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.web.controller.configuration.CommonController;
@@ -222,14 +223,14 @@ public class WhiteListController extends CommonController{
@RequestMapping(value = "ip/import", method=RequestMethod.POST)
public String importIp(String cfgName,RedirectAttributes redirectAttributes,
@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
this._importIp(cfgName,redirectAttributes, file,cfg);
this._importIp(cfgName,redirectAttributes, file,cfg,WhiteListIpTemplate.class);
return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
}
//ip模板下载
@RequestMapping(value = "ip/import/template")
public void importFileTemplate(HttpServletRequest request,HttpServletResponse response,
RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,WhiteListIpTemplate.class);
}
//ip配置导出
@RequestMapping(value = "ip/export")

2
src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml
View File

@@ -34,7 +34,7 @@
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
<result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
<result column="dns_strategy_id" property="dnsStrategyId" jdbcType="VARCHAR" />
<result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
<result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
</resultMap>

2
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -528,7 +528,7 @@ public abstract class BaseService {
return resStrategy;
}
//ip转换为callback用ip
public InlineIp convertCallBackIp(BaseIpCfg cfg,Long policyGroup){
public InlineIp convertCallBackIp(BaseIpCfg cfg,Integer policyGroup){
IpCfg c=ipConvert(new IpCfg(),cfg);
InlineIp ip=new InlineIp();
ip.setId(cfg.getCompileId());