From e348bd909a73afdd1a89bb994d838f9e53f05c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 14 Jan 2020 17:25:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8E=BB=E9=87=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/busi/SysLocaleResourceController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index 1137011..cee0da5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -401,6 +401,9 @@ public class SysLocaleResourceController extends CoreBaseController { @ApiOperation(value = "增量导入系统资源") public ResultBean incrementImportSysLocaleResource(@RequestParam("file") MultipartFile file){ try { + // 重新加载资源 + systemInitService.putAndLoadSysLocaleLanguage(); + Long startTime = System.currentTimeMillis(); // 提取Excel数据 LOGGER.info("开始增量导入 {}",file.getOriginalFilename()); @@ -446,8 +449,6 @@ public class SysLocaleResourceController extends CoreBaseController { }.start(); } - // 重新加载资源 -// systemInitService.putAndLoadSysLocaleLanguage(); // LOGGER.info("数据缓存更新完毕,总耗时：{}",System.currentTimeMillis()-startTime); return ResultBean.success("数据导入中...").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -487,7 +488,7 @@ public class SysLocaleResourceController extends CoreBaseController { } private Long getResourceKey(String resKey, String languageCode) { - if (redisRes.checkKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + resKey, languageCode)) { + if (redisRes.checkKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + resKey, languageCode)) { LOGGER.info("查询到已存在资源 {}：{}",resKey,languageCode); SysLocaleResource sysLocaleResource =sysLocaleResourceService.getSysLocaleResourceByLanguageCodeAndResKey( languageCode, resKey