集成注册中心eureka 存储配额统计时间减少8个小时防止算到第二天v1.2.20200831.eureka

4 files changed, 45 insertions, 2 deletions

diff --git a/xxl-job-admin/pom.xml b/xxl-job-admin/pom.xml
index 43a2e33..13a0def 100644
--- a/xxl-job-admin/pom.xml
+++ b/xxl-job-admin/pom.xml
@@ -13,6 +13,13 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring.cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-parent</artifactId>
 				<version>${spring-boot.version}</version>
@@ -22,6 +29,7 @@
 		</dependencies>
 	</dependencyManagement>
 	<properties>
+		<spring.cloud.version>Hoxton.SR1</spring.cloud.version>
 		<docker.build>192.168.40.153</docker.build>
 		<docker.build.port>2375</docker.build.port>
 		<!--docker-registry地址-->
@@ -82,7 +90,11 @@
 			<artifactId>xxl-job-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-
+		
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java
index fce10a8..dd31c96 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java
@@ -2,11 +2,13 @@ package com.xxl.job.admin;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 /**
  * @author xuxueli 2018-10-28 00:38:13
  */
 @SpringBootApplication
+@EnableEurekaClient
 public class XxlJobAdminApplication {
 
 	public static void main(String[] args) {
diff --git a/xxl-job-admin/src/main/resources/application.properties b/xxl-job-admin/src/main/resources/application.properties
index c486e8e..1f54c46 100644
--- a/xxl-job-admin/src/main/resources/application.properties
+++ b/xxl-job-admin/src/main/resources/application.properties
@@ -61,3 +61,32 @@ xxl.job.triggerpool.slow.max=100
 
 ### xxl-job, log retention days
 xxl.job.logretentiondays=30
+
+
+### spring cloud 配置
+spring.application.name=galaxy-job-admin
+
+#是否向服务注册中心注册自己
+eureka.client.register-with-eureka=true
+#是否检索服务
+eureka.client.fetchRegistry=true
+
+#表示eureka-client间隔多久去拉取服务注册信息
+eureka.client.registry-fetch-interval-seconds=5
+#表示eureka-client发送心跳给server端的频率
+eureka.instance.lease-renewal-interval-in-seconds=10
+#健康检查页面的URL
+eureka.instance.health-check-url-path=/actuator/health
+#与Eureka注册服务中心的通信zone和url地址
+eureka.client.serviceUrl.defaultZone=http://admin:admin@localhost:8501/eureka/
+#该实例相较于hostname是否优先使用IP
+eureka.instance.prefer-ip-address=true
+#该实例注册到服务中心的唯一ID
+eureka.instance.instance-id=${spring.cloud.client.ip-address}:${server.port}
+#暴露所有端点
+management.endpoints.web.exposure.include=*
+management.endpoints.web.exposure.exclude=env,auditevents,beans,conditions
+#详细的应用健康信息
+management.endpoint.health.show-details=always
+
+
diff --git a/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/service/StorageQuotaService.java b/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/service/StorageQuotaService.java
index 406325d..be5b2c9 100644
--- a/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/service/StorageQuotaService.java
+++ b/xxl-job-executor-galaxy/src/main/java/com/xxl/job/executor/service/StorageQuotaService.java
@@ -621,7 +621,7 @@ public class StorageQuotaService {
 

 		Map traffic = new HashMap<>();

 		traffic.put("log_type", Constant.TRAFFIC_LOGS);

-		traffic.put("time", System.currentTimeMillis()/1000);

+		traffic.put("time", System.currentTimeMillis()/1000-8*3600);//防止24点执行时，时间算到明天往前退8个小时

 		traffic.put("last_storage",getLastStorage(Constant.ZK_TRAFFIC_LOGS));

 		traffic.putAll(clickHouseCurr.getData());

 		traffic.putAll(clickHouseMax.getData());