From cb784e560e75e348af7d3bfb9a1d9a90803e7c41 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Sun, 1 Jul 2018 11:47:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=9F=9F=E6=9C=AA=E5=85=A5redis=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86;=202=E3=80=81=E6=91=98=E8=A6=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=90=8E=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=ADkey=E6=94=B9=E4=B8=BAaccessUrl;=203=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=9E=E8=B0=83=E7=B1=BB=E9=85=8D=E7=BD=AE?= =?UTF-8?q?inline=5Fip=5Fcb=E8=A1=A8protocol=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/ReadMaatXmlUtil.java | 4 ++-- .../nis/web/controller/restful/ConfigSourcesController.java | 2 +- .../com/nis/web/service/restful/ConfigSourcesService.java | 2 +- src/main/resources/commonSources/commonSources.xml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 @@ - +