diff --git a/app.db b/app.db index 89ade6a..75829d9 100644 Binary files a/app.db and b/app.db differ diff --git a/publish.ps1 b/publish.ps1 new file mode 100644 index 0000000..9c7881f --- /dev/null +++ b/publish.ps1 @@ -0,0 +1,23 @@ +# update version in pom.xml +$pomData = [xml](Get-Content pom.xml) +$version = $pomData.project.version -split '\.' +$version[2] = [int]$version[2] + 1 +$version = $version -join '.' +mvn versions:set -DnewVersion="$version" +git add pom.xml +git commit -m "update version to $version" + +# build +mvn clean package +Rename-Item -Path target/digester-$version.jar -NewName "app-$version.jar" + +# upload +scp target/app-$version.jar root@192.168.8.10:/app/ +# scp ./app.db root@192.168.8.10:/app/device.db + +# start +ssh root:zwsd@192.168.8.10 "killall java" +ssh root:zwsd@192.168.8.10 "rm /app-java/app.jar" +ssh root:zwsd@192.168.8.10 "ln -s /app-java/app-$version.jar /app-java/app.jar" +ssh root:zwsd@192.168.8.10 "nohup /app-java/java/jdk-18.0.2.1/bin/java -jar /app-java/app.jar --spring.profiles.active=test > /app/app.log 2>&1 &" +ssh root:zwsd@192.168.8.10 "tail -f /app-java/app.log" \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..d772ca4 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,15 @@ +server : + port : 80 + +spring: + datasource: + url: jdbc:sqlite:D:/Sige5193/boditech-a800/app.db + driver-class-name: org.sqlite.JDBC + +device: + connections: + - name : zcancmder + key : zcancmder + enable : true + type : ZcancmderWebsocket + uri: ws://192.168.8.10:19005 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 0000000..b4951f7 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,15 @@ +server : + port : 80 + +spring: + datasource: + url: jdbc:sqlite:/app-java/device.db + driver-class-name: org.sqlite.JDBC + +device: + connections: + - name : zcancmder + key : zcancmder + enable : true + type : ZcancmderWebsocket + uri: ws://192.168.8.10:19005 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0fb06e9..caf4dfc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,16 +1,3 @@ -server : - port : 80 - spring: - datasource: - url: jdbc:sqlite:D:/Sige5193/boditech-a800/app.db - username: 1 - password: 1 - driver-class-name: org.sqlite.JDBC - -flyway: - enabled: true - encoding: UTF-8 - locations: classpath:db/migration - validate-on-migrate: true - validateMigrationNaming: true \ No newline at end of file + profiles: + active: dev \ No newline at end of file