fix(impp-framework core block): 统一提交

还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
yun-zuoyi
wynne1005 4 years ago
parent c67b054a75
commit f8b6226dc5

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

@ -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.platform.common.tool.JsonUtilTool;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; 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 com.rabbitmq.client.Channel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -54,14 +52,14 @@ public class SysLocalResourceQueue {
Map.Entry<String, String> entry = missResource.entrySet().iterator().next(); Map.Entry<String, String> entry = missResource.entrySet().iterator().next();
SysMenu sysMenu = sysMenuService.getSysMenuByCode(entry.getValue()); SysMenu sysMenu = sysMenuService.getSysMenuByCode(entry.getValue());
CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(sysMenu.getSoftType()); CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(sysMenu.getSoftType());
if(softType == null){ if (softType == null) {
softType = CommonEnumUtil.SOFT_TYPE.IMPP; softType = CommonEnumUtil.SOFT_TYPE.IMPP;
} }
LocaleUtils.saveMissResource(entry.getKey(), AuthUtil.getSessionLanguage().toString(), // LocaleUtils.saveMissResource(entry.getKey(), AuthUtil.getSessionLanguage().toString(),
softType.getValue(), // softType.getValue(),
CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(), // CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.MISSING.getValue(),
CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue()); // CommonEnumUtil.MiSS_RESOURCE_SOURCE.WEB.getValue());
} }
}catch (Exception e){ }catch (Exception e){
LOGGER.error("缺失资源保存异常:{}", missResourceStr, e); LOGGER.error("缺失资源保存异常:{}", missResourceStr, e);

@ -7,7 +7,7 @@
<groupId>i3plus.core</groupId> <groupId>i3plus.core</groupId>
<artifactId>i3plus-core</artifactId> <artifactId>i3plus-core</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version> <version>1.0-DEV-SNAPSHOT</version>
<modules> <modules>
<module>modules/i3plus-core-api</module> <module>modules/i3plus-core-api</module>
<module>modules/i3plus-core-apiservice</module> <module>modules/i3plus-core-apiservice</module>

Loading…
Cancel
Save