From 3de1f6cf143dd2deaa579b5243558371422b85e1 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 30 Oct 2018 19:43:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoSystemController.java | 1 + .../listener/SysResourceBindleListener.java | 104 ++++++++++++++++----- .../core/apiservice/mq/I3CoreQueueConfig.java | 2 +- .../src/main/resources/banner.txt | 11 +-- 4 files changed, 89 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java index d955250..300ab1b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoSystemController.java @@ -77,6 +77,7 @@ public class DemoSystemController { LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()).build(); }catch(Exception e){ + LOGGER.error(e.getMessage(),e); return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java index aec83a2..4a5bc22 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/listener/SysResourceBindleListener.java @@ -29,16 +29,50 @@ public class SysResourceBindleListener implements ApplicationListener + * 先根据code查询，判断是否存在，然后通过语言获取对应的值 + */ + HashMap> resMap = new HashMap(); + HashMap lanMap = null; + + //语言数量 List langList = systemResourceService.listSysLocaleLanguage(null); - LOGGER.info("【加载平台资源】共有{}种语言。",langList.size()); - List resourceList = null; - SysLocaleResource resource = null; + //查询所有资源 + List resourceList = systemResourceService.listSysLocaleResource(null); + LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。",resourceList.size(),langList.size()); + for(SysLocaleResource res : resourceList) { + //遍历资源，放入map中 + lanMap = resMap.get(res.getResourceKey()); + //判断是否已存在资源信息 + if(lanMap == null){ + lanMap = new HashMap(); + //将key/代码放入 + resMap.put(res.getResourceKey(),lanMap); + } + //根据语言放入 + lanMap.put(res.getLanguageCode(),res.getResourceValue()); + } + + for(String key : resMap.keySet()){ + //放入缓存 + redisRes.putHashMap(key,resMap.get(key)); + } + + LOGGER.info("【资源配置文件已全部加载：{}】",resMap.size()); + + /* + //资源集合 + HashMap resMap; + //模块集合 HashMap> langModoleMap = new HashMap(); //功能集合 @@ -47,74 +81,100 @@ public class SysResourceBindleListener implements ApplicationListener> langBtnMap = new HashMap(); //信息集合 HashMap> langMsgMap = new HashMap(); - //资源集合 - HashMap resMap; + //异常集合 + HashMap> langExMap = new HashMap(); - /************** 加载国际化 *************/ + *//************** 加载国际化 *************//* for(SysLocaleLanguage lang : langList) { - - /************** 加载模块 *************/ + *//************** 加载模块 *************//* resource = new SysLocaleResource(); resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MODULE.getValue()); resource.setLanguageCode(lang.getLanguageCode()); resourceList = systemResourceService.listSysLocaleResource(resource); - LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MODULE.getDescription(), - lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); + if(resourceList.size() > 0) { + LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MODULE.getDescription(), + lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); + } resMap = new HashMap(); for(SysLocaleResource res : resourceList){ resMap.put(res.getResourceKey(),res.getResourceValue()); } langModoleMap.put(lang.getLanguageCode(),resMap); - /************** 加载功能 *************/ + *//************** 加载功能 *************//* resource = new SysLocaleResource(); resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.METHOD.getValue()); resource.setLanguageCode(lang.getLanguageCode()); resourceList = systemResourceService.listSysLocaleResource(resource); - LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.METHOD.getDescription(), - lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); + if(resourceList.size() > 0) { + LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.METHOD.getDescription(), + lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); + } + resMap = new HashMap(); for(SysLocaleResource res : resourceList){ resMap.put(res.getResourceKey(),res.getResourceValue()); } langMethodMap.put(lang.getLanguageCode(),resMap); - /************** 加载按钮 *************/ + *//************** 加载按钮 *************//* resource = new SysLocaleResource(); resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.BUTTON.getValue()); resource.setLanguageCode(lang.getLanguageCode()); resourceList = systemResourceService.listSysLocaleResource(resource); - LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.BUTTON.getDescription(), - lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); + if(resourceList.size() > 0) { + LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.BUTTON.getDescription(), + lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); + } + resMap = new HashMap(); for(SysLocaleResource res : resourceList){ resMap.put(res.getResourceKey(),res.getResourceValue()); } langBtnMap.put(lang.getLanguageCode(),resMap); - /************** 加载资源 *************/ + *//************** 加载资源 *************//* resource = new SysLocaleResource(); resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.COMMON.getValue()); resource.setLanguageCode(lang.getLanguageCode()); resourceList = systemResourceService.listSysLocaleResource(resource); - LOGGER.info("【{}-{},{}】共有{}个资源。",CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.COMMON.getDescription(), - lang.getLanguageName(),lang.getLanguageCode(),resourceList.size()); + if(resourceList.size() > 0) { + LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.COMMON.getDescription(), + lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); + } resMap = new HashMap(); for(SysLocaleResource res : resourceList){ resMap.put(res.getResourceKey(),res.getResourceValue()); } langMsgMap.put(lang.getLanguageCode(),resMap); + + *//************** 加载异常 *************//* + resource = new SysLocaleResource(); + resource.setResourceType(CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION.getValue()); + resource.setLanguageCode(lang.getLanguageCode()); + resourceList = systemResourceService.listSysLocaleResource(resource); + + if(resourceList.size() > 0) { + LOGGER.info("【{}-{},{}】共有{}个资源。", CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.EXCEPTION.getDescription(), + lang.getLanguageName(), lang.getLanguageCode(), resourceList.size()); + } + resMap = new HashMap(); + for(SysLocaleResource res : resourceList){ + resMap.put(res.getResourceKey(),res.getResourceValue()); + } + langExMap.put(lang.getLanguageCode(),resMap); } redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE,langModoleMap); redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_METHOD,langMethodMap); redisCore.putHashMap(CommonConstWords.RES_PLAT_MODULE_BUTTON,langBtnMap); redisCore.putHashMap(CommonConstWords.RES_LANGUAGE_CONVERT,langMsgMap); + redisCore.putHashMap(CommonConstWords.RES_EXCEPTION_CONVERT,langExMap); - LOGGER.info("【资源配置文件已全部加载】"); + LOGGER.info("【资源配置文件已全部加载】");*/ } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java index cc9017d..488c088 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java @@ -51,7 +51,7 @@ public class I3CoreQueueConfig { public static final String DEMO_ACK_QUEUE = "ack_queue"; @Bean public Queue getAckQueue() throws Exception { - LOGGER.info("【DEMO_ACK_QUEUE队列】"); + //LOGGER.info("【DEMO_ACK_QUEUE队列】"); return new Queue(DEMO_ACK_QUEUE); } diff --git a/modules/i3plus-core-apiservice/src/main/resources/banner.txt b/modules/i3plus-core-apiservice/src/main/resources/banner.txt index de58f3d..1fc9e98 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/banner.txt +++ b/modules/i3plus-core-apiservice/src/main/resources/banner.txt @@ -4,12 +4,11 @@ | __| \___ \ | | \___ \| __ | | | |__ <| ___/| | | | / __| | |____ ____) | | | ____) | | | | _ _| |_ ___) | | | | |_| \__ \ |______|_____/ |_| |_____/|_| |_| (_)_____|____/|_| |_|\__,_|___/ - _____ __ __ _____ _____ _ _ __ - |_ _| \/ | __ \| __ \| | | | / _| - | | | \ / | |__) | |__) | | __ _| |_| |_ ___ _ __ _ __ ___ - | | | |\/| | ___/| ___/| |/ _` | __| _/ _ \| '__| '_ ` _ \ - _| |_| | | | | | | | | (_| | |_| || (_) | | | | | | | | - |_____|_| |_|_| |_| |_|\__,_|\__|_| \___/|_| |_| |_| |_| + ___ __ __ ____ ____ ____ ___ ____ _____ + |_ _| \/ | _ \| _ \ / ___|/ _ \| _ \| ____| + | || |\/| | |_) | |_) | _____ | | | | | | |_) | _| + | || | | | __/| __/ |_____| | |___| |_| | _ <| |___ + |___|_| |_|_| |_| \____|\___/|_| \_\_____| ------------------------------------------------------------------->>> ::::: CORE of i3plus Impp framework :::: （v1.0.0.Build） ------------------------------------------------------------------->>> >>>