更新配置文件

pom.xml

@@ -231,49 +231,33 @@
 		</dependency>
     </dependencies>
     <build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>**.yml</exclude>
-						<exclude>**.xml</exclude>
-						<exclude>**.jks</exclude>
-						<exclude>**.properties</exclude>
-						<exclude>**.cert</exclude>
-						<exclude>**.xlsx</exclude>
-					</excludes>
-					<archive>
-						<manifest>
-							<mainClass>${main-class}</mainClass>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>lib/</classpathPrefix>
-							<useUniqueVersions>false</useUniqueVersions>
-						</manifest>
-					</archive>
-					<outputDirectory>${project.build.directory}</outputDirectory>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>
-								${project.build.directory}/lib
-							</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!-- 添加docker-maven插件 -->
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.1.1</version>
+                <configuration>
+                    <imageName>${docker.image.prefix}/${project.artifactId}:${project.version}</imageName>
+                    <forceTags>true</forceTags>
+                    <!--镜像的FROM，使用压缩的小镜像-->
+                    <baseImage>frolvlad/alpine-oraclejre8:slim</baseImage>
+                    <entryPoint>["java", "-jar", "-Xms256m", "-Xmx1024m", "-Duser.timezone=GMT+8", "/${project.build.finalName}.jar"]</entryPoint>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <serverId>docker-registry</serverId>
+                    <registryUrl>${registryUrl}</registryUrl>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

src/main/resources/logback-spring.xml

@@ -7,22 +7,13 @@
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr"
-                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- 彩色日志格式 -->
-    <!--<property name="CONSOLE_LOG_PATTERN"-->
-    <!--value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>-->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!--包名输出缩进对齐-->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
-    <!--  日志记录器，日期滚动记录
-            ERROR 级别
-     -->
+    <!--  日志记录器，日期滚动记录 ERROR 级别 -->
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_error.log</file>
@@ -35,10 +26,8 @@
             </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>30</maxHistory>
-            <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
-            命名日志文件，例如log-error-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始， 命名日志文件，例如log-error-1992-11-06.0.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -59,9 +48,7 @@
     </appender>
 
 
-    <!-- 日志记录器，日期滚动记录
-            WARN  级别
-     -->
+    <!-- 日志记录器，日期滚动记录 WARN  级别 -->
     <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_warn.log</file>
@@ -74,10 +61,8 @@
             </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
-            <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
-            命名日志文件，例如log-warn-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始， 命名日志文件，例如log-warn-1992-11-06.0.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -98,9 +83,7 @@
     </appender>
 
 
-    <!-- 日志记录器，日期滚动记录
-            INFO  级别
-    -->
+    <!-- 日志记录器，日期滚动记录 INFO  级别 -->
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_info.log</file>
@@ -115,8 +98,7 @@
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -137,9 +119,7 @@
     </appender>
 
 
-    <!-- 日志记录器，日期滚动记录
-            DEBUG  级别
-    -->
+    <!-- 日志记录器，日期滚动记录 DEBUG  级别 -->
     <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- 正在记录的日志文件的路径及文件名 -->
         <file>${LOG_PATH}/${APPDIR}/${APPDIR}_debug.log</file>
@@ -154,8 +134,7 @@
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-debug-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy
-                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -189,73 +168,14 @@
         </filter>
     </appender>
 
-
-    <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
-    <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-    <!--<connectionSource-->
-    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-    <!--<driverClass>com.mysql.cj.jdbc.Driver</driverClass>-->
-    <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
-    <!--<user>root</user>-->
-    <!--<password>a123456789</password>-->
-    <!--</connectionSource>-->
-    <!--</appender>-->
-
     <!-- FrameworkServlet日志-->
     <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
     <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="java.sql" level="INFO"/>
-
-    <!--  项目 mapper 路径
-            console控制台显示sql语句：STDOUT.filter.level -> debug级别
-    -->
     <logger name="com.diagbot.mapper" level="INFO"/>
 
-    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.236:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.241:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRE" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.121:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <appender name="LOGSTASHPRO" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.122:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"mrqc-sys"}</customFields>
-        </encoder>
-    </appender>
-
-    <!-- 本地环境下的日志配置 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-        </root>
-    </springProfile>
-
     <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
@@ -264,31 +184,6 @@
             <appender-ref ref="INFO"/>
             <appender-ref ref="DEBUG"/>
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHDEV"/>
-        </root>
-    </springProfile>
-
-    <!-- 测试环境下的日志配置 -->
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHTEST"/>
-        </root>
-    </springProfile>
-
-    <!-- 预发布环境下的日志配置 -->
-    <springProfile name="pre">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRE"/>
         </root>
     </springProfile>
 
@@ -300,7 +195,6 @@
             <appender-ref ref="INFO"/>
             <appender-ref ref="DEBUG"/>
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRO"/>
         </root>
     </springProfile>
 </configuration>