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

audio-analysis/pom.xml

@@ -57,10 +57,6 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-auth-api</artifactId>
 			<exclusions>
-				<!-- <exclusion>
-            		<groupId>org.redisson</groupId>
-            		<artifactId>redisson-spring-boot-starter</artifactId>
-				</exclusion> -->
 				<exclusion>
 					<artifactId>netty-common</artifactId>
 					<groupId>io.netty</groupId>
@@ -96,10 +92,6 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-biz</artifactId>
 			<exclusions>
-				<!-- <exclusion>
-            		<groupId>org.redisson</groupId>
-            		<artifactId>redisson-spring-boot-starter</artifactId>
-				</exclusion> -->
 				<exclusion>
 					<artifactId>netty-common</artifactId>
 					<groupId>io.netty</groupId>

audio-analysis/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=audio-analysis
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -27,6 +27,17 @@
 		</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" />
 
 	<!--开发环境:打印控制台 -->
@@ -47,7 +58,14 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+			<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/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=cms
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -27,6 +27,17 @@
 		</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" />
 
 	<!--本地环境:打印控制台 -->
@@ -55,7 +66,14 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-			<appender-ref ref="stdout" />
+			<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/bootstrap-pre.properties

@@ -0,0 +1,14 @@
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=app
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true
+#Enables autoconfiguration for the refresh scope and associated features
+spring.cloud.refresh.enabled=true
+logging.config=classpath:logback-spring.xml

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

@@ -114,7 +114,13 @@
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
         <root level="WARN">
-<!--            <appender-ref ref="stdout"/>-->
+            <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>

mec-auth/mec-auth-server/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=auth
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -39,10 +39,18 @@
 	</appender>
 
 	<logger name="com.ym.mec" level="WARN" />
-	<root level="WARN">
-<!--		<appender-ref ref="stdout" />-->
-		<appender-ref ref="file" />
-		<appender-ref ref="plumelog" />
-	</root>
+	<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>
 
 </configuration>

mec-common/common-core/src/main/java/com/ym/mec/common/redis/config/RedisConfig.java

@@ -9,6 +9,7 @@ import org.springframework.data.redis.connection.RedisPassword;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
@@ -17,15 +18,15 @@ import java.io.Serializable;
 @Configuration
 public class RedisConfig {
 
-	@Value("${spring.redis.host}")
+	/*@Value("${spring.redis.host}")
 	private String host;
-	
+
 	@Value("${spring.redis.port}")
 	private int port;
-	
+
 	@Value("${spring.redis.password}")
 	private String password;
-	
+
 	@Value("${spring.redis.database}")
 	private int database;
 
@@ -55,6 +56,22 @@ public class RedisConfig {
 		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.setConnectionFactory(jedisConnectionFactory());
 		return redisTemplate;
+	}*/
+
+	@Bean
+	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+		// 定义redis模板
+		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+		redisTemplate.setConnectionFactory(redisConnectionFactory);
+
+		// 创建序列号对象
+		StringRedisSerializer stringSerializer = new StringRedisSerializer();
+		redisTemplate.setKeySerializer(stringSerializer);
+		redisTemplate.setHashKeySerializer(stringSerializer);
+		redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
+		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
+		redisTemplate.afterPropertiesSet();
+		return redisTemplate;
 	}
 
 }

mec-eureka/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=eureka
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

mec-gateway/mec-gateway-web/src/main/java/com/ym/mec/gateway/web/controller/ErrorHandlerController.java

@@ -1,6 +1,6 @@
 package com.ym.mec.gateway.web.controller;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.boot.web.servlet.error.ErrorController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

mec-gateway/mec-gateway-web/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=gateway-web
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.nacos.config.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -66,7 +66,13 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
+			<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>

mec-im/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,17 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=im
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true
+logging.config=classpath:logback-spring.xml

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

@@ -72,7 +72,13 @@
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
         <root level="WARN">
-<!--            <appender-ref ref="stdout" />-->
+            <appender-ref ref="file" />
+            <appender-ref ref="plumelog" />
+        </root>
+    </springProfile>
+    <!--生产环境:输出到文件 -->
+    <springProfile name="prd">
+        <root level="WARN">
             <appender-ref ref="file" />
             <appender-ref ref="plumelog" />
         </root>

mec-mall/mall-admin/src/main/resources/bootstrap-pre.yml

@@ -2,11 +2,13 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 121.41.82.151:8848
-        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        server-addr: 10.206.0.12:8848
+        namespace: 59e3c24c-a617-4632-a8d0-2766b3cf6d44
         group: DEFAULT_GROUP
         prefix: mall-admin
         file-extension: yaml
-        refresh:
-          enabled: true
-        enabled: true
+        enabled: true
+    refresh:
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml

@@ -9,4 +9,6 @@ spring:
         file-extension: yaml
         enabled: true
     refresh:
-      enabled: true
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

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

@@ -63,8 +63,8 @@
 	</springProfile>
 
 	<springProfile name="pre">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -72,7 +72,6 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-mall/mall-portal/src/main/resources/bootstrap-pre.yml

@@ -2,14 +2,16 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 121.41.82.151:8848
-        namespace: ef2e98b4-c2d5-48e8-955c-0b2f2e33a8c0
+        server-addr: 10.206.0.12:8848
+        namespace: 59e3c24c-a617-4632-a8d0-2766b3cf6d44
         group: DEFAULT_GROUP
         prefix: mall-portal
         file-extension: yaml
-        refresh:
-          enabled: true
         enabled: true
+    refresh:
+      enabled: true
     alibaba:
       seata:
-        tx-service-group: default_tx_group
+        tx-service-group: default_tx_group
+logging:
+  config: classpath:logback-spring.xml

mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml

@@ -12,4 +12,6 @@ spring:
       seata:
         tx-service-group: default_tx_group
     refresh:
-      enabled: true
+      enabled: true
+logging:
+  config: classpath:logback-spring.xml

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

@@ -63,8 +63,8 @@
 	</springProfile>
 
 	<springProfile name="pre">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
+		<root level="WARN">
+			<appender-ref ref="plumelog" />
 			<appender-ref ref="file" />
 		</root>
 	</springProfile>
@@ -72,7 +72,6 @@
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
 		<root level="WARN">
-<!--			<appender-ref ref="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-task/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=task
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -64,9 +64,15 @@
 	</springProfile>
 
 	<!--生产环境:输出到文件 -->
+	<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="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

mec-websocket/src/main/resources/bootstrap-pre.properties

@@ -0,0 +1,16 @@
+#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
+#spring.profiles.active=dev
+#\u670d\u52a1\u5668\u5730\u5740
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
+#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
+spring.cloud.nacos.config.namespace=59e3c24c-a617-4632-a8d0-2766b3cf6d44
+#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
+spring.cloud.nacos.config.group=DEFAULT_GROUP
+#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
+spring.cloud.nacos.config.prefix=websocket
+#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
+spring.cloud.nacos.config.file-extension=yaml
+#\u662f\u5426\u52a8\u6001\u5237\u65b0
+spring.cloud.refresh.enabled=true
+#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
+spring.cloud.nacos.config.enabled=true

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

@@ -83,9 +83,15 @@
 	</springProfile>
 
 	<!--生产环境:输出到文件 -->
+	<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="stdout" />-->
 			<appender-ref ref="file" />
 			<appender-ref ref="plumelog" />
 		</root>

pom.xml

@@ -20,7 +20,7 @@
 		<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
 		<zipkin.version>2.12.2</zipkin.version>
 		<google.zxing.version>3.4.0</google.zxing.version>
-		<redisson.version>3.16.4</redisson.version>
+		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
 	</properties>