app http特征导入提交

This commit is contained in:
wangxin
2018-11-02 20:36:51 +08:00
parent 5a51ef8e4a
commit 1ec2f7ad97
4 changed files with 51 additions and 10 deletions

View File

@@ -3305,8 +3305,9 @@ public class BaseController {
|| serviceDict.getServiceId().intValue() == 147
|| serviceDict.getServiceId().intValue() == 36
|| serviceDict.getServiceId().intValue() == 148
|| serviceDict.getServiceId().intValue() == 1028)// app ip
) {
|| serviceDict.getServiceId().intValue() == 1028// app ip
|| serviceDict.getServiceId().intValue() == 1024//app http
)) {
if (StringUtils.isNotBlank(specServiceId)) {
specificServiceCfg = specificServiceCfgService
.getBySpecServiceId(Integer.parseInt(specServiceId));
@@ -3473,7 +3474,9 @@ public class BaseController {
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setServiceId(serviceDict.getServiceId());
cfg.setCompileId(compileIds.get(i));
if(compileIds!=null&&compileIds.size()==stringCfgs.size()) {
cfg.setCompileId(compileIds.get(i));
}
if(specificServiceCfg!=null) {
cfg.setAppCode(specificServiceCfg.getSpecServiceCode());
cfg.setSpecServiceId(specificServiceCfg.getSpecServiceId());
@@ -3572,7 +3575,9 @@ public class BaseController {
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setServiceId(serviceDict.getServiceId());
cfg.setCompileId(compileIds.get(ind));
if(compileIds!=null&&compileIds.size()==complexkeywordCfgs.size()) {
cfg.setCompileId(compileIds.get(ind));
}
if(specificServiceCfg!=null) {
cfg.setAppCode(specificServiceCfg.getSpecServiceCode());
cfg.setSpecServiceId(specificServiceCfg.getSpecServiceId());
@@ -3603,9 +3608,12 @@ public class BaseController {
appPolicyCfgs.add(appPolicyCfg);
}
} else {
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
BeanUtils.copyProperties(cfg, cfgIndexInfo);
cfgIndexInfos.add(cfgIndexInfo);
if(!regionDict.getFunctionId().equals(402)) {
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
BeanUtils.copyProperties(cfg, cfgIndexInfo);
cfgIndexInfos.add(cfgIndexInfo);
}
}
ind++;
}
@@ -3621,6 +3629,9 @@ public class BaseController {
if(regionDict.getDictId().intValue()==11) {
websiteCfgService.saveHttpResHeadCfg(complexkeywordCfgs);
}
if(regionDict.getDictId().intValue()==63) {
appCfgService.saveAppHttpCfg(complexkeywordCfgs);
}
}else if(regionDict.getRegionType().equals(6)) {
if(regionDict.getFunctionId().equals(400)) {
List<Integer> compileIds=Lists.newArrayList();