'代码合并'

admin/pom.xml

@@ -32,10 +32,17 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>${logstash-logback-encoder}</version>
         </dependency>
+<<<<<<< HEAD
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
         <!--            <artifactId>spring-boot-starter-mail</artifactId>-->
         <!--        </dependency> -->
+=======
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-mail</artifactId>-->
+<!--        </dependency> -->
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
     </dependencies>
 
     <build>
@@ -47,4 +54,8 @@
         </plugins>
     </build>
 
-</project>
+<<<<<<< HEAD
+</project>
+=======
+</project>
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7

admin/src/main/resources/application.properties

@@ -16,6 +16,9 @@ spring.mail.username=1814994716@qq.com
 spring.mail.password=abcdefg123456!@#$%^
 # 日志文件路径
 logging.file.path=lili-logs/admin
+<<<<<<< HEAD
 lili.data.logstash.server=106.124.130.167:4560
+=======
+>>>>>>> ae0c4aea12996d3d72eca7c6ccdc97922373e4d7
 # 文件格式
 logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID}){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wEx