From 50db4316fe526f100c3c1c811082a6dc43fd1e23 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 1 Sep 2024 14:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8sql=E5=92=8C=E5=AE=9E=E4=BD=93=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/domain/rep/AccreditRep.java |  2 +
 .../main/resources/mapper/AccreditMapper.xml  |  4 +
 logs/cloud-etl/info.log                       | 82 +++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/rep/AccreditRep.java b/cloud-etl-common/src/main/java/com/muyu/domain/rep/AccreditRep.java
index fc7aeb6..8b98353 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/rep/AccreditRep.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/rep/AccreditRep.java
@@ -23,4 +23,6 @@ public class AccreditRep {
     private Date createTime;
     private String updateBy;
     private Date updateTime;
+    private String email;
+    private String leader;
 }
diff --git a/cloud-etl-server/src/main/resources/mapper/AccreditMapper.xml b/cloud-etl-server/src/main/resources/mapper/AccreditMapper.xml
index 804e67e..dccdea3 100644
--- a/cloud-etl-server/src/main/resources/mapper/AccreditMapper.xml
+++ b/cloud-etl-server/src/main/resources/mapper/AccreditMapper.xml
@@ -16,6 +16,8 @@
     <resultMap id="AccreditRep" type="com.muyu.domain.rep.AccreditRep">
 
       <result property="status" column="status"/>
+        <result property="leader" column="leader"/>
+        <result property="email" column="email"/>
         <result property="basicId" column="basic_id"/>
         <result property="createBy" column="create_by"/>
         <result property="deptId" column="dept_id"/>
@@ -44,6 +46,8 @@
 
     <select id="findDeptListStatus" resultType="com.muyu.domain.rep.AccreditRep" resultMap="AccreditRep">
         SELECT
+            sys_dept.leader,
+            sys_dept.email,
             sys_dept.dept_name,
             sys_dept.dept_id,
             middle.basic_id,
diff --git a/logs/cloud-etl/info.log b/logs/cloud-etl/info.log
index 7c8dbb4..5eff79b 100644
--- a/logs/cloud-etl/info.log
+++ b/logs/cloud-etl/info.log
@@ -407,3 +407,85 @@
 11:24:17.104 [SpringApplicationShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
 11:24:17.104 [SpringApplicationShutdownHook] INFO  c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
 11:24:17.104 [SpringApplicationShutdownHook] INFO  c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye
+14:10:29.205 [main] INFO  c.m.c.e.MuYuEtlApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev"
+14:10:31.919 [main] INFO  o.a.c.c.StandardService - [log,173] - Starting service [Tomcat]
+14:10:31.919 [main] INFO  o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24]
+14:10:32.016 [main] INFO  o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext
+14:10:40.422 [main] INFO  c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited
+14:10:40.423 [main] INFO  c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success
+14:10:40.423 [main] INFO  c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master]
+14:10:40.517 [main] INFO  c.m.c.d.MyMetaObjectHandler - [<init>,17] - 元对象字段填充控制器 ------- 加载完成
+14:10:41.505 [main] INFO  c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
+14:10:43.657 [main] INFO  c.m.c.x.XXLJobConfig - [xxlJobExecutor,25] - >>>>>>>>>>> xxl-job config init success.
+14:10:45.081 [main] INFO  c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-one-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@43f06942[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoOneParam]
+14:10:45.082 [main] INFO  c.x.j.c.e.XxlJobExecutor - [registJobHandler,183] - >>>>>>>>>>> xxl-job register jobhandler success, name:xxl-job-demo-no-param, jobHandler:com.xxl.job.core.handler.impl.MethodJobHandler@6aa060f6[class com.muyu.common.xxl.demo.XxlJobDemoService#xxlJobDemoNoParam]
+14:10:45.338 [main] INFO  c.a.n.client.naming - [initNamespaceForNaming,62] - initializer namespace from ans.namespace attribute : null
+14:10:45.339 [main] INFO  c.a.n.client.naming - [lambda$initNamespaceForNaming$0,66] - initializer namespace from ALIBABA_ALIWARE_NAMESPACE attribute :null
+14:10:45.340 [main] INFO  c.a.n.client.naming - [lambda$initNamespaceForNaming$1,73] - initializer namespace from namespace attribute :null
+14:10:45.345 [main] INFO  c.a.n.client.naming - [<init>,74] - FailoverDataSource type is class com.alibaba.nacos.client.naming.backups.datasource.DiskFailoverDataSource
+14:10:45.350 [main] INFO  c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
+14:10:45.351 [main] INFO  c.a.n.p.a.s.c.ClientAuthPluginManager - [init,56] - [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
+14:10:45.383 [Thread-12] INFO  c.x.j.c.s.EmbedServer - [run,82] - >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9999
+14:10:45.481 [main] INFO  c.a.n.c.r.client - [lambda$createClient$0,118] - [RpcClientFactory] create a new rpc client of f46d455b-e30c-467f-b873-e940b6eb4df6
+14:10:45.483 [main] INFO  c.a.n.client.naming - [<init>,109] - Create naming rpc client for uuid->f46d455b-e30c-467f-b873-e940b6eb4df6
+14:10:45.483 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] RpcClient init, ServerListFactory = com.alibaba.nacos.client.naming.core.ServerListManager
+14:10:45.483 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Registry connection listener to current client:com.alibaba.nacos.client.naming.remote.gprc.redo.NamingGrpcRedoService
+14:10:45.484 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Register server push request handler:com.alibaba.nacos.client.naming.remote.gprc.NamingPushRequestHandler
+14:10:45.484 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Try to connect to server on start up, server: {serverIp = '47.116.184.54', server main port = 8848}
+14:10:45.485 [main] INFO  c.a.n.c.r.c.g.GrpcClient - [createNewManagedChannel,210] - grpc client connection server:47.116.184.54 ip,serverPort:9848,grpcTslConfig:{"sslProvider":"","enableTls":false,"mutualAuthEnable":false,"trustAll":false}
+14:10:46.716 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Success to connect to server [47.116.184.54:8848] on start up, connectionId = 1725171045806_139.224.212.27_62524
+14:10:46.717 [com.alibaba.nacos.client.remote.worker.0] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Notify connected event to listeners.
+14:10:46.717 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$ConnectResetRequestHandler
+14:10:46.717 [main] INFO  c.a.n.c.r.client - [printIfInfoEnabled,63] - [f46d455b-e30c-467f-b873-e940b6eb4df6] Register server push request handler:com.alibaba.nacos.common.remote.client.RpcClient$$Lambda$632/0x00000246015244a8
+14:10:46.717 [com.alibaba.nacos.client.remote.worker.0] INFO  c.a.n.client.naming - [onConnected,90] - Grpc connection connect
+14:10:46.718 [main] INFO  c.a.n.client.naming - [registerService,133] - [REGISTER-SERVICE] cloud-2112 registering service cloud-source with instance Instance{instanceId='null', ip='192.168.43.160', port=10005, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={IPv6=[2409:891f:9263:e1f0:9a45:4527:3fad:bb23], preserved.register.source=SPRING_CLOUD}}
+14:10:46.770 [main] INFO  c.a.c.n.r.NacosServiceRegistry - [register,76] - nacos registry, DEFAULT_GROUP cloud-source 192.168.43.160:10005 register finished
+14:10:46.936 [main] INFO  c.m.c.e.MuYuEtlApplication - [logStarted,56] - Started MuYuEtlApplication in 21.066 seconds (process running for 21.843)
+14:10:46.947 [main] INFO  c.a.n.c.c.i.CacheData - [initNotifyWarnTimeout,72] - config listener notify warn timeout millis use default 60000 millis 
+14:10:46.948 [main] INFO  c.a.n.c.c.i.CacheData - [<clinit>,99] - nacos.cache.data.init.snapshot = true 
+14:10:46.949 [main] INFO  c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source-dev.yml+DEFAULT_GROUP+cloud-2112
+14:10:46.963 [main] INFO  c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source-dev.yml, group=DEFAULT_GROUP, cnt=1
+14:10:46.963 [main] INFO  c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source-dev.yml, group=DEFAULT_GROUP
+14:10:46.964 [main] INFO  c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source.yml+DEFAULT_GROUP+cloud-2112
+14:10:46.964 [main] INFO  c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source.yml, group=DEFAULT_GROUP, cnt=1
+14:10:46.964 [main] INFO  c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source.yml, group=DEFAULT_GROUP
+14:10:46.965 [main] INFO  c.a.n.c.c.i.ClientWorker - [addCacheDataIfAbsent,416] - [fixed-cloud-2112-47.116.184.54_8848] [subscribe] cloud-source+DEFAULT_GROUP+cloud-2112
+14:10:46.965 [main] INFO  c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-cloud-2112-47.116.184.54_8848] [add-listener] ok, tenant=cloud-2112, dataId=cloud-source, group=DEFAULT_GROUP, cnt=1
+14:10:46.965 [main] INFO  c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-source, group=DEFAULT_GROUP
+14:10:47.410 [RMI TCP Connection(5)-10.100.28.5] INFO  o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'
+14:11:57.285 [Thread-12] INFO  c.x.j.c.s.EmbedServer - [run,91] - >>>>>>>>>>> xxl-job remoting server stop.
+14:11:57.332 [xxl-job, executor ExecutorRegistryThread] INFO  c.x.j.c.t.ExecutorRegistryThread - [run,87] - >>>>>>>>>>> xxl-job registry-remove success, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='cloud-source', registryValue='http://10.100.28.5:9999/'}, registryResult:ReturnT [code=200, msg=null, content=null]
+14:11:57.332 [xxl-job, executor ExecutorRegistryThread] INFO  c.x.j.c.t.ExecutorRegistryThread - [run,105] - >>>>>>>>>>> xxl-job, executor registry thread destroy.
+14:11:57.332 [SpringApplicationShutdownHook] INFO  c.x.j.c.s.EmbedServer - [stop,117] - >>>>>>>>>>> xxl-job remoting server destroy success.
+14:11:57.333 [xxl-job, executor JobLogFileCleanThread] INFO  c.x.j.c.t.JobLogFileCleanThread - [run,99] - >>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destroy.
+14:11:57.333 [xxl-job, executor TriggerCallbackThread] INFO  c.x.j.c.t.TriggerCallbackThread - [run,98] - >>>>>>>>>>> xxl-job, executor callback thread destroy.
+14:11:57.333 [Thread-11] INFO  c.x.j.c.t.TriggerCallbackThread - [run,128] - >>>>>>>>>>> xxl-job, executor retry callback thread destroy.
+14:11:57.341 [SpringApplicationShutdownHook] INFO  c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now...
+14:11:57.342 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [deregisterService,272] - [DEREGISTER-SERVICE] cloud-2112 deregistering service cloud-source with instance: Instance{instanceId='null', ip='192.168.43.160', port=10005, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={}}
+14:11:57.411 [SpringApplicationShutdownHook] INFO  c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished.
+14:11:57.412 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,254] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown begin
+14:11:57.412 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,180] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown begin
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,182] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown stop
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,256] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown stop
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,204] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown begin
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,147] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown begin
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,149] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown stop
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,218] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown begin
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,223] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown stop
+14:11:57.414 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,468] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown begin
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,470] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown stop
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,487] - Shutdown naming grpc client proxy for  uuid->f46d455b-e30c-467f-b873-e940b6eb4df6
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,331] - Shutdown grpc redo service executor java.util.concurrent.ScheduledThreadPoolExecutor@6a7aa600[Running, pool size = 1, active threads = 0, queued tasks = 1, completed tasks = 23]
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.c.r.client - [shutdown,425] - Shutdown rpc client, set status to shutdown
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.c.r.client - [shutdown,427] - Shutdown client event executor java.util.concurrent.ScheduledThreadPoolExecutor@5b5594c[Running, pool size = 2, active threads = 2, queued tasks = 0, completed tasks = 0]
+14:11:57.415 [SpringApplicationShutdownHook] INFO  c.a.n.c.r.client - [closeConnection,584] - Close current connection 1725171045806_139.224.212.27_62524
+14:11:57.420 [SpringApplicationShutdownHook] INFO  c.a.n.c.r.c.g.GrpcClient - [shutdown,187] - Shutdown grpc executor java.util.concurrent.ThreadPoolExecutor@28cbd65c[Running, pool size = 3, active threads = 0, queued tasks = 0, completed tasks = 23]
+14:11:57.420 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutDownAndRemove,497] - shutdown and remove naming rpc client  for uuid ->f46d455b-e30c-467f-b873-e940b6eb4df6
+14:11:57.420 [SpringApplicationShutdownHook] INFO  c.a.n.c.a.r.i.CredentialWatcher - [stop,107] - [null] CredentialWatcher is stopped
+14:11:57.420 [SpringApplicationShutdownHook] INFO  c.a.n.c.a.r.i.CredentialService - [free,91] - [null] CredentialService is freed
+14:11:57.420 [SpringApplicationShutdownHook] INFO  c.a.n.client.naming - [shutdown,211] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown stop
+14:11:57.423 [SpringApplicationShutdownHook] INFO  c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
+14:11:57.426 [SpringApplicationShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
+14:11:57.432 [SpringApplicationShutdownHook] INFO  c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
+14:11:57.432 [SpringApplicationShutdownHook] INFO  c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
+14:11:57.432 [SpringApplicationShutdownHook] INFO  c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye