Merge branch 'import_250116' of http://git.dayaedu.com/yonge/cooleshow into develop-new

audio-analysis/src/main/resources/logback-spring.xml

@@ -26,16 +26,6 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-audio</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
 
 	<logger name="com.yonge" level="info" />
 
@@ -67,14 +57,12 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 	<springProfile name="prod">
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

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

@@ -41,17 +41,6 @@
 			<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>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
 	<logger name="com.yonge" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -92,7 +81,6 @@
 		<root level="INFO">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 		<!--总控平台Feign接口日志-->
 		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">
@@ -105,7 +93,6 @@
 		<root level="INFO">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 		<!--总控平台Feign接口日志-->
 		<logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">

cooleshow-auth/auth-server/src/main/resources/logback-spring.xml

@@ -26,30 +26,18 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-auth</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
 
 	<logger name="com.yonge" level="INFO" />
 	<springProfile name="pre">
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 	<springProfile name="prod">
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

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

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-cms</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
-
 	<logger name="com.yonge" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -66,7 +55,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 
@@ -75,7 +63,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

cooleshow-common/pom.xml

@@ -40,11 +40,6 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.plumelog</groupId>
-			<artifactId>plumelog-logback</artifactId>
-			<version>3.5.3</version>
-		</dependency>
-		<dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>toolset-base</artifactId>
 			<version>1.0</version>

cooleshow-gateway/gateway-web/pom.xml

@@ -26,11 +26,6 @@
 			</dependency> -->
 
 		<dependency>
-			<groupId>com.plumelog</groupId>
-			<artifactId>plumelog-logback</artifactId>
-			<version>3.5.3</version>
-		</dependency>
-		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>

cooleshow-gateway/gateway-web/src/main/resources/logback-spring.xml

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-gateway</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
-
 	<logger name="com.yonge" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -66,7 +55,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 
@@ -75,7 +63,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

cooleshow-mall/mall-admin/src/main/resources/logback-spring.xml

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-mall-admin</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
-
 	<logger name="com.yonge" level="info" />
 
 	<!--本地环境:打印控制台 -->
@@ -66,7 +55,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 
@@ -75,7 +63,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

cooleshow-mall/mall-common/pom.xml

@@ -18,11 +18,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.plumelog</groupId>
-            <artifactId>plumelog-logback</artifactId>
-            <version>3.5.3</version>
-        </dependency>
 
         <dependency>
             <groupId>com.yonge.cooleshow</groupId>

cooleshow-mall/mall-portal/src/main/resources/logback-spring.xml

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-mall-portal</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
-
 	<logger name="com.yonge" level="info" />
 
 	<!--本地环境:打印控制台 -->
@@ -66,7 +55,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 
@@ -75,7 +63,6 @@
 		<root level="WARN">
 <!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

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

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>cooleshow-task</appName>
-		<redisHost>10.206.0.13:26379,10.206.0.16:26379,10.206.0.8:26379</redisHost>
-		<redisAuth>dyym</redisAuth>
-		<model>sentinel</model>
-		<masterName>mymaster</masterName>
-		<env>prod</env>
-		<redisDb>10</redisDb>
-		<runModel>2</runModel>
-	</appender>
-
 	<logger name="com.yonge" level="info" />
 
 	<!--本地环境:打印控制台 -->
@@ -67,7 +56,6 @@
 		<root level="WARN">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>