aaden-cli 1.6.81 → 1.6.83

package/AadenDeploy/Utils/updateAadenTse.sh

@@ -58,50 +58,8 @@ sendDeviceLog $deviceId "user os is ($os)"
 wget -O latest-tse-adapter.jar "$tseAdapterDownloadUrl"
 
 if [ $os == 'windows' ]; then
-  # find tse dir
-  tseDirSearchCommand=$(cat <<- 'PHP'
-$arr = scandir('/mnt/c/Users');
-if (in_array('POS', $arr)) {
-    $userDir = 'POS';
-} elseif (in_array('inner', $arr)) {
-    $userDir = 'inner';
-} else {
-    $userDir = null;
-}
-
-if ($userDir) {
-    echo "/mnt/c/Users/$userDir/Desktop/AadenTseOnWindows";
-} else {
-    echo 'null';
-}
-PHP
-  )
-  tseDir=`php -r "$tseDirSearchCommand"`
-
-  if [ tseDir == 'null' ]; then
-    sendDeviceLog $deviceId "cannot find 'POS' or 'inner' in User directory, abort"
-    exit 1
-  fi
-
-  #test tse dir
-  testTseDirCommand=$(cat <<- 'PHP'
-$dir = fgets(STDIN);
-$arr = scandir($dir);
-echo $arr !== false ? 'true' : 'false';
-PHP
-  )
-  testTseDirResult=`echo "$tseDir" | php -r "$testTseDirCommand"`
-
-  if [ testTseDirResult == 'false' ]; then
-    sendDeviceLog $deviceId "cannot find '$tseDir', abort"
-  fi
-
-  # copy and override
-  cp -f latest-tse-adapter.jar "$tseDir/tse-0.0.3.jar"
-
-  # restart service
-  $tseDir/AadenTseServiceRegister.exe restart
-
+  sendDeviceLog $deviceId "this is a Windows system, abort"
+  exit 1
 else
   sudo cp -f latest-tse-adapter.jar /var/www/html/TseHost/tse-0.0.2.jar
   sudo service aaden-tse restart

package/AadenDeploy/Utils/updateAadenTseOnWindows.sh

@@ -0,0 +1,120 @@
+#!/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
+}
+
+# get tse version via php
+tseVersionCommand=$(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
+)
+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)"
+    exit 1
+  fi
+fi
+
+# get os version via php
+osCommand=$(cat <<- 'PHP'
+$osVersion = shell_exec('cat /proc/version');
+if (strpos($osVersion, 'microsoft') !== false || strpos($osVersion, 'WSL2') !== false) {
+  $os = 'windows';
+} else {
+  $os = 'linux';
+}
+echo $os;
+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
+  # find tse dir
+  tseDirSearchCommand=$(cat <<- 'PHP'
+$userDirs = scandir('/mnt/c/Users');
+
+$tseDir = null;
+foreach ($userDirs as $userDir) {
+    $tryDir = "/mnt/c/Users/$userDir/Desktop/AadenTseOnWindows";
+    if (file_exists($tryDir)) {
+        $tseDir = $tryDir;
+        break;
+    }
+}
+
+if ($tseDir) {
+    echo $tseDir;
+} else {
+    echo 'null';
+}
+PHP
+  )
+  tseDir=`php -r "$tseDirSearchCommand"`
+
+  if [ tseDir == 'null' ]; then
+    sendDeviceLog $deviceId "no TSE directory, abort"
+    exit 1
+  fi
+
+  # copy and override
+  cp -f latest-tse-adapter.jar "$tseDir/tse-0.0.3.jar"
+
+  echo "新TSE文件覆盖完成。请客服注意引导老板，接受弹出来的框"
+
+  # restart service
+  $tseDir/AadenTseServiceRegister.exe restart
+
+else
+  sendDeviceLog $deviceId "this is a Linux system, abort"
+  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)"

package/AadenDeploy/aadensetup.sh

@@ -92,6 +92,7 @@ sudo mysql -uroot < backendFiles/new.sql
 
 echoWithWait "Uploading PHP Files"
 sudo mv backendFiles/* /var/www/html/
+sudo service apache2 restart
 sudo chown -hR www-data:www-data /var/www/html
 
 sudo chmod -R 777 /var/www/html/Resource

package/AadenDeploy/mountTSE.sh

@@ -1,12 +1,32 @@
 #!/bin/bash
 
-sudo mkdir -p "/media/aaden/SWISSBIT"
-cd
-sudo touch tmp
-sudo chmod 777 tmp
-sudo cat /etc/fstab >tmp
-echo "UUID=5AFD-8706 /media/aaden/SWISSBIT vfat defaults 0 2" >>tmp
-sudo mv /etc/fstab /etc/fstab.backup
-sudo mv tmp /etc/fstab
-echo 'END AUTO CONFIG'
+# Check if running in WSL
+if grep -q "microsoft" /proc/version || grep -q "Microsoft" /proc/version; then
+    echo "This script cannot be run in a WSL environment. Aborting."
+    exit 1
+fi
+
+
+UUID="5AFD-8706"
+MOUNT_POINT="/media/aaden/SWISSBIT"
+NEW_ENTRY="UUID=$UUID $MOUNT_POINT vfat defaults,nofail 0 2"
+
+# Ensure the directory exists
+sudo mkdir -p "$MOUNT_POINT"
+
+# Backup the current /etc/fstab
+sudo cp /etc/fstab /etc/fstab.backup
+
+# Check if the UUID already exists in /etc/fstab
+if grep -q "UUID=$UUID" /etc/fstab; then
+    # If it exists, replace the line
+    sudo sed -i "s|.*UUID=$UUID.*|$NEW_ENTRY|" /etc/fstab
+else
+    # If it doesn't exist, add the new entry
+    echo "$NEW_ENTRY" | sudo tee -a /etc/fstab > /dev/null
+fi
+
+# Confirm the changes with mount -a
 sudo mount -a
+
+echo "END AUTO CONFIG"

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.81"};
+module.exports = {"i8":"1.6.83"};
 
 /***/ })
 
@@ -18626,6 +18626,8 @@ program.command('patch').action(patch)
 program.command('check-tse').action(checkTse)
 program.command('check-win-tse').action(checkWinTse)
 program.command('setup-tse').action(enableTSE)
+program.command('update-tse').action(updateTse)
+program.command('update-win-tse').action(updateWindowsTse)
 program.command('check-version').action(getBackendVersionOffline)
 program.command('full-update').action(fullUpdate)
 
@@ -19252,6 +19254,30 @@ function autoSendTeaMakerTask() {
     runMultiple(files)
 }
 
+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}`)
+
+    cli.executeInShell(command, program.debug)
+}
+
+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}`)
+
+    cli.executeInShell(command, program.debug)
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -45,6 +45,8 @@ program.command('patch').action(patch)
 program.command('check-tse').action(checkTse)
 program.command('check-win-tse').action(checkWinTse)
 program.command('setup-tse').action(enableTSE)
+program.command('update-tse').action(updateTse)
+program.command('update-win-tse').action(updateWindowsTse)
 program.command('check-version').action(getBackendVersionOffline)
 program.command('full-update').action(fullUpdate)
 
@@ -670,3 +672,27 @@ function autoSendTeaMakerTask() {
     const files = ['AadenDeploy/Utils/sendTeaMakerTaskService.sh']
     runMultiple(files)
 }
+
+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}`)
+
+    cli.executeInShell(command, program.debug)
+}
+
+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}`)
+
+    cli.executeInShell(command, program.debug)
+}

package/package.json

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