diff --git a/src/main/java/com/nis/util/ReadMaatXmlUtil.java b/src/main/java/com/nis/util/ReadMaatXmlUtil.java index beabaf0..9d699eb 100644 --- a/src/main/java/com/nis/util/ReadMaatXmlUtil.java +++ b/src/main/java/com/nis/util/ReadMaatXmlUtil.java @@ -120,10 +120,10 @@ public class ReadMaatXmlUtil { maatXmlExpr.setType(12); } else if (ele.getTextTrim().contains("num_region_table_name")) { maatXmlExpr.setType(13); - } else if (ele.getTextTrim().contains("str_region_table_name")) { - maatXmlExpr.setType(14); } else if (ele.getTextTrim().contains("str_str_region_table_name")) { maatXmlExpr.setType(15); + } else if (ele.getTextTrim().contains("str_region_table_name")) { + maatXmlExpr.setType(14); } else if (ele.getTextTrim().contains("file_digest_table_name")) { maatXmlExpr.setType(16); } else if (ele.getTextTrim().contains("file_like_table_name")) { diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index bdcb635..59d93f5 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -678,7 +678,7 @@ public class ConfigSourcesController extends BaseRestController { logger.info("-----------------调用接口上传文件---------------"); String filePath = FileManager.upload(fdsfile, null); // resultObject.put("path", filePath.substring(filePath.indexOf("group"))); - resultObject.put("path", filePath); + resultObject.put("accessUrl", filePath); } } catch (IOException e) { // TODO Auto-generated catch block diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index e77dce3..59d4ef6 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1218,7 +1218,7 @@ public class ConfigSourcesService extends BaseService { maatConfig.setStrRegionMapList(dstMaplList); // 增强字符串域 if (!StringUtil.isEmpty(strongMapList)&&strongMapList.size()>0) { - maatConfig.setStrStrRegionMapList((dstMaplList)); + maatConfig.setStrStrRegionMapList((strongMapList)); } //数值域 dstMaplList = null; diff --git a/src/main/resources/commonSources/commonSources.xml b/src/main/resources/commonSources/commonSources.xml index 943a52a..f4f455f 100644 --- a/src/main/resources/commonSources/commonSources.xml +++ b/src/main/resources/commonSources/commonSources.xml @@ -15,7 +15,7 @@ - + @@ -65,7 +65,7 @@ - +