From 58032b964fa5dee3924847943548093af6dcb098 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 28 Oct 2021 10:32:24 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/common/init/InitWebContainer.java |   64 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 27 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 6f04363..773e107 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
@@ -1,32 +1,44 @@
 package com.matrix.system.common.init;
 
-import com.matrix.core.constance.MatrixConstance;
-import com.matrix.core.tools.LogUtil;
-import com.matrix.system.common.bean.SysCompany;
-import com.matrix.system.common.dao.SysCompanyDao;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.context.ServletContextAware;
-
-import javax.servlet.ServletContext;
 import java.util.HashMap;
 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";
 
@@ -35,8 +47,7 @@
 
 
 	@Autowired
-	private SysCompanyDao sysCompanyDao;
-
+	private SysCompanyService sysCompanyService;
 
 
 
@@ -50,27 +61,25 @@
 	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();
 		// 初始化语言环境
 		initLanguage();
 		//初始化公司
-		//initParams();
+		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");
 	}
 
@@ -84,7 +93,7 @@
 
 	/**
 	 * 初始化语言环境，默认为中文
-	 * 
+	 *
 	 * @author JIANGYOUYAO
 	 * @email 935090232@qq.com
 	 * @date 2017年11月30日
@@ -110,15 +119,16 @@
 	public  void initParams() {
 
 		//初始化所有的公司
-		List<SysCompany> company=sysCompanyDao.selectAll();
+		List<SysCompany> company=sysCompanyService.findByModel(null);
 		Map<String, SysCompany> companyMap=new HashMap<>();
 		for (SysCompany sysCompany : company) {
 			companyMap.put(sysCompany.getComWebUrl(), sysCompany);
 		}
-		servletContext.setAttribute("companyMap", companyMap);
+		LocalCache.save("companyMap", companyMap);
 	}
 
 
 
 
+
 }

--
Gitblit v1.9.1