From db19be9c3e6a3e892da0be1dcab2db1eb633c7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 7 Apr 2020 17:48:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=BC=93=E5=AD=98key?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java | 2 +- .../i3plus/core/apiservice/serviceimpl/base/SystemInitService.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 93357ed..0cbb20d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -42,7 +42,7 @@ public class AppStartSystemInit implements CommandLineRunner { // 限制账号数量 public static int userInfoCount = 100; - @Value("${" + CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL + "}") +// @Value("${" + CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL + "}") public String PROP_IMPP_ELASTICSEARCH_URL; @Resource(name = CommonConstWords.IMPP_REDIS_RES) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 56ad305..c5333cd 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -232,12 +232,11 @@ public class SystemInitService implements ISystemInitService { resListPage = systemResourceService.listSysLocaleResourceByPager(null, pager); for (SysLocaleResource res : resListPage.getObjectList()) { - resKey = CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + res.getLanguageCode() + ":" + res.getSoftType(); + resKey = CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + res.getSoftType() + ":" + res.getResourceKey(); resMap = langSoftMap.computeIfAbsent(resKey, k -> new HashMap<>()); resMap.put(res.getResourceKey(), res.getResourceValue()); } - LOGGER.info("【加载资源】数据分类中 {} / {} ", pager.getEndRow(), pager.getTotalRows()); } while (pager.hasNext());