From 1def6373e19e8c47bd2681eb6d93dd1cb1008e14 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Tue, 7 May 2024 09:36:19 +0800
Subject: [PATCH] 1

---
 app.db                                  | Bin 106496 -> 114688 bytes
 publish.ps1                             |  23 +++++++++++++++++++++++
 src/main/resources/application-dev.yml  |  15 +++++++++++++++
 src/main/resources/application-test.yml |  15 +++++++++++++++
 src/main/resources/application.yml      |  17 ++---------------
 5 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 publish.ps1
 create mode 100644 src/main/resources/application-dev.yml
 create mode 100644 src/main/resources/application-test.yml

diff --git a/app.db b/app.db
index 89ade6af2988f456db9c0738c302ab945d8349f9..75829d915fc314a60047561ece3f2c0c21494821 100644
GIT binary patch
delta 272
zcmZoTz}C>fK0#WLhk=1X28x-0w9rHyV^$spJ^$K`DGTD+82LXl@PFPcsPK|soSTu2
z9|R1Ij7?0rfNB}}e>3p^-Yn?wo}Yt(frXi$(~x&FV*tAV6aN*UmQ(zbugo`KV-R3q
z;J*RnpX1+rW4+Y{7A`^d`4g+QOx%z%eZdSy<L!x!jJ7Po?9&-dfM&t~kgGb;QHljf
zvu_p@U}l_riR~x{=QRePO$-c^Z*f^~zQz8Bk%j*UgZ0FP=9{l^vM_EJ?Pla=W#NeB
thy`lVWM|=+!6*P^@iQ_yPh4of9cWtu&@iBLCvK2nWdxcd4dDf_0svp$L{I<#

delta 132
zcmZo@U~f3UHbGjDnSp^p3W#BVccP9lD>H*$-mZ-)3*r~EI4Epp31AXnxx&DIWwW5d
zDgMb<<{Pjv^50<KzX9Z*<KKK^z14+@WjiKrNSVH12BY!z#70J2md*26e=@T0|6p*Q
eesDgc{pMTjiX78__cN+)78GdU*bY>fzzzVlO)Crl

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