Selaa lähdekoodia

Bean 初始化顺序调整

xuxueli 6 vuotta sitten
vanhempi
commit
b014a3c5da

+ 4 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java Näytä tiedosto

@@ -1,11 +1,11 @@
1 1
 package com.xxl.job.admin.controller;
2 2
 
3
-import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
4 3
 import com.xxl.job.admin.core.model.XxlJobGroup;
5 4
 import com.xxl.job.admin.core.model.XxlJobRegistry;
6 5
 import com.xxl.job.admin.core.util.I18nUtil;
7 6
 import com.xxl.job.admin.dao.XxlJobGroupDao;
8 7
 import com.xxl.job.admin.dao.XxlJobInfoDao;
8
+import com.xxl.job.admin.dao.XxlJobRegistryDao;
9 9
 import com.xxl.job.core.biz.model.ReturnT;
10 10
 import com.xxl.job.core.enums.RegistryConfig;
11 11
 import org.springframework.stereotype.Controller;
@@ -31,6 +31,8 @@ public class JobGroupController {
31 31
 	public XxlJobInfoDao xxlJobInfoDao;
32 32
 	@Resource
33 33
 	public XxlJobGroupDao xxlJobGroupDao;
34
+	@Resource
35
+	private XxlJobRegistryDao xxlJobRegistryDao;
34 36
 
35 37
 	@RequestMapping
36 38
 	public String index(Model model) {
@@ -117,7 +119,7 @@ public class JobGroupController {
117 119
 
118 120
 	private List<String> findRegistryByAppName(String appNameParam){
119 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 123
 		if (list != null) {
122 124
 			for (XxlJobRegistry item: list) {
123 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 Näytä tiedosto

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