zouxuan 1 year ago
parent
commit
1c608e2d0a

+ 4 - 3
cooleshow-app/src/main/resources/bootstrap-dev.yml

@@ -2,8 +2,8 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 43.137.4.92:8848
-        namespace: 5ad15f42-c367-441d-9d15-cf53b220ecd5
+        server-addr: 10.206.0.17:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
         group: DEFAULT_GROUP
         prefix: app
         file-extension: yaml
@@ -13,4 +13,5 @@ spring:
         shared-configs:
           - data-id: base.yaml
             refresh: true
-
+logging:
+  config: classpath:logback-dev.xml

+ 12 - 53
cooleshow-app/src/main/resources/logback-dev.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
+	<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" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -10,68 +11,26 @@
 		</encoder>
 	</appender>
 
-	<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<appender name="file"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}/app-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
+
 		<encoder>
 			<pattern>${CONSOLE_LOG_PATTERN}</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" />
 
-	<!--本地环境:打印控制台 -->
-	<springProfile name="local">
-		<root level="INFO">
-<!--			<appender-ref ref="stdout" />-->
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-	<!--开发环境:打印控制台 -->
-	<springProfile name="dev">
-		<root level="INFO">
-<!--			<appender-ref ref="stdout" />-->
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-	
-	<springProfile name="test">
-		<root level="INFO">
-<!--			<appender-ref ref="stdout" />-->
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-	<springProfile name="pre">
-		<root level="INFO">
-<!--			<appender-ref ref="stdout" />-->
-			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
-		</root>
-	</springProfile>
-
-	<!--生产环境:输出到文件 -->
-	<springProfile name="prod">
-		<root level="INFO">
-<!--			<appender-ref ref="stdout" />-->
-			<appender-ref ref="file" />
-			<appender-ref ref="plumelog" />
-		</root>
-	</springProfile>
+	<logger name="com.yonge" level="INFO" />
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 </configuration>