merge

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -138,6 +138,7 @@ public class TenantAlbumController {
             search.setMusicSheetIdlist(musicSheetIdlist);
             search.setPage(1);
             search.setRows(9999);
+            search.setDelFlag(null);
             IPage<MusicSheetVo> records = musicSheetService.selectStudentPage(PageUtil.getPage(search), search, null);
             idMsMap.putAll(records.getRecords().stream()
                 .collect(Collectors.toMap(MusicSheet::getId, Function.identity())));

cooleshow-app/src/main/resources/logback-dev.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
+	<!--Spring读取配置参数-->
+	<!--<springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
+	<springProperty scope="context" name="LOG_HOME" source="spring.application.name"/>-->
+	<property name="FILE_NAME" value="app" />
+
 	<property name="LOG_HOME" value="/mdata/cooleshow-dev/jenkins/logs/app-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
@@ -27,10 +32,28 @@
 		</encoder>
 	</appender>
 
+	<appender name="FeignAccessFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_HOME}/${FILE_NAME}-feign.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
+			<maxHistory>30</maxHistory>
+			<totalSizeCap>1GB</totalSizeCap>
+			<maxFileSize>20 MB</maxFileSize>
+		</rollingPolicy>
+		<encoder charset="UTF-8">
+			<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] %p %c{0} %m%n</pattern>
+		</encoder>
+	</appender>
+
 	<logger name="com.yonge" level="INFO" />
 	<root level="INFO">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>
 
+	<!--总控平台Feign接口日志-->
+	<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+		<appender-ref ref="FeignAccessFile" />
+	</logger>
+
 </configuration>

cooleshow-app/src/main/resources/logback-spring.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
+	<!--Spring读取配置参数-->
+	<!--<springProperty scope="context" name="LOG_PATH" source="logging.file.path"/>
+	<springProperty scope="context" name="LOG_HOME" source="spring.application.name"/>-->
+	<property name="FILE_NAME" value="app" />
+
 	<property name="CONSOLE_LOG_PATTERN"
 		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
@@ -23,6 +28,20 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
+
+	<appender name="FeignAccessFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_HOME}/${FILE_NAME}-feign.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_HOME}/%d{yyyyMM,aux}/feign-%d{yyyyMMdd}-%i.log.gz</fileNamePattern>
+			<maxHistory>30</maxHistory>
+			<totalSizeCap>1GB</totalSizeCap>
+			<maxFileSize>20 MB</maxFileSize>
+		</rollingPolicy>
+		<encoder charset="UTF-8">
+			<pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] %p %c{0} %m%n</pattern>
+		</encoder>
+	</appender>
+
 	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
 		<appName>cooleshow-app</appName>
 		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
@@ -41,6 +60,10 @@
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 		</root>
+		<!--总控平台Feign接口日志-->
+		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+			<appender-ref ref="FeignAccessFile" />
+		</logger>
 	</springProfile>
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
@@ -48,6 +71,10 @@
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 		</root>
+		<!--总控平台Feign接口日志-->
+		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+			<appender-ref ref="FeignAccessFile" />
+		</logger>
 	</springProfile>
 
 	<springProfile name="test">
@@ -55,6 +82,10 @@
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 		</root>
+		<!--总控平台Feign接口日志-->
+		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+			<appender-ref ref="FeignAccessFile" />
+		</logger>
 	</springProfile>
 
 	<springProfile name="pre">
@@ -63,6 +94,10 @@
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>
+		<!--总控平台Feign接口日志-->
+		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+			<appender-ref ref="FeignAccessFile" />
+		</logger>
 	</springProfile>
 
 	<!--生产环境:输出到文件 -->
@@ -72,6 +107,10 @@
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>
+		<!--总控平台Feign接口日志-->
+		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
+			<appender-ref ref="FeignAccessFile" />
+		</logger>
 	</springProfile>
 
 </configuration>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CbsSubjectServiceImpl.java

@@ -43,7 +43,6 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
             subjectQuery.setSubjectIds(subjectIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
         }
         PageInfo<SubjectWrapper.Subject> subjectPageInfo = subjectService.selectPage(subjectQuery);
-
         Map<Long, String> cbsSubjectIdNameMap = subjectPageInfo.getRows().stream()
             .filter(Objects::nonNull)
             .filter(subject -> subject.getCbsSubjectId() != null && subject.getName() != null)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -847,6 +847,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             query.setRows(cbsMusicSheetIds.size());
             query.setMusicSheetIds(cbsMusicSheetIds);
             query.setDetailFlag(true);
+            query.setDelFlag(true);
             R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = cbsMusicScoreService.selectPage(query);
             if(pageInfoR.getCode() != 200){
                 throw new BizException("获取曲目信息失败");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -72,8 +72,6 @@ public class SysUserServiceImpl implements SysUserService {
     private TeacherService teacherService;
     @Resource
     private MessageSenderPluginContext messageSenderPluginContext;
-    @Resource
-    private MessageFeignClientService messageFeignClientService;
 
     @Autowired
     private UserOrderService userOrderService;
@@ -102,6 +100,8 @@ public class SysUserServiceImpl implements SysUserService {
     @Autowired
     private ImUserFriendService imUserFriendService;
 
+    @Resource
+    private MessageFeignClientService messageFeignClientService;
     @Override
     public SysUserMapper getDao() {
         return sysUserMapper;
@@ -236,17 +236,6 @@ public class SysUserServiceImpl implements SysUserService {
             }
         }
     }
-    public EClientType getClientType(String jpushType){
-        if(StringUtils.isEmpty(jpushType)){
-            return null;
-        }else if(jpushType.contains("STUDENT")){
-            return EClientType.STUDENT;
-        }else if(jpushType.contains("TEACHER")){
-            return EClientType.TEACHER;
-        }else {
-            return EClientType.BACKEND;
-        }
-    }
 
     @Override
     public List<String> accountLogoffCheck(String phone) {
@@ -402,4 +391,15 @@ public class SysUserServiceImpl implements SysUserService {
                     .remove();
         }
     }
+    public EClientType getClientType(String jpushType){
+        if(StringUtils.isEmpty(jpushType)){
+            return null;
+        }else if(jpushType.contains("STUDENT")){
+            return EClientType.STUDENT;
+        }else if(jpushType.contains("TEACHER")){
+            return EClientType.TEACHER;
+        }else {
+            return EClientType.BACKEND;
+        }
+    }
 }