Merge remote-tracking branch 'origin/main'

pom.xml

@@ -21,9 +21,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+        <spring-boot.version>2.5.14</spring-boot.version>
         <baomidou.version>3.5.2</baomidou.version>
-        <spring-cloud.version>Hoxton.SR12</spring-cloud.version> <!-- Update Spring Cloud version -->
+        <spring-cloud.version>2020.0.6</spring-cloud.version> <!-- Update Spring Cloud version -->
         <easyexcel.version>3.3.2</easyexcel.version>
     </properties>
 

portal-service-server/pom.xml

@@ -28,6 +28,16 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
@@ -59,6 +69,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+
         <!--        <dependency>-->
 <!--            <groupId>org.springframework.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-starter-bootstrap</artifactId>-->

portal-service-server/src/main/resources/bootstrap.yml → portal-service-server/src/main/resources/application.yml

@@ -3,17 +3,12 @@ server:
 spring:
   mvc:
     pathmatch:
-      matching-strategy: ant_path_matcher
+      matching-strategy: ant-path-matcher
   profiles:
     active: local
   application:
     name: portal-service-server
 
-logging:
-  level:
-    root: info
-
-
 feign:
   okhttp:
     enabled: true

portal-service-server/src/main/resources/logback-spring.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="false" scanPeriod="60 seconds">
-
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="hfln-service"  />
-    <springProperty scope="context" name="printConsole" source="log.console.print" defaultValue="true"  />
-
-    <property name="LOG_PATH" value="/data/logs" />
-
-    <!-- 控制台设置 -->
-    <contextName>logback</contextName>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${PID:- }){magenta} %clr(${appName}){faint} %clr([%15.15t]){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(%-40.40logger{39}){cyan} %clr([line: %4line]){magenta} %clr(:){faint} %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- ALL -->
-    <appender name="allAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/${appName}/all.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/${appName}/${appName}-info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>3000MB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|-|${appName}|-|%thread|-|%level|-|%logger|-|%msg%n</pattern>
-        </encoder>
-    </appender>
-
-
-    <!-- ERROR -->
-    <appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/${appName}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/${appName}/${appName}-error-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>3000MB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|-|${appName}|-|%thread|-|%level|-|%logger|-|%msg%n</pattern>
-        </encoder>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="allAsyncLog" class="ch.qos.logback.classic.AsyncAppender">
-        <param name="discardingThreshold" value="0"/>
-        <param name="queueSize" value="4096"/>
-        <appender-ref ref="allAppender" />
-    </appender>
-
-    <appender name="errorAsyncLog" class="ch.qos.logback.classic.AsyncAppender">
-        <param name="discardingThreshold" value="0"/>
-        <param name="queueSize" value="2048"/>
-        <appender-ref ref="errorAppender" />
-    </appender>
-
-    <logger name="org" level="info"/>
-    <logger name="com.netflix" level="ERROR"/>
-    <logger name="com.sun" level="ERROR"/>
-    <logger name="io.lettuce" level="ERROR"/>
-    <logger name="com.alibaba" level="ERROR"/>
-    <logger name="springfox" level="ERROR"/>
-    <logger name="sun.rmi" level="ERROR"/>
-    <logger name="sun.net" level="ERROR"/>
-    <logger name="javax" level="ERROR"/>
-    <logger name="com.hfln" level="DEBUG"/>
-    <!--<logger name="com.xxl" level="ERROR"/>-->
-    <logger name="org.mongodb.driver" level="ERROR"/>
-
-
-    <root level="INFO">
-        <!--<root level="DEBUG">-->
-        <if condition='property("printConsole").equals("true")'>
-            <then>
-                <appender-ref ref="STDOUT"/>
-            </then>
-        </if>
-        <appender-ref ref="allAsyncLog"/>
-        <!--<appender-ref ref="debugAsyncLog"/>
-        <appender-ref ref="warnAsyncLog"/>-->
-        <appender-ref ref="errorAsyncLog"/>
-    </root>
-</configuration>
-
-

portal-service-server/src/test/java/com/hfln/portal/TestApplication.java

@@ -1,13 +0,0 @@
-package com.hfln.portal;
-
-import com.hfln.portal.server.Application;
-import org.springframework.boot.SpringApplication;
-import org.springframework.context.ApplicationContext;
-
-public class TestApplication {
-
-    public static void main(String[] args) {
-        //这里填的是TestApplication
-        ApplicationContext context = SpringApplication.run(Application.class, args);
-    }
-}