aaden-cli 1.6.83 → 1.6.85

package/AadenDeploy/Utils/enableNgrok.sh

@@ -61,4 +61,6 @@ echo -e "
 
 sudo service avahi-daemon restart
 
+echo "ngrok 修复脚本执行完毕。请直接检查ngrok是否正常开启。如果开启，请无视这里的任何报错。"
+
 

package/AadenDeploy/Utils/updateAadenTse.sh

@@ -1,24 +1,7 @@
 #!/bin/bash
 
-deviceId=$1
-targetVersion=$2
-tseAdapterDownloadUrl=$3
-
-function sendDeviceLog() {
-  _deviceId=$1
-  _content=$2
-  echo "<<< create log: $_content"
-  curl --location 'https://cloud-v2.aaden.io/deviceLog/createEvent' \
-    --header 'Content-Type: application/json' \
-    --data "{
-        \"deviceId\": \"$_deviceId\",
-        \"content\": \"$_content\",
-        \"type\": \"维护状态更新\",
-        \"appendUrl\": \"\",
-        \"operator\": \"updateAadenTse.sh\"
-    }"
-    return 0
-}
+targetVersion=$1
+tseAdapterDownloadUrl=$2
 
 # get tse version via php
 tseVersionCommand=$(cat <<- 'PHP'
@@ -34,7 +17,7 @@ tseVersion=`php -r "$tseVersionCommand"`
 # exit if no need to update
 if [ $tseVersion != 'null' ]; then
   if [ $targetVersion -le $tseVersion ]; then
-    sendDeviceLog $deviceId "no need to update tse, current version is ($tseVersion)"
+    echo "无需更新TSE, 当前版本已是目标版本($tseVersion)"
     exit 1
   fi
 fi
@@ -52,21 +35,24 @@ PHP
 )
 os=`php -r "$osCommand"`
 
-sendDeviceLog $deviceId "user os is ($os)"
-
 # download tse adapter
 wget -O latest-tse-adapter.jar "$tseAdapterDownloadUrl"
 
 if [ $os == 'windows' ]; then
-  sendDeviceLog $deviceId "this is a Windows system, abort"
+  echo "当前系统为Windows系统，更新TSE请使用 aaden-cli update-win-tse"
   exit 1
 else
   sudo cp -f latest-tse-adapter.jar /var/www/html/TseHost/tse-0.0.2.jar
   sudo service aaden-tse restart
 fi
 
-echo "sleep 15s to wait service restart"
-sleep 15s
+echo "正在等待TSE服务重启"
+sleep 5s
+echo "还剩10秒"
+sleep 5s
+echo "还剩5秒"
+sleep 5s
+echo "开始检查新TSE版本"
 
 tseVersionCommand2=$(cat <<- 'PHP'
 $ini = parse_ini_file('/var/www/html/Resource/config/config.ini', true);
@@ -80,9 +66,9 @@ tseVersion2=`php -r "$tseVersionCommand2"`
 
 if [ $tseVersion2 != 'null' ]; then
   if [ $targetVersion -le $tseVersion2 ]; then
-    sendDeviceLog $deviceId "tse update done, current version is ($tseVersion2)"
+    echo "TSE升级完成，当前版本为($tseVersion2)"
     exit 1
   fi
 fi
 
-sendDeviceLog $deviceId "update failed, current version is ($tseVersion2)"
+echo "TSE升级失败，当前版本为($tseVersion2)"

package/AadenDeploy/Utils/updateAadenTseOnWindows.sh

@@ -1,24 +1,7 @@
 #!/bin/bash
 
-deviceId=$1
-targetVersion=$2
-tseAdapterDownloadUrl=$3
-
-function sendDeviceLog() {
-  _deviceId=$1
-  _content=$2
-  echo "<<< create log: $_content"
-  curl --location 'https://cloud-v2.aaden.io/deviceLog/createEvent' \
-    --header 'Content-Type: application/json' \
-    --data "{
-        \"deviceId\": \"$_deviceId\",
-        \"content\": \"$_content\",
-        \"type\": \"维护状态更新\",
-        \"appendUrl\": \"\",
-        \"operator\": \"updateAadenTse.sh\"
-    }"
-    return 0
-}
+targetVersion=$1
+tseAdapterDownloadUrl=$2
 
 # get tse version via php
 tseVersionCommand=$(cat <<- 'PHP'
@@ -34,7 +17,7 @@ tseVersion=`php -r "$tseVersionCommand"`
 # exit if no need to update
 if [ $tseVersion != 'null' ]; then
   if [ $targetVersion -le $tseVersion ]; then
-    sendDeviceLog $deviceId "no need to update tse, current version is ($tseVersion)"
+    echo "无需更新TSE, 当前版本已是目标版本($tseVersion)"
     exit 1
   fi
 fi
@@ -52,8 +35,6 @@ PHP
 )
 os=`php -r "$osCommand"`
 
-sendDeviceLog $deviceId "user os is ($os)"
-
 # download tse adapter
 wget -O latest-tse-adapter.jar "$tseAdapterDownloadUrl"
 
@@ -81,7 +62,7 @@ PHP
   tseDir=`php -r "$tseDirSearchCommand"`
 
   if [ tseDir == 'null' ]; then
-    sendDeviceLog $deviceId "no TSE directory, abort"
+    echo "未找到TSE文件夹，自动更新失败"
     exit 1
   fi
 
@@ -89,32 +70,14 @@ PHP
   cp -f latest-tse-adapter.jar "$tseDir/tse-0.0.3.jar"
 
   echo "新TSE文件覆盖完成。请客服注意引导老板，接受弹出来的框"
+  echo "可以使用此命令检查tse版本：curl --location 'localhost:8014/adapterVersion'"
 
   # restart service
   $tseDir/AadenTseServiceRegister.exe restart
 
 else
-  sendDeviceLog $deviceId "this is a Linux system, abort"
+  echo "当前系统为Windows系统，更新TSE请使用 aaden-cli update-tse"
   exit 1
 fi
 
-echo "流程结束"
-
-#tseVersionCommand2=$(cat <<- 'PHP'
-#$ini = parse_ini_file('/var/www/html/Resource/config/config.ini', true);
-#$tseUrl = $ini['TSE']['TseHost'] ?? 'http://localhost:8014';
-#$versionResp = file_get_contents("$tseUrl/adapterVersion");
-#$version = json_decode($versionResp, true)['major'] ?? 'null';
-#echo $version;
-#PHP
-#)
-#tseVersion2=`php -r "$tseVersionCommand2"`
-#
-#if [ $tseVersion2 != 'null' ]; then
-#  if [ $targetVersion -le $tseVersion2 ]; then
-#    sendDeviceLog $deviceId "tse update done, current version is ($tseVersion2)"
-#    exit 1
-#  fi
-#fi
-#
-#sendDeviceLog $deviceId "update failed, current version is ($tseVersion2)"
+echo "自动更新脚本结束"

package/dist/index.js

@@ -18507,7 +18507,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.83"};
+module.exports = {"i8":"1.6.85"};
 
 /***/ })
 
@@ -19258,10 +19258,9 @@ function updateWindowsTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTseOnWindows.sh'
     const command = getPrivilegeCMD(scriptPath)
 
-    const deviceId = getMyDeviceId()
     const targetVersion = 4
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
-    command.push(`./${scriptPath} ${deviceId} ${targetVersion} ${tseAdapterDownloadUrl}`)
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
     cli.executeInShell(command, program.debug)
 }
@@ -19270,10 +19269,9 @@ function updateTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTse.sh'
     const command = getPrivilegeCMD(scriptPath)
 
-    const deviceId = getMyDeviceId()
     const targetVersion = 4
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
-    command.push(`./${scriptPath} ${deviceId} ${targetVersion} ${tseAdapterDownloadUrl}`)
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
     cli.executeInShell(command, program.debug)
 }

package/index.js

@@ -677,10 +677,9 @@ function updateWindowsTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTseOnWindows.sh'
     const command = getPrivilegeCMD(scriptPath)
 
-    const deviceId = getMyDeviceId()
     const targetVersion = 4
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
-    command.push(`./${scriptPath} ${deviceId} ${targetVersion} ${tseAdapterDownloadUrl}`)
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
     cli.executeInShell(command, program.debug)
 }
@@ -689,10 +688,9 @@ function updateTse() {
     const scriptPath = 'AadenDeploy/Utils/updateAadenTse.sh'
     const command = getPrivilegeCMD(scriptPath)
 
-    const deviceId = getMyDeviceId()
     const targetVersion = 4
     const tseAdapterDownloadUrl = 'https://innerken.com/Download/tse-0.0.4.jar'
-    command.push(`./${scriptPath} ${deviceId} ${targetVersion} ${tseAdapterDownloadUrl}`)
+    command.push(`./${scriptPath} ${targetVersion} ${tseAdapterDownloadUrl}`)
 
     cli.executeInShell(command, program.debug)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.83",
+  "version": "1.6.85",
   "description": "",
   "main": "dist/index.js",
   "scripts": {