From f8b6226dc56bc349a6ac2e8f8dd5125f177c3e07 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 9 Jun 2021 09:23:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(impp-framework=20core=20block):=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 还原pom 添加界面 icloud 升级mysql 驱动版本 添加松下日志切面 --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- .../i3plus/core/apiservice/mq/SysLocalResourceQueue.java | 12 +++++------- pom.xml | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 42c86a0..d202ba1 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index bce7a7a..9578fe9 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java index a83b589..f60e951 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java @@ -4,8 +4,6 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.impp.framework.boot.auth.AuthUtil; -import cn.estsh.impp.framework.boot.util.LocaleUtils; import com.rabbitmq.client.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,14 +52,14 @@ public class SysLocalResourceQueue { Map.Entry entry = missResource.entrySet().iterator().next(); SysMenu sysMenu = sysMenuService.getSysMenuByCode(entry.getValue()); CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(sysMenu.getSoftType()); - if(softType == null){ + if (softType == null) { softType = CommonEnumUtil.SOFT_TYPE.IMPP; } - LocaleUtils.saveMissResource(entry.getKey(), AuthUtil.getSessionLanguage().toString(), - softType.getValue(), - CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(), - CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue()); +// LocaleUtils.saveMissResource(entry.getKey(), AuthUtil.getSessionLanguage().toString(), +// softType.getValue(), +// CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(), +// CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue()); } }catch (Exception e){ LOGGER.error("缺失资源保存异常:{}", missResourceStr, e); diff --git a/pom.xml b/pom.xml index addf3e6..a390b89 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice