From 3cb21842a7c9eb6e49773bca9cee725a3a9c509c Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 17 Dec 2024 11:25:05 +0800
Subject: [PATCH] update

---
 appresource/db/app.db                         | Bin 225280 -> 225280 bytes
 src/main/resources/application-dev.yml        |   2 --
 src/main/resources/application-test.yml       |   2 --
 src/main/resources/application.yml            |  29 --------------------------
 src/main/resources/config/application-app.yml |   4 ++++
 src/main/resources/config/application-dev.yml |   2 ++
 src/main/resources/config/application.yml     |  29 ++++++++++++++++++++++++++
 7 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/resources/application-dev.yml
 delete mode 100644 src/main/resources/application-test.yml
 delete mode 100644 src/main/resources/application.yml
 create mode 100644 src/main/resources/config/application-app.yml
 create mode 100644 src/main/resources/config/application-dev.yml
 create mode 100644 src/main/resources/config/application.yml

diff --git a/appresource/db/app.db b/appresource/db/app.db
index 4d45597ab648305ad75ff8e06eb78eb3eb410572..024b2cb0f67b92737ded295de01b8e8e39ccf7c6 100644
GIT binary patch
delta 74
zcmZp8z}xVEcY>6V|1$;#26G@b17cYQ28lBhb&Qz&pEV|IO<+9C$}~-2yDA&wYBr{6
a{F{|nq8OQ`@wMymF#<8uc0E4kONjvPJ`;`r

delta 74
zcmZp8z}xVEcY>6VPaXpUgE<hJ0kJFtgG9?j9U~^6yvBsB35<tXnWpA!S7l>d&Bin}
ad$STt6eH8rtad#<Mj&R|uE)oGDG>n1sS{xU

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
deleted file mode 100644
index a8a84fa..0000000
--- a/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-A8kCanBusService:
-  url: ws://127.0.0.1:19005
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
deleted file mode 100644
index 46ab07c..0000000
--- a/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-A8kCanBusService:
-  url: ws://192.168.8.10:19005
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
deleted file mode 100644
index f94bf0e..0000000
--- a/src/main/resources/application.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-spring:
-  profiles:
-    active: dev
-  web: 
-    resources:
-      static-locations: file:appresource/static/app/,file:appresource/static/,file:/opt/app/static/
-  datasource:
-    #    url: jdbc:sqlite::resource:app.db
-    url: jdbc:sqlite:appresource/db/app.db
-    driver-class-name: org.sqlite.JDBC
-  jackson:
-
-    serialization:
-      write-dates-as-timestamps: true
-
-server:
-  port: 8080
-
-VirtualDevice:
-  enableVirtualDevice: false
-
-springdoc:
-  api-docs:
-    path: /doc/api-docs
-    enabled: true
-  swagger-ui:
-    enabled: true # 开启swagger界面，依赖OpenApi，需要OpenApi同时开启
-    path: /doc/apitest.html # 自定义路径，默认为"/swagger-ui/index.html
-    operationsSorter: method # 接口按照方法排序
\ No newline at end of file
diff --git a/src/main/resources/config/application-app.yml b/src/main/resources/config/application-app.yml
new file mode 100644
index 0000000..0e68472
--- /dev/null
+++ b/src/main/resources/config/application-app.yml
@@ -0,0 +1,4 @@
+A8kCanBusService:
+  url: ws://127.0.0.1:19005
+
+
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..46ab07c
--- /dev/null
+++ b/src/main/resources/config/application-dev.yml
@@ -0,0 +1,2 @@
+A8kCanBusService:
+  url: ws://192.168.8.10:19005
\ No newline at end of file
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
new file mode 100644
index 0000000..2210679
--- /dev/null
+++ b/src/main/resources/config/application.yml
@@ -0,0 +1,29 @@
+server:
+  port: 8080
+
+spring:
+  profiles:
+    active: app
+  web: 
+    resources:
+      static-locations: file:appresource/static/app/,file:appresource/static/,file:/opt/app/static/
+  datasource:
+    #    url: jdbc:sqlite::resource:app.db
+    url: jdbc:sqlite:appresource/db/app.db
+    driver-class-name: org.sqlite.JDBC
+  jackson:
+
+    serialization:
+      write-dates-as-timestamps: true
+
+VirtualDevice:
+  enableVirtualDevice: false
+
+springdoc:
+  api-docs:
+    path: /doc/api-docs
+    enabled: true
+  swagger-ui:
+    enabled: true # 开启swagger界面，依赖OpenApi，需要OpenApi同时开启
+    path: /doc/apitest.html # 自定义路径，默认为"/swagger-ui/index.html
+    operationsSorter: method # 接口按照方法排序
\ No newline at end of file