I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 5923751a2b f4e0d6da4d
commit 1c0e408f06
5 changed files with 95 additions and 56 deletions
Show Stats Download Patch File Download Diff File

97
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java
Unescape Escape View File

@ -88,56 +88,57 @@ public class AppStartSystemInit implements CommandLineRunner {
/** /**
* 初始化资源信息，并缓存 * 初始化资源信息，并缓存
* 调整至cn.estsh.i3plus.core.apiservice.serviceimpl.base.SystemInitService
*/ */
public void packIMPPResources() { public void packIMPPResources() {
/** // /**
* 整体数据结构： // * 整体数据结构：
* code <lang : value> // * code <lang : value>
* 先根据code查询，判断是否存在，然后通过语言获取对应的值 // * 先根据code查询，判断是否存在，然后通过语言获取对应的值
*/ // */
HashMap<String, HashMap<String, String>> resMap = new HashMap(); // HashMap<String, HashMap<String, String>> resMap = new HashMap();
HashMap<String, String> lanMap = null; // HashMap<String, String> lanMap = null;
HashMap<String, HashMap<String, String>> webLangMap = new HashMap<>(); // HashMap<String, HashMap<String, String>> webLangMap = new HashMap<>();
HashMap<String, String> webResMap; // HashMap<String, String> webResMap;
//
//语言数量 // //语言数量
List<SysLocaleLanguage> langList = systemResourceService.listSysLocaleLanguage(null); // List<SysLocaleLanguage> langList = systemResourceService.listSysLocaleLanguage(null);
//
//查询所有资源 // //查询所有资源
List<SysLocaleResource> resourceList = systemResourceService.listSysLocaleResource(null); // List<SysLocaleResource> resourceList = systemResourceService.listSysLocaleResource(null);
LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。", resourceList.size(), langList.size()); // LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。", resourceList.size(), langList.size());
for (SysLocaleResource res : resourceList) { // for (SysLocaleResource res : resourceList) {
//遍历资源，放入map中 // //遍历资源，放入map中
lanMap = resMap.get(res.getResourceKey()); // lanMap = resMap.get(res.getResourceKey());
//判断是否已存在资源信息 // //判断是否已存在资源信息
if (lanMap == null) { // if (lanMap == null) {
lanMap = new HashMap<String, String>(); // lanMap = new HashMap<String, String>();
//将key/代码放入 // //将key/代码放入
resMap.put(res.getResourceKey(), lanMap); // resMap.put(res.getResourceKey(), lanMap);
} // }
//根据语言放入 // //根据语言放入
lanMap.put(res.getLanguageCode(), res.getResourceValue()); // lanMap.put(res.getLanguageCode(), res.getResourceValue());
//
// web 资源 // // web 资源
if (!webLangMap.containsKey(res.getLanguageCode())) { // if (!webLangMap.containsKey(res.getLanguageCode())) {
webLangMap.put(res.getLanguageCode(), new HashMap<>()); // webLangMap.put(res.getLanguageCode(), new HashMap<>());
} // }
// 放入资源信息 // // 放入资源信息
webResMap = webLangMap.get(res.getLanguageCode()); // webResMap = webLangMap.get(res.getLanguageCode());
webResMap.put(res.getResourceKey(), res.getResourceValue()); // webResMap.put(res.getResourceKey(), res.getResourceValue());
} // }
//
for (String key : resMap.keySet()) { // for (String key : resMap.keySet()) {
//放入缓存 // //放入缓存
redisRes.putHashMap(key, resMap.get(key), 0); // redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, resMap.get(key), 0);
} // }
//
for (String key : webLangMap.keySet()) { // for (String key : webLangMap.keySet()) {
//放入缓存 // //放入缓存
redisRes.putHashMap(key, webLangMap.get(key), 0); // redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, webLangMap.get(key), 0);
} // }
//
LOGGER.info("【资源配置文件已全部加载：{}个】", resMap.size()); // LOGGER.info("【资源配置文件已全部加载：{}个】", resMap.size());
/* /*
//资源集合 //资源集合

2
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService;
import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.ServletRequestTool; import cn.estsh.i3plus.platform.common.tool.ServletRequestTool;
import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.tool.TimeTool;
@ -16,7 +17,6 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ResultBean;

38
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java
Unescape Escape View File

@ -0,0 +1,38 @@
package cn.estsh.i3plus.core.apiservice.schedulejob;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
import cn.estsh.impp.framework.boot.init.ApplicationProperties;
import io.swagger.annotations.ApiOperation;
import org.quartz.JobExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description : 通用消息推送job
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-05-04 16:02
* @Modify:
**/
@ApiOperation("通用消息推送job")
public class CoreMessagePushJob extends BaseImppScheduleJob {
public static final Logger LOGGER = LoggerFactory.getLogger(CoreMessagePushJob.class);
public CoreMessagePushJob() {
super(CoreMessagePushJob.class,"通用消息推送job");
}
/**
* rabbitMQ队列
*/
@Autowired
private RabbitTemplate rabbitTemplate;
@Override
public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
rabbitTemplate.convertAndSend(getJobParam(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
}
}

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
Unescape Escape View File

@ -64,7 +64,7 @@ public class SystemInitService implements ISystemInitService {
String redisKey = null; String redisKey = null;
List<SysConfig> list = configRDao.findAll(); List<SysConfig> list = configRDao.findAll();
for (SysConfig config : list) { for (SysConfig config : list) {
redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + "_" + config.getConfigCode(); redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + ":" + config.getConfigCode();
//存放于缓存 //存放于缓存
putDataToCache(redisKey, config,SysConfig.class); putDataToCache(redisKey, config,SysConfig.class);
@ -84,12 +84,12 @@ public class SystemInitService implements ISystemInitService {
for (String key : parentCodeMap.keySet()) { for (String key : parentCodeMap.keySet()) {
//存放于缓存 //存放于缓存
putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + "_" + key, putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key,
parentCodeMap.get(key),List.class); parentCodeMap.get(key),List.class);
} }
for (long key : parentIdMap.keySet()) { for (long key : parentIdMap.keySet()) {
putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + "_" + key, putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key,
parentIdMap.get(key),List.class); parentIdMap.get(key),List.class);
} }
} }
@ -142,12 +142,12 @@ public class SystemInitService implements ISystemInitService {
for (String key : resMap.keySet()) { for (String key : resMap.keySet()) {
//放入缓存 //放入缓存
redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + key,resMap.get(key),0); redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":"+ key,resMap.get(key),0);
} }
for(String key : webLangMap.keySet()){ for(String key : webLangMap.keySet()){
//放入缓存 //放入缓存
redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + key,webLangMap.get(key),0); redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key,webLangMap.get(key),0);
} }
} }

4
modules/i3plus-core-apiservice/src/main/resources/application.properties
Unescape Escape View File

@ -17,9 +17,9 @@ spring.mvc.servlet.load-on-startup=1
impp.web.cross = true impp.web.cross = true
#上传单个文件大小 #上传单个文件大小
spring.servlet.multipart.max-file-size=1MB spring.servlet.multipart.max-file-size=10240MB
#request请求全部数据最大限制 #request请求全部数据最大限制
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10240MB
#是否推迟文件解析，true则接受完后再解析 #是否推迟文件解析，true则接受完后再解析
spring.servlet.multipart.resolve-lazily=true spring.servlet.multipart.resolve-lazily=true

Write Preview
Loading…
Cancel
Save