启动报错

2022-08-09 20:26:40 +08:00
parent 26dd8ed13a
commit 05f29a264e
15 changed files with 117 additions and 277 deletions
--- a/admin/src/main/resources/application.properties
+++ b/admin/src/main/resources/application.properties
@@ -16,9 +16,6 @@ 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