From 79b74fd838d1c79d1d737eaba8f81554f37bb4bb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 五月 2023 19:22:58 +0800
Subject: [PATCH] 代码整合

---
 Source/data/applogs/xxl-job/xxl-job-admin.log |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Source/data/applogs/xxl-job/xxl-job-admin.log b/Source/data/applogs/xxl-job/xxl-job-admin.log
index 1b64727..373d25e 100644
--- a/Source/data/applogs/xxl-job/xxl-job-admin.log
+++ b/Source/data/applogs/xxl-job/xxl-job-admin.log
@@ -31245,6 +31245,7 @@
 2023-05-25 15:12:07,371 WARN [SpringApplicationShutdownHook] o.s.c.a.CommonAnnotationBeanPostProcessor [InitDestroyAnnotationBeanPostProcessor.java : 185] Destroy method on bean with name 'nacosAutoServiceRegistration' threw an exception: java.lang.IllegalStateException: UT015023: This Context has been already destroyed
 2023-05-25 15:12:08,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 203] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread stop
 2023-05-25 15:12:09,000 INFO [xxl-job, admin JobScheduleHelper#ringThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 264] >>>>>>>>>>> xxl-job, JobScheduleHelper#ringThread stop
+<<<<<<< Updated upstream
 2023-05-26 18:43:51,818 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final
 2023-05-26 18:43:53,457 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
 2023-05-26 18:43:53,459 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
@@ -54253,3 +54254,5 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-26 19:01:25,107 INFO [SpringApplicationShutdownHook] c.a.c.n.r.NacosServiceRegistry [NacosServiceRegistry.java : 94] De-registering from Nacos Server now...
 2023-05-26 19:01:25,116 WARN [SpringApplicationShutdownHook] o.s.c.a.CommonAnnotationBeanPostProcessor [InitDestroyAnnotationBeanPostProcessor.java : 185] Destroy method on bean with name 'nacosAutoServiceRegistration' threw an exception: java.lang.IllegalStateException: UT015023: This Context has been already destroyed
+=======
+>>>>>>> Stashed changes

--
Gitblit v1.9.3