diff --git a/src/publish.ps1 b/src/publish.ps1 index d8d09b5..9db13c1 100644 --- a/src/publish.ps1 +++ b/src/publish.ps1 @@ -13,12 +13,12 @@ mvn clean package Rename-Item -Path target/graphite_digester_bg-$version.jar -NewName "app-$version.jar" # upload -scp target/app-$version.jar root@192.168.8.10:/app-java/ -scp D:/device.db root@192.168.8.10:/app-java/device.db +scp target/app-$version.jar root@192.168.8.10:/app/ +scp D:/device.db root@192.168.8.10:/app/device.db # start -ssh root@192.168.8.10 "killall java" -ssh root@192.168.8.10 "rm /app-java/app.jar" -ssh root@192.168.8.10 "ln -s /app-java/app-$version.jar /app-java/app.jar" -ssh root@192.168.8.10 "nohup /app-java/jdk-18.0.2.1/bin/java -jar /app-java/app.jar --spring.profiles.active=test > /app-java/app.log 2>&1 &" -ssh root@192.168.8.10 "tail -f /app-java/app.log" \ No newline at end of file +ssh root:zwsd@192.168.8.10 "killall java" +ssh root:zwsd@192.168.8.10 "rm /app/app.jar" +ssh root:zwsd@192.168.8.10 "ln -s /app/app-$version.jar /app/app.jar" +ssh root:zwsd@192.168.8.10 "nohup /app/java/jdk-18.0.2.1/bin/java -jar /app/app.jar --spring.profiles.active=test > /app/app.log 2>&1 &" +ssh root:zwsd@192.168.8.10 "tail -f /app/app.log" \ No newline at end of file diff --git a/src/src/main/resources/device.yml b/src/src/main/resources/device.yml index 5a74aca..2e25ff2 100644 --- a/src/src/main/resources/device.yml +++ b/src/src/main/resources/device.yml @@ -1,15 +1,15 @@ connection : - class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort - path : COM3 - baudRate : 921600 - frameTimeout : 100 - callTimeout : 2000 - mode : binary # text | hex | binary - commandLogEnable : true -# class : com.my.graphiteDigesterBg.diframe.connection.DiConWebsocket -# uri : ws://192.168.8.10:19005 -# mode : hex -# callTimeout : 3000 +# class : com.my.graphiteDigesterBg.diframe.connection.DiConSerialPort +# path : COM3 +# baudRate : 921600 +# frameTimeout : 100 +# callTimeout : 2000 +# mode : binary # text | hex | binary +# commandLogEnable : true + class : com.my.graphiteDigesterBg.diframe.connection.DiConWebsocket + uri : ws://192.168.8.10:19005 + mode : hex + callTimeout : 3000 # device actuators testcase : diff --git a/src/web/src/stores/AppStore.js b/src/web/src/stores/AppStore.js index 45dde9e..55e2239 100644 --- a/src/web/src/stores/AppStore.js +++ b/src/web/src/stores/AppStore.js @@ -18,7 +18,11 @@ export const useAppStore = defineStore('AppStore', { // set access token setAccessToken( token ) { this.accessToken = token; - window.localStorage.setItem('accessToken', token); + if ( null === token ) { + localStorage.removeItem('accessToken') + } else { + localStorage.setItem('accessToken', token); + } }, // set is device ready setIsDeviceReady( isReady ) {