Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

# Conflicts:
#	mec-application/src/main/resources/logback-spring.xml
#	mec-mall/mall-admin/src/main/resources/logback-spring.xml

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

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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" />
 
 	<!--开发环境:打印控制台 -->
@@ -58,14 +47,12 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
 	<!--生产环境:输出到文件 -->
 	<springProfile name="pre">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>

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

@@ -26,18 +26,6 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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.ym.mec" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -66,14 +54,12 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
 	<!--生产环境:输出到文件 -->
 	<springProfile name="pre">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>

mec-application/src/main/resources/logback-spring.xml

@@ -87,17 +87,6 @@
         </encoder>
     </appender>
 
-    <appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-        <appName>mec-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.ym.mec" level="INFO"/>
 
     <logger name="com.ym.mec.thirdparty" level="INFO" additivity="false">
@@ -152,7 +141,6 @@
     <springProfile name="prod">
         <root level="WARN">
             <appender-ref ref="file"/>
-            <appender-ref ref="plumelog"/>
         </root>
         <Logger name="org.redisson" level="INFO" additivity="false">
             <appender-ref ref="file" level="INFO" />
@@ -166,7 +154,6 @@
     <springProfile name="pre">
         <root level="INFO">
             <appender-ref ref="file"/>
-            <appender-ref ref="plumelog"/>
         </root>
         <!--总控平台Feign接口日志-->
         <logger name="com.dayaedu.cbs.openfeign.client" level="DEBUG" additivity="false">

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

@@ -27,21 +27,9 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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.ym.mec" level="WARN" />
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 		<Logger name="org.redisson" level="INFO" additivity="false">
@@ -51,7 +39,6 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="pre">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>

mec-common/common-core/pom.xml

@@ -36,11 +36,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>com.plumelog</groupId>
-			<artifactId>plumelog-logback</artifactId>
-			<version>3.5.3</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>

mec-gateway/mec-gateway-web/pom.xml

@@ -25,11 +25,6 @@
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis-reactive</artifactId> 
 			</dependency> -->
 		<dependency>
-			<groupId>com.plumelog</groupId>
-			<artifactId>plumelog-logback</artifactId>
-			<version>3.5.3</version>
-		</dependency>
-		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
 		</dependency>

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

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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.ym.mec" level="INFO" />
 
 	<!--本地环境:打印控制台 -->
@@ -67,14 +56,12 @@
 	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 	<!--生产环境:输出到文件 -->
 	<springProfile name="pre">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

mec-im/src/main/resources/logback-spring.xml

@@ -27,17 +27,6 @@
         </encoder>
     </appender>
 
-    <appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-        <appName>mec-im</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.ym.mec" level="INFO" />
 
     <!--本地环境:打印控制台 -->
@@ -73,14 +62,12 @@
     <springProfile name="prod">
         <root level="INFO">
             <appender-ref ref="file" />
-            <appender-ref ref="plumelog" />
         </root>
     </springProfile>
     <!--生产环境:输出到文件 -->
     <springProfile name="pre">
         <root level="INFO">
             <appender-ref ref="file" />
-            <appender-ref ref="plumelog" />
         </root>
     </springProfile>
 

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

@@ -26,18 +26,6 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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" />
 
 	<!--本地环境:打印控制台 -->
@@ -64,7 +52,6 @@
 
 	<springProfile name="pre">
 		<root level="WARN">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -73,7 +60,6 @@
 	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

mec-mall/mall-common/pom.xml

@@ -19,11 +19,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.plumelog</groupId>
-            <artifactId>plumelog-logback</artifactId>
-            <version>3.5.3</version>
-        </dependency>
-        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>

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

@@ -26,18 +26,6 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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="WARN" />
 
 	<!--本地环境:打印控制台 -->
@@ -64,7 +52,6 @@
 
 	<springProfile name="pre">
 		<root level="INFO">
-			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -73,7 +60,6 @@
 	<springProfile name="prod">
 		<root level="INFO">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

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

@@ -27,17 +27,6 @@
 		</encoder>
 	</appender>
 
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-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.ym.mec" level="WARN" />
 
 	<!--本地环境:打印控制台 -->
@@ -67,14 +56,12 @@
 	<springProfile name="pre">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 

mec-websocket/src/main/resources/logback-spring.xml

@@ -42,17 +42,6 @@
 			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
 		</encoder>
 	</appender>
-
-	<appender name="plumelog" class="com.plumelog.logback.appender.RedisAppender">
-		<appName>mec-websocket</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.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
@@ -86,14 +75,12 @@
 	<springProfile name="pre">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
 			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
 		</root>
 	</springProfile>