From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
index a9f0527..3749554 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java
@@ -4,33 +4,41 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import javax.servlet.ServletContext;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.StringUtils;
+import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.service.SysCompanyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
import org.springframework.stereotype.Controller;
import org.springframework.web.context.ServletContextAware;
import com.matrix.core.constance.MatrixConstance;
/**
- *
+ *
* 初始化web容器的类 一些网站启动需要加载的数据和方法在这里配置和执行
* @author:姜友瑶
* @date 2016年10月18日
*/
-@Controller
-public class InitWebContainer implements ServletContextAware{
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class InitWebContainer implements ApplicationRunner {
+
private static final String TRUE = "true";
-
- private ServletContext servletContext;
static private final String LANGUAGE_ZH = "zh";
@@ -53,15 +61,13 @@
private String systemLanguage;
/**
- *
+ *
* 容器启动后加载数据
* @author:姜友瑶
- * @param sc
* @date 2016年10月18日
*/
@Override
- public void setServletContext(ServletContext sc) {
- this.servletContext = sc;
+ public void run(ApplicationArguments args) {
// 初始化调试模式
initDebug();
@@ -70,10 +76,10 @@
//初始化公司
initParams();
LogUtil.info("\r\n\r\n**********************************************\r\n"
- + "* =========== Matrix启动成功 ===========\r\n"
+ + "* =========== 成功 ===========\r\n"
+ "* DEBUG模式:" + debug+"*\r\n"
+ "* 语言环境:" + Locale.getDefault().getLanguage()+"\r\n"
-
+
+ "**********************************************\r\n");
}
@@ -87,7 +93,7 @@
/**
* 初始化语言环境，默认为中文
- *
+ *
* @author JIANGYOUYAO
* @email 935090232@qq.com
* @date 2017年11月30日
@@ -116,12 +122,13 @@
List<SysCompany> company=sysCompanyService.findByModel(null);
Map<String, SysCompany> companyMap=new HashMap<>();
for (SysCompany sysCompany : company) {
- companyMap.put(sysCompany.getComWebUrl(), sysCompany);
+ companyMap.put(sysCompany.getComCode(), sysCompany);
}
- servletContext.setAttribute("companyMap", companyMap);
+ LocalCache.save("companyMap", companyMap);
}
+
}
--
Gitblit v1.9.1