Commit 789c6d73 authored by 王亮's avatar 王亮

fix some bugs.

parent c698bb9d
......@@ -16,7 +16,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- <maven.test.skip>true</maven.test.skip>-->
<maven.javadoc.skip>true</maven.javadoc.skip>
<revision>2.6.3.12</revision>
<revision>2.6.3.13</revision>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
......
......@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<properties>
<revision>2.6.3.12</revision>
<revision>2.6.3.13</revision>
<spring-boot.version>2.6.3</spring-boot.version>
<spring-cloud.version>2021.0.1</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
......
......@@ -23,17 +23,14 @@ import org.springframework.core.env.Environment;
import org.springframework.web.filter.CommonsRequestLoggingFilter;
@Configuration
@DependsOn({"nacosServiceDiscovery","shutdownEndpoint"})
@DependsOn({"nacosServiceDiscovery"})
@EnableDiscoveryClient
public class DisCoveryAutoConfiguration {
final NacosAutoServiceRegistration nacosAutoServiceRegistration;
final ShutdownEndpoint shutdownEndpoint;
public DisCoveryAutoConfiguration(NacosAutoServiceRegistration nacosAutoServiceRegistration,
ShutdownEndpoint shutdownEndpoint) {
public DisCoveryAutoConfiguration(NacosAutoServiceRegistration nacosAutoServiceRegistration) {
this.nacosAutoServiceRegistration = nacosAutoServiceRegistration;
this.shutdownEndpoint = shutdownEndpoint;
}
@Bean
......@@ -42,7 +39,7 @@ public class DisCoveryAutoConfiguration {
@DependsOn(value = {"xxlJobSpringExecutor"})
public ServiceDeployEndpoint serviceDeployEndpoint(
NacosAutoServiceRegistration nacosAutoServiceRegistration) {
return new ServiceDeployEndpoint(nacosAutoServiceRegistration, shutdownEndpoint);
return new ServiceDeployEndpoint(nacosAutoServiceRegistration);
}
@LoadBalancerClients({
......
......@@ -2,9 +2,6 @@ package cn.quantgroup.boot;
import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
import java.util.Timer;
import java.util.TimerTask;
import org.springframework.boot.actuate.context.ShutdownEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint;
......@@ -13,24 +10,14 @@ import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint;
public class ServiceDeployEndpoint {
final NacosAutoServiceRegistration nacosAutoServiceRegistration;
final ShutdownEndpoint shutdownEndpoint;
public ServiceDeployEndpoint(NacosAutoServiceRegistration nacosAutoServiceRegistration,
ShutdownEndpoint shutdownEndpoint) {
public ServiceDeployEndpoint(NacosAutoServiceRegistration nacosAutoServiceRegistration) {
this.nacosAutoServiceRegistration = nacosAutoServiceRegistration;
this.shutdownEndpoint = shutdownEndpoint;
}
@ReadOperation
public String offLine() {
nacosAutoServiceRegistration.stop();
new Timer().schedule(new TimerTask(
) {
@Override
public void run() {
shutdownEndpoint.shutdown();
}
}, 4000L);
return "ok";
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment