Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
commons
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DevOps
commons
Commits
8f3d0b68
Commit
8f3d0b68
authored
May 25, 2022
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add grace shutdown after 4s delay.
parent
4f138e89
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
8 deletions
+27
-8
pom.xml
pom.xml
+1
-1
pom.xml
qg-application-dependencies/pom.xml
+1
-1
DisCoveryAutoConfiguration.java
...n/java/cn/quantgroup/boot/DisCoveryAutoConfiguration.java
+9
-4
ServiceDeployEndpoint.java
...c/main/java/cn/quantgroup/boot/ServiceDeployEndpoint.java
+16
-2
No files found.
pom.xml
View file @
8f3d0b68
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<!-- <maven.test.skip>true</maven.test.skip>-->
<!-- <maven.test.skip>true</maven.test.skip>-->
<maven.javadoc.skip>
true
</maven.javadoc.skip>
<maven.javadoc.skip>
true
</maven.javadoc.skip>
<revision>
2.6.3.1
0
</revision>
<revision>
2.6.3.1
1
</revision>
<maven-compiler-plugin.version>
3.8.1
</maven-compiler-plugin.version>
<maven-compiler-plugin.version>
3.8.1
</maven-compiler-plugin.version>
<maven-source-plugin.version>
3.2.1
</maven-source-plugin.version>
<maven-source-plugin.version>
3.2.1
</maven-source-plugin.version>
<maven-javadoc-plugin.version>
3.3.1
</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>
3.3.1
</maven-javadoc-plugin.version>
...
...
qg-application-dependencies/pom.xml
View file @
8f3d0b68
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<properties>
<properties>
<revision>
2.6.3.1
0
</revision>
<revision>
2.6.3.1
1
</revision>
<spring-boot.version>
2.6.3
</spring-boot.version>
<spring-boot.version>
2.6.3
</spring-boot.version>
<spring-cloud.version>
2021.0.1
</spring-cloud.version>
<spring-cloud.version>
2021.0.1
</spring-cloud.version>
<spring-cloud-alibaba.version>
2021.0.1.0
</spring-cloud-alibaba.version>
<spring-cloud-alibaba.version>
2021.0.1.0
</spring-cloud-alibaba.version>
...
...
qg-discovery-starter/src/main/java/cn/quantgroup/boot/DisCoveryAutoConfiguration.java
View file @
8f3d0b68
...
@@ -6,6 +6,7 @@ import feign.Feign;
...
@@ -6,6 +6,7 @@ import feign.Feign;
import
feign.RequestInterceptor
;
import
feign.RequestInterceptor
;
import
org.slf4j.MDC
;
import
org.slf4j.MDC
;
import
org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint
;
import
org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint
;
import
org.springframework.boot.actuate.context.ShutdownEndpoint
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.client.ServiceInstance
;
import
org.springframework.cloud.client.ServiceInstance
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
...
@@ -28,23 +29,26 @@ public class DisCoveryAutoConfiguration {
...
@@ -28,23 +29,26 @@ public class DisCoveryAutoConfiguration {
final
NacosAutoServiceRegistration
nacosAutoServiceRegistration
;
final
NacosAutoServiceRegistration
nacosAutoServiceRegistration
;
public
DisCoveryAutoConfiguration
(
NacosAutoServiceRegistration
nacosAutoServiceRegistration
)
{
final
ShutdownEndpoint
shutdownEndpoint
;
public
DisCoveryAutoConfiguration
(
NacosAutoServiceRegistration
nacosAutoServiceRegistration
,
ShutdownEndpoint
shutdownEndpoint
)
{
this
.
nacosAutoServiceRegistration
=
nacosAutoServiceRegistration
;
this
.
nacosAutoServiceRegistration
=
nacosAutoServiceRegistration
;
this
.
shutdownEndpoint
=
shutdownEndpoint
;
}
}
@Bean
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean
@ConditionalOnAvailableEndpoint
@ConditionalOnAvailableEndpoint
@DependsOn
(
value
=
{
"xxlJobSpringExecutor"
})
public
ServiceDeployEndpoint
serviceDeployEndpoint
(
public
ServiceDeployEndpoint
serviceDeployEndpoint
(
NacosAutoServiceRegistration
nacosAutoServiceRegistration
)
{
NacosAutoServiceRegistration
nacosAutoServiceRegistration
)
{
return
new
ServiceDeployEndpoint
(
nacosAutoServiceRegistration
);
return
new
ServiceDeployEndpoint
(
nacosAutoServiceRegistration
,
shutdownEndpoint
);
}
}
@LoadBalancerClients
({
@LoadBalancerClients
({
@LoadBalancerClient
(
value
=
"price-tracker"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
),
@LoadBalancerClient
(
value
=
"price-tracker"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
),
@LoadBalancerClient
(
value
=
"sc-task"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
),
@LoadBalancerClient
(
value
=
"sc-task"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
),
@LoadBalancerClient
(
value
=
"sc-auth"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
)}
@LoadBalancerClient
(
value
=
"sc-auth"
,
configuration
=
CustomLoadBalancerConfiguration
.
class
)})
)
public
class
FeignConfig
{
public
class
FeignConfig
{
@LoadBalanced
@LoadBalanced
...
@@ -63,6 +67,7 @@ public class DisCoveryAutoConfiguration {
...
@@ -63,6 +67,7 @@ public class DisCoveryAutoConfiguration {
public
RequestLoggingFilter
requestLoggingFilter
()
{
public
RequestLoggingFilter
requestLoggingFilter
()
{
return
new
RequestLoggingFilter
();
return
new
RequestLoggingFilter
();
}
}
@Bean
@Bean
public
CommonsRequestLoggingFilter
logFilter
(
RequestLoggingFilter
requestLoggingFilter
)
{
public
CommonsRequestLoggingFilter
logFilter
(
RequestLoggingFilter
requestLoggingFilter
)
{
requestLoggingFilter
.
setIncludeQueryString
(
true
);
requestLoggingFilter
.
setIncludeQueryString
(
true
);
...
...
qg-discovery-starter/src/main/java/cn/quantgroup/boot/ServiceDeployEndpoint.java
View file @
8f3d0b68
...
@@ -2,26 +2,40 @@ package cn.quantgroup.boot;
...
@@ -2,26 +2,40 @@ package cn.quantgroup.boot;
import
com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration
;
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.ReadOperation
;
import
org.springframework.boot.actuate.endpoint.annotation.WriteOperation
;
import
org.springframework.boot.actuate.endpoint.annotation.WriteOperation
;
import
org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint
;
import
org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint
;
@WebEndpoint
(
id
=
"serviceDeploy"
)
@WebEndpoint
(
id
=
"serviceDeploy"
)
public
class
ServiceDeployEndpoint
{
public
class
ServiceDeployEndpoint
{
final
NacosAutoServiceRegistration
nacosAutoServiceRegistration
;
final
NacosAutoServiceRegistration
nacosAutoServiceRegistration
;
final
ShutdownEndpoint
shutdownEndpoint
;
public
ServiceDeployEndpoint
(
NacosAutoServiceRegistration
nacosAutoServiceRegistration
)
{
public
ServiceDeployEndpoint
(
NacosAutoServiceRegistration
nacosAutoServiceRegistration
,
ShutdownEndpoint
shutdownEndpoint
)
{
this
.
nacosAutoServiceRegistration
=
nacosAutoServiceRegistration
;
this
.
nacosAutoServiceRegistration
=
nacosAutoServiceRegistration
;
this
.
shutdownEndpoint
=
shutdownEndpoint
;
}
}
@ReadOperation
@ReadOperation
public
String
offLine
()
{
public
String
offLine
()
{
nacosAutoServiceRegistration
.
stop
();
nacosAutoServiceRegistration
.
stop
();
new
Timer
().
schedule
(
new
TimerTask
(
)
{
@Override
public
void
run
()
{
shutdownEndpoint
.
shutdown
();
}
},
4000L
);
return
"ok"
;
return
"ok"
;
}
}
@WriteOperation
@WriteOperation
public
String
onLine
(){
public
String
onLine
()
{
nacosAutoServiceRegistration
.
start
();
nacosAutoServiceRegistration
.
start
();
return
"ok"
;
return
"ok"
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment