Browse Source

老师列表声部

liujc 1 year ago
parent
commit
b0edce2b89

+ 1 - 0
.gitignore

@@ -59,3 +59,4 @@ target
 **/logback-spring.xml
 **/AuditLogInterceptor.java
 /toolset/audit-log/src/main/java/com/yonge/toolset/log/interceptor/AuditLogInterceptor.java
+/log/

File diff suppressed because it is too large
+ 0 - 47
admin-2023-06-06_14-0.log


+ 0 - 2
admin-2023-06-06_15-0.log

@@ -1,2 +0,0 @@
-[  2023-06-06 15:36:04.995 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 15:36:04.999 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]

+ 0 - 29
admin-2023-06-06_16-0.log

@@ -1,29 +0,0 @@
-[  2023-06-06 16:07:00.259 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:07:00.261 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:07:50.402 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:07:50.402 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:10:10.765 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:10:10.767 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:10:50.877 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:10:50.878 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:20:22.386 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:20:22.388 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:20:52.464 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:20:52.465 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:25:03.109 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:25:03.109 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:27:43.592 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:27:43.593 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:29:03.800 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:29:03.801 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:29:43.901 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:29:43.902 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:32:24.269 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:32:24.270 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:33:14.385 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : new ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:33:14.386 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:34:14.509 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : modified ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":false,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:34:14.510 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(2) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":false,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000},{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:34:34.548 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : removed ips(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.14#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.14","port":8005,"weight":1.0,"healthy":false,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:34:34.549 [com.alibaba.nacos.client.naming.updater] INFO  com.alibaba.nacos.client.naming] : current ips:(1) service: DEFAULT_GROUP@@admin-server@@DEFAULT -> [{"instanceId":"192.168.3.253#8005#DEFAULT#DEFAULT_GROUP@@admin-server","ip":"192.168.3.253","port":8005,"weight":1.0,"healthy":true,"enabled":true,"ephemeral":true,"clusterName":"DEFAULT","serviceName":"DEFAULT_GROUP@@admin-server","metadata":{"preserved.register.source":"SPRING_CLOUD"},"instanceHeartBeatInterval":5000,"instanceHeartBeatTimeOut":15000,"ipDeleteTimeout":30000}]
-[  2023-06-06 16:45:55.447 [Thread-36] INFO  c.t.esign.sdk.tech.v3.client.a] : refresh sdk client context. projectid:4438776254, url:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2, interval:2h

+ 0 - 12
admin-2023-06-06_17-0.log

@@ -1,12 +0,0 @@
-[  2023-06-06 17:02:35.827 [Thread-3] WARN  c.a.n.c.http.HttpClientBeanHolder] : [HttpClientBeanHolder] Start destroying common HttpClient
-[  2023-06-06 17:02:35.827 [Thread-21] WARN  c.a.nacos.common.notify.NotifyCenter] : [NotifyCenter] Start destroying Publisher
-[  2023-06-06 17:02:35.828 [Thread-21] WARN  c.a.nacos.common.notify.NotifyCenter] : [NotifyCenter] Destruction of the end
-[  2023-06-06 17:02:35.829 [Thread-3] WARN  c.a.n.c.http.HttpClientBeanHolder] : [HttpClientBeanHolder] Destruction of the end
-[  2023-06-06 17:02:35.834 [Thread-57] INFO  o.s.s.c.ThreadPoolTaskScheduler] : Shutting down ExecutorService 'taskScheduler'
-[  2023-06-06 17:02:35.836 [Thread-57] INFO  c.a.c.n.r.NacosServiceRegistry] : De-registering from Nacos Server now...
-[  2023-06-06 17:02:35.837 [Thread-57] INFO  com.alibaba.nacos.client.naming] : [BEAT] removing beat: DEFAULT_GROUP@@admin-server:192.168.3.253:8005 from beat map.
-[  2023-06-06 17:02:35.837 [Thread-57] INFO  com.alibaba.nacos.client.naming] : [DEREGISTER-SERVICE] 34b05f66-a0d7-45a5-bd57-f400486d7040 deregistering service DEFAULT_GROUP@@admin-server with instance: Instance{instanceId='null', ip='192.168.3.253', port=8005, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={}}
-[  2023-06-06 17:02:35.867 [Thread-57] INFO  c.a.c.n.r.NacosServiceRegistry] : De-registration finished.
-[  2023-06-06 17:02:35.869 [Thread-57] INFO  com.alibaba.nacos.client.naming] : com.alibaba.nacos.client.naming.beat.BeatReactor do shutdown begin
-[  2023-06-06 17:02:37.375 [Thread-57] INFO  com.alibaba.nacos.client.naming] : com.alibaba.nacos.client.naming.beat.BeatReactor do shutdown stop
-[  2023-06-06 17:02:37.375 [Thread-57] INFO  com.alibaba.nacos.client.naming] : com.alibaba.nacos.client.naming.core.HostReactor do shutdown begin

+ 61 - 41
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -2,12 +2,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import static com.yonge.cooleshow.biz.dal.constant.LiveRoomConstant.TEACHER_TEMP_LIVE_ROOM;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -85,9 +80,9 @@ import com.yonge.toolset.utils.string.ValueUtil;
 
 @Service
 public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> implements TeacherService {
-	
-	private final static Logger log = LoggerFactory.getLogger(TeacherServiceImpl.class);
-	
+
+    private final static Logger log = LoggerFactory.getLogger(TeacherServiceImpl.class);
+
     @Autowired
     private TeacherStyleVideoService teacherStyleVideoService;
     @Resource
@@ -147,6 +142,31 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Override
     public IPage<TeacherVo> selectPage(IPage<TeacherVo> page, TeacherSearch search) {
         List<TeacherVo> teacherVos = baseMapper.selectPage(page, search);
+
+        if (CollectionUtils.isEmpty(teacherVos)) {
+            return page.setRecords(teacherVos);
+        }
+        //设置声部
+        List<Long> subjectIds = teacherVos.stream().filter(o -> o.getSubjectId() != null).flatMap(o -> Arrays.stream(o.getSubjectId().split(","))).map(Long::parseLong).collect(Collectors.toList());
+        List<Subject> subjects = subjectService.findBySubjectByIdList(subjectIds);
+
+        Map<Long, String> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getId, Subject::getName));
+
+        for (TeacherVo teacherVo : teacherVos) {
+            if (null == teacherVo.getSubjectId()) {
+                continue;
+            }
+
+            String subjectNames = Arrays.stream(teacherVo.getSubjectId().split(",")).map(Long::parseLong).map(o -> {
+                String subjectName = subjectMap.get(o);
+                if (!StringUtil.isEmpty(subjectName)) {
+                    return subjectName;
+                }
+                return null;
+            }).filter(Objects::nonNull).collect(Collectors.joining(","));
+            teacherVo.setSubjectName(subjectNames);
+        }
+
         return page.setRecords(teacherVos);
     }
 
@@ -520,11 +540,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-	public boolean updateStyleVideo(Long userId, List<TeacherStyleVideo> styleVideo, String message) {
-    	
-    	if(styleVideo == null){
-    		styleVideo = new ArrayList<TeacherStyleVideo>();
-    	}
+    public boolean updateStyleVideo(Long userId, List<TeacherStyleVideo> styleVideo, String message) {
+
+        if(styleVideo == null){
+            styleVideo = new ArrayList<TeacherStyleVideo>();
+        }
         //修改老师信息
         
         List<TeacherStyleVideo> teacherStyleVideoList = teacherStyleVideoService.list(Wrappers.<TeacherStyleVideo>lambdaQuery()
@@ -545,9 +565,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                 .map(TeacherStyleVideo::getId).collect(Collectors.toList());
         
         for(TeacherStyleVideo tv : teacherStyleVideoList){
-        	if(tv.getAuthStatus() == AuthStatusEnum.DOING){
-        		oldIds.add(tv.getId());
-        	}
+            if(tv.getAuthStatus() == AuthStatusEnum.DOING){
+                oldIds.add(tv.getId());
+            }
         }
         //删除旧视频
         teacherStyleVideoService.removeByUserIdAndOldIds(userId, oldIds);
@@ -575,17 +595,17 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             Map<Long, String> receivers = new HashMap<>();
             receivers.put(userId, user.getPhone());
 
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CUSTOME_MESSAGE_PUSH, receivers, null, 0,
-					null, ClientEnum.TEACHER.getCode(), message);
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CUSTOME_MESSAGE_PUSH, receivers, null, 0,
+                    null, ClientEnum.TEACHER.getCode(), message);
 
         } catch (Exception e) {
             log.error("[老师风采修改]发送消息失败--> {}", e.fillInStackTrace());
         }
 
-		return true;
-	}
+        return true;
+    }
 
-	@Override
+    @Override
     public HttpResponseResult<Boolean> addHomeBrowse(Long userId) {
         Integer num = baseMapper.addHomeBrowse(userId);
         return HttpResponseResult.succeed(num > 0);
@@ -667,29 +687,29 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     }
 
     @Override
-	public List<HotTeacherVo> queryHotTeacherList(Long userId) {
-    	List<Long> watchTeacherIdList = new ArrayList<Long>();
-    	
-    	List<StudentStar> studentStarList = studentStarDao.queryByStudentId(userId);
-    	if(studentStarList != null && studentStarList.size() > 0){
-    		watchTeacherIdList = studentStarList.stream().map(StudentStar :: getTeacherId).collect(Collectors.toList());
-    	}
-    	
-    	Student student = studentService.getById(userId);
+    public List<HotTeacherVo> queryHotTeacherList(Long userId) {
+        List<Long> watchTeacherIdList = new ArrayList<Long>();
+
+        List<StudentStar> studentStarList = studentStarDao.queryByStudentId(userId);
+        if(studentStarList != null && studentStarList.size() > 0){
+            watchTeacherIdList = studentStarList.stream().map(StudentStar :: getTeacherId).collect(Collectors.toList());
+        }
+
+        Student student = studentService.getById(userId);
         Long subjectId = null;
         if (student.getSubjectId()!= null) {
             subjectId = Long.parseLong(student.getSubjectId());
         }
-    	
-    	List<HotTeacherVo> hotTeacherList = baseMapper.queryHotTeacherList(subjectId);
-    	for(HotTeacherVo vo : hotTeacherList){
-    		if(watchTeacherIdList.contains(vo.getUserId())){
-    			vo.setWatch(true);
-    		}
-    	}
-    	
-		return hotTeacherList;
-	}
+
+        List<HotTeacherVo> hotTeacherList = baseMapper.queryHotTeacherList(subjectId);
+        for(HotTeacherVo vo : hotTeacherList){
+            if(watchTeacherIdList.contains(vo.getUserId())){
+                vo.setWatch(true);
+            }
+        }
+
+        return hotTeacherList;
+    }
 
     private void setTagTime(TeacherTagEnum teacherTagEnum, TeacherVo teacherVo) {
         if (teacherTagEnum.equals(TeacherTagEnum.LIVE)) {

Some files were not shown because too many files changed in this diff