Bladeren bron

spring cloud 的版本升级到了 2020.0.4版本,spring-boot-starter-parent升级到了2.4.6版本。

yangzhijie 4 jaren geleden
bovenliggende
commit
a6d143252a
4 gewijzigde bestanden met toevoegingen van 78 en 101 verwijderingen
  1. 27 54
      pom.xml
  2. 0 46
      src/main/resources/log4j2.xml
  3. 50 0
      src/main/resources/logback.xml
  4. 1 1
      src/main/resources/run.bat

+ 27 - 54
pom.xml

@@ -11,89 +11,64 @@
 	<name>ServerManagement</name>
 	<url>http://maven.apache.org</url>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>2020.0.4</spring-cloud.version>
+	</properties>
+	
 	<!--指定父级依赖 -->
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.4.RELEASE</version>
+		<version>2.4.6</version>
 	</parent>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>Hoxton.RELEASE</spring-cloud.version>
-	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	
 
 	<dependencies>
-		<dependency>
-	    	<groupId>org.yaml</groupId>
-	    	<artifactId>snakeyaml</artifactId>
-	    </dependency> 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-log4j2</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
-
-		<!--sleuth日志跟踪-->
-		<dependency>
-		    <groupId>org.springframework.cloud</groupId>
-		    <artifactId>spring-cloud-starter-sleuth</artifactId>
-		</dependency>
 		
-		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
+		<dependency>
+	    	<groupId>org.yaml</groupId>
+	    	<artifactId>snakeyaml</artifactId>
+	    </dependency>
+
 		<dependency>
 		    <groupId>org.dom4j</groupId>
 		    <artifactId>dom4j</artifactId>
 		    <version>2.1.3</version>
 		</dependency>
 		
-		<!-- 发布成服务 -->
-		<dependency>
-		  <groupId>commons-daemon</groupId>
-		  <artifactId>commons-daemon</artifactId>
-		  <version>1.2.3</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
 	</dependencies>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 
 
 	<build>
@@ -238,6 +213,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-
 </project>

+ 0 - 46
src/main/resources/log4j2.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration status="WARN" monitorInterval="30">
-
-    <Properties>
-        <Property name="LOG_HOME">logs/</Property>
-    </Properties>
-    
-	<!-- 先定义所有的appender -->
-	<appenders>
-		<Console name="Console" target="SYSTEM_OUT">
-            <!-- 控制台只输出level及以上级别的信息(onMatch),其他的直接拒绝(onMismatch) -->
-            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
-            <!-- 这个都知道是输出日志的格式 -->
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level [%logger{50}:%L] [%X{X-B3-TraceId},%X{X-B3-SpanId}] - %msg%n" />
-
-        </Console>
-        
-		<!-- 这个会打印出所有的信息,每次大小超过size,则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩,作为存档 -->
-		<RollingFile name="RollingFile"
-			fileName="${LOG_HOME}/server-management.log"
-			filePattern="${LOG_HOME}/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
-			<ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY" />
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level [%logger{50}:%L] [%X{X-B3-TraceId},%X{X-B3-SpanId}] - %msg%n" />
-
-			<SizeBasedTriggeringPolicy size="2MB" />
-		</RollingFile>
-	</appenders>
-	<!-- 然后定义logger,只有定义了logger并引入的appender,appender才会生效 -->
-	<loggers>
-		<!-- 建立一个默认的root的logger -->
-		<root level="debug">
-			<appender-ref ref="RollingFile" />
-			<appender-ref ref="Console" />
-		</root>
-		
-        <!-- 第三方日志系统 -->
-        <logger name="org.springframework" level="error"/>
-        <logger name="org.hibernate" level="error"/>
-        <logger name="com.mchange.v2" level="error"/>
-        <logger name="com.alibaba.druid" level="error"/>
-        <logger name="org.eclipse.jetty" level="error"/>
-        <logger name="net.sf.ehcache" level="error"/>
-        <logger name="org.apache" level="error"/>
-        <logger name="com.netflix" level="error"/>
-	</loggers>
-</configuration>

+ 50 - 0
src/main/resources/logback.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <!-- 格式化输出:%date表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度 %msg:日志消息,%n是换行符-->
+    <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
+    <!-- 定义日志存储的路径,不要配置相对路径 -->
+    <property name="FILE_PATH" value="./logs/ServerManagement.%d{yyyy-MM-dd}.%i.log" />
+ 
+    <!-- 控制台输出日志 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <!-- 按照上面配置的LOG_PATTERN来打印日志 -->
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+ 
+    <!--每天生成一个日志文件,保存15天的日志文件。rollingFile是用来切分文件的 -->
+    <appender name="FILE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${FILE_PATH}</fileNamePattern>
+            <!-- keep 15 days' worth of history -->
+            <maxHistory>1</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 日志文件的最大大小 -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+ 
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    
+    <!-- project default level -->
+    <logger name="src" level="DEBUG" />
+    <logger name="org.springframework" level="ERROR"/>
+    <logger name="org.hibernate" level="ERROR"/>
+    <logger name="com.mchange.v2" level="ERROR"/>
+    <logger name="com.alibaba.druid" level="ERROR"/>
+    <logger name="org.eclipse.jetty" level="ERROR"/>
+    <logger name="net.sf.ehcache" level="ERROR"/>
+    <logger name="org.apache" level="ERROR"/>
+    <logger name="com.netflix" level="ERROR"/>
+ 
+    <!-- 日志输出级别 常用的日志级别按照从高到低依次为:ERROR、WARN、INFO、DEBUG。 -->
+    <root level="DEBUG">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>

+ 1 - 1
src/main/resources/run.bat

@@ -2,4 +2,4 @@
 title ServerManagement
 cd /d %~dp0
 set current_path=%~dp0
-start javaw -jar -Xms64m -Xmx256m %current_path%\ServerManagement.jar
+start javaw -jar -Xms64m -Xmx128m %current_path%\ServerManagement.jar