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 662e0d4..2df4adc 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 @@ -46,8 +46,7 @@ public class AppStartSystemInit implements CommandLineRunner { // 限制账号数量 public static int userInfoCount = 100; -// @Value("${" + CommonConstWords.PROP_IMPP_ELASTICSEARCH_URL + "}") -// public String PROP_IMPP_ELASTICSEARCH_URL; + public String PROP_IMPP_ELASTICSEARCH_URL; @Resource(name = CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; 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..839fe55 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()); + resMap.put(res.getLanguageCode(), res.getResourceValue()); } - LOGGER.info("【加载资源】数据分类中 {} / {} ", pager.getEndRow(), pager.getTotalRows()); } while (pager.hasNext());