Merge remote-tracking branch 'origin/develop' into developv1.0.20200428

7 files changed, 15 insertions, 19 deletions

diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 0e095a9..43a2e33 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -76,12 +76,11 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql-connector-java.version}</version>
 		</dependency>
-
 		<!-- xxl-job-core -->
 		<dependency>
 			<groupId>com.xuxueli</groupId>
 			<artifactId>xxl-job-core</artifactId>
-			<version>2.2.0</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 
 	</dependencies>
@@ -123,7 +122,7 @@
 						<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
 					</buildArgs>
 					<imageTags>
-						<imageTag>1.0</imageTag>
+						<imageTag>v1.1.20200421</imageTag>
 					</imageTags>
 
 					<!--将构建jar拷贝到/target/docker 目录下与dockerfile一起-->
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
index dbbc8d6..c94d75d 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java
@@ -168,7 +168,6 @@ public class JobInfoController {
 	}
 	@RequestMapping("/jobBeat")
 	@ResponseBody
-//	@PermissionLimit(limit = false)
 	public ReturnT<String> jobBeat(Integer jobId) {
 		if(jobId==null) {
 			return new ReturnT<String>(ReturnT.FAIL_CODE, "jobId is null");
@@ -177,13 +176,15 @@ public class JobInfoController {
 			
 			XxlJobInfo jobInfo = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(jobId);
 			XxlJobGroup group = XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().load(jobInfo.getJobGroup());
-			String address = group.getRegistryList().get(0);
-			if (address != null) {
+			//配置多个执行器地址时，只要有job工作或故障则返回500
+			for (String address : group.getRegistryList()) {
 				ExecutorBiz executorBiz = XxlJobScheduler.getExecutorBiz(address);
-				return executorBiz.idleBeat(new IdleBeatParam(jobId));
-			} else {
-				return new ReturnT<String>(ReturnT.FAIL_CODE, "executor address is empty");
-	        }
+				ReturnT<String> results = executorBiz.idleBeat(new IdleBeatParam(jobId));
+				if(results.getCode()!=ReturnT.SUCCESS_CODE) {
+					return results;
+				}
+			}
+			return new ReturnT<String>(ReturnT.SUCCESS_CODE, "job idle");
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new ReturnT<String>(ReturnT.FAIL_CODE, e.getMessage());
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
index 8bdf709..62ec2fb 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java
@@ -38,7 +38,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
         }
 
         if (isRunningOrHasQueue) {
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "job thread is running or has trigger queue.");
+            return new ReturnT<String>(ReturnT.LOCKED_CODE, "job thread is running or has trigger queue.");
         }
         return ReturnT.SUCCESS;
     }
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
index 83d7a36..6ae6a0d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
@@ -11,10 +11,12 @@ public class ReturnT<T> implements Serializable {
 	public static final long serialVersionUID = 42L;
 
 	public static final int SUCCESS_CODE = 200;
+	public static final int LOCKED_CODE = 423;//当前资源被锁定
 	public static final int FAIL_CODE = 500;
 
 	public static final ReturnT<String> SUCCESS = new ReturnT<String>(null);
 	public static final ReturnT<String> FAIL = new ReturnT<String>(FAIL_CODE, null);
+	public static final ReturnT<String> LOCKED = new ReturnT<String>(LOCKED_CODE, null);
 
 	private int code;
 	private String msg;
diff --git a/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/core/config/DeletionConfig.java b/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/core/config/DeletionConfig.java
index 47d542c..0f28f88 100644
--- a/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/core/config/DeletionConfig.java
+++ b/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/core/config/DeletionConfig.java
@@ -54,7 +54,7 @@ public class DeletionConfig {
 	public String getSelectAnalyticServer() {

 		return selectAnalyticServer;

 	}

-	@Value("${select.analytic.server}")

+	@Value("${storge.analytic.server}")

 	public void setSelectAnalyticServer(String selectAnalyticServer) {

 		DeletionConfig.selectAnalyticServer = selectAnalyticServer;

 	}

diff --git a/xxl-job-executor-galaxy/src/main/resources/application-executor.yml b/xxl-job-executor-galaxy/src/main/resources/application-executor.yml
index f261e2b..e5b14ae 100644
--- a/xxl-job-executor-galaxy/src/main/resources/application-executor.yml
+++ b/xxl-job-executor-galaxy/src/main/resources/application-executor.yml
@@ -27,10 +27,5 @@ delete:
     server: 192.168.40.224:8123
     password: ceiec2019
     datasource: tsg_galaxy_v3
-    username: default
-##存储配额druid查询地址
-select: 
-  analytic: 
-    server: 192.168.40.224:8082
-    
+    username: default    
     
diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml
index 2d28467..fdc5a7f 100644
--- a/xxl-job-executor-samples/pom.xml
+++ b/xxl-job-executor-samples/pom.xml
@@ -12,7 +12,6 @@
 
     <modules>
         <module>xxl-job-executor-sample-frameless</module>
-        <module>xxl-job-executor-sample-springboot</module>
         <module>xxl-job-executor-sample-spring</module>
         <module>xxl-job-executor-sample-jfinal</module>
         <module>xxl-job-executor-sample-nutz</module>