From e493ca1c11ad8315185490a08597685e2a4653f6 Mon Sep 17 00:00:00 2001
From: LiGang <98359@runjian.com>
Date: Sat, 4 Nov 2023 10:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4application.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sec-beidou/src/main/resources/application.properties | 12 +++++++-----
 sec-beidou/src/main/resources/application.yml        |  9 ---------
 2 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 sec-beidou/src/main/resources/application.yml

diff --git a/sec-beidou/src/main/resources/application.properties b/sec-beidou/src/main/resources/application.properties
index 42e90f54..eb1f491f 100644
--- a/sec-beidou/src/main/resources/application.properties
+++ b/sec-beidou/src/main/resources/application.properties
@@ -11,12 +11,10 @@ spring.sql.init.mode=always
 #spring.datasource.initialize=true
 spring.sql.init.schema-locations=classpath:db/schema.sql
 
+#thymeleaf
 spring.thymeleaf.cache=false
-#server.port=8091
-
-#log设置
-logging.file.name=log/dtu.log
-
+spring.thymeleaf.prefix=classpath:/templates
+spring.thymeleaf.suffix=.html
 
 #security
 server.port=8668
@@ -25,6 +23,10 @@ server.servlet.context-path = /
 #server.ssl.key-store-password=nbb2021
 #server.ssl.keyAlias=tianheng
 
+# mybatis-plus
+#关闭驼峰命名法
+mybatis-plus.configuration.map-underscore-to-camel-case=false
+
 #defualt user
 default_user_name = admin
 default_pwd = 666666
diff --git a/sec-beidou/src/main/resources/application.yml b/sec-beidou/src/main/resources/application.yml
deleted file mode 100644
index 3925fac1..00000000
--- a/sec-beidou/src/main/resources/application.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-spring:
-  thymeleaf:
-    prefix: classpath:/templates
-    suffix: .html
-    cache: false
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: false #关闭驼峰命名法
\ No newline at end of file