Browse Source

Bean 初始化顺序调整

xuxueli 6 years ago
parent
commit
b014a3c5da

+ 4 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java View File

1
 package com.xxl.job.admin.controller;
1
 package com.xxl.job.admin.controller;
2
 
2
 
3
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
4
 import com.xxl.job.admin.core.model.XxlJobGroup;
3
 import com.xxl.job.admin.core.model.XxlJobGroup;
5
 import com.xxl.job.admin.core.model.XxlJobRegistry;
4
 import com.xxl.job.admin.core.model.XxlJobRegistry;
6
 import com.xxl.job.admin.core.util.I18nUtil;
5
 import com.xxl.job.admin.core.util.I18nUtil;
7
 import com.xxl.job.admin.dao.XxlJobGroupDao;
6
 import com.xxl.job.admin.dao.XxlJobGroupDao;
8
 import com.xxl.job.admin.dao.XxlJobInfoDao;
7
 import com.xxl.job.admin.dao.XxlJobInfoDao;
8
+import com.xxl.job.admin.dao.XxlJobRegistryDao;
9
 import com.xxl.job.core.biz.model.ReturnT;
9
 import com.xxl.job.core.biz.model.ReturnT;
10
 import com.xxl.job.core.enums.RegistryConfig;
10
 import com.xxl.job.core.enums.RegistryConfig;
11
 import org.springframework.stereotype.Controller;
11
 import org.springframework.stereotype.Controller;
31
 	public XxlJobInfoDao xxlJobInfoDao;
31
 	public XxlJobInfoDao xxlJobInfoDao;
32
 	@Resource
32
 	@Resource
33
 	public XxlJobGroupDao xxlJobGroupDao;
33
 	public XxlJobGroupDao xxlJobGroupDao;
34
+	@Resource
35
+	private XxlJobRegistryDao xxlJobRegistryDao;
34
 
36
 
35
 	@RequestMapping
37
 	@RequestMapping
36
 	public String index(Model model) {
38
 	public String index(Model model) {
117
 
119
 
118
 	private List<String> findRegistryByAppName(String appNameParam){
120
 	private List<String> findRegistryByAppName(String appNameParam){
119
 		HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
121
 		HashMap<String, List<String>> appAddressMap = new HashMap<String, List<String>>();
120
-		List<XxlJobRegistry> list = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findAll(RegistryConfig.DEAD_TIMEOUT);
122
+		List<XxlJobRegistry> list = xxlJobRegistryDao.findAll(RegistryConfig.DEAD_TIMEOUT);
121
 		if (list != null) {
123
 		if (list != null) {
122
 			for (XxlJobRegistry item: list) {
124
 			for (XxlJobRegistry item: list) {
123
 				if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {
125
 				if (RegistryConfig.RegistType.EXECUTOR.name().equals(item.getRegistryGroup())) {

+ 2 - 0
xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobScheduler.java View File

20
 import org.slf4j.LoggerFactory;
20
 import org.slf4j.LoggerFactory;
21
 import org.springframework.beans.factory.DisposableBean;
21
 import org.springframework.beans.factory.DisposableBean;
22
 import org.springframework.beans.factory.InitializingBean;
22
 import org.springframework.beans.factory.InitializingBean;
23
+import org.springframework.context.annotation.DependsOn;
23
 import org.springframework.stereotype.Component;
24
 import org.springframework.stereotype.Component;
24
 
25
 
25
 import javax.servlet.ServletException;
26
 import javax.servlet.ServletException;
33
  * @author xuxueli 2018-10-28 00:18:17
34
  * @author xuxueli 2018-10-28 00:18:17
34
  */
35
  */
35
 @Component
36
 @Component
37
+@DependsOn("xxlJobAdminConfig")
36
 public class XxlJobScheduler implements InitializingBean, DisposableBean {
38
 public class XxlJobScheduler implements InitializingBean, DisposableBean {
37
     private static final Logger logger = LoggerFactory.getLogger(XxlJobScheduler.class);
39
     private static final Logger logger = LoggerFactory.getLogger(XxlJobScheduler.class);
38
 
40