diff --git a/appresource/db/app.db b/appresource/db/app.db index 4d45597..024b2cb 100644 Binary files a/appresource/db/app.db and b/appresource/db/app.db differ 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/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/application-test.yml b/src/main/resources/config/application-dev.yml similarity index 100% rename from src/main/resources/application-test.yml rename to src/main/resources/config/application-dev.yml diff --git a/src/main/resources/application.yml b/src/main/resources/config/application.yml similarity index 90% rename from src/main/resources/application.yml rename to src/main/resources/config/application.yml index f94bf0e..2210679 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/config/application.yml @@ -1,6 +1,9 @@ +server: + port: 8080 + spring: profiles: - active: dev + active: app web: resources: static-locations: file:appresource/static/app/,file:appresource/static/,file:/opt/app/static/ @@ -13,9 +16,6 @@ spring: serialization: write-dates-as-timestamps: true -server: - port: 8080 - VirtualDevice: enableVirtualDevice: false