修正配置导入‘匹配区域’属性默认值问题.

This commit is contained in:
zhangwenqing
2019-01-09 15:44:35 +08:00
parent 6f0dd7c803
commit 9a06ee9dce
2 changed files with 11 additions and 6 deletions

View File

@@ -250,6 +250,13 @@ public class ExportExcel {
index++; index++;
} }
} }
if("redirect_url".equals(headerStr)) {
commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
//1、非空
commentStr=commentStr+""+msgProp.getProperty("required")+"\n";
index++;
}
/*** HTTP(s)阻断 应答码 ***/ /*** HTTP(s)阻断 应答码 ***/
if("response_code".equals(headerStr)){ if("response_code".equals(headerStr)){
commentStr=""; commentStr="";
@@ -1071,10 +1078,7 @@ public class ExportExcel {
index++; index++;
commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++; index++;
//1、非空说明 //1、默认值说明
commentStr=commentStr+""+msgProp.getProperty("required")+"\n";
index++;
//2、默认值说明
if(!StringUtil.isEmpty(defaultValue)){ if(!StringUtil.isEmpty(defaultValue)){
commentStr=commentStr+""+msgProp.getProperty("default_value")+":"+defaultValue+"\n"; commentStr=commentStr+""+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++; index++;

View File

@@ -217,14 +217,15 @@ public class CheckComplexStringFormatThread implements Callable<String>{
} }
if (StringUtils.isNotBlank(dirtrictP)) { if (StringUtils.isNotBlank(dirtrictP)) {
if (StringUtils.isBlank(district)) { if (StringUtils.isBlank(district)) {
if (dirtrictP.indexOf(",") == -1) { /*if (dirtrictP.indexOf(",") == -1) {
baseStringCfg.setDistrict(dirtrictP); baseStringCfg.setDistrict(dirtrictP);
} else { } else {
// baseStringCfg.setDistrict(dirtrictP.split(",")[0]); // baseStringCfg.setDistrict(dirtrictP.split(",")[0]);
errInfo.append( errInfo.append(
String.format(prop.getProperty("can_not_null"), prop.getProperty("district") + " ") String.format(prop.getProperty("can_not_null"), prop.getProperty("district") + " ")
+ ";"); + ";");
} }*/
baseStringCfg.setDistrict(dirtrictP.split(",")[0]);
} else if (dirtrictP.indexOf(district) == -1) { } else if (dirtrictP.indexOf(district) == -1) {
errInfo.append( errInfo.append(
String.format(prop.getProperty("is_incorrect"), prop.getProperty("district") + " ") String.format(prop.getProperty("is_incorrect"), prop.getProperty("district") + " ")