aaden-cli 1.6.77 → 1.6.79

package/AadenDeploy/Utils/sendTeaMakerTaskService.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+ServiceFileName=/etc/systemd/system/aaden-tee-maker.service
+
+sudo touch $ServiceFileName
+sudo chmod 777 $ServiceFileName
+echo -e "
+[Unit]
+Description=Tee Maker Service For Aaden
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+ExecStart=/usr/bin/php /var/www/html/PHP/autoSendTeaMakerTask.php
+
+[Install]
+WantedBy=multi-user.target
+" > $ServiceFileName
+
+sudo systemctl start aaden-tee-maker.service
+sudo systemctl enable aaden-tee-maker.service
+echo 'tee maker task auto send start'
+sudo service aaden-tee-maker start

package/AadenDeploy/Utils/updateAadenTse.sh

@@ -0,0 +1,130 @@
+#!/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'
+$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
+
+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
+
+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/purge.sql

@@ -9,3 +9,5 @@ delete from PaymentLog  where 1=1;
 delete from ZbonCombinedRecord where 1=1;
 insert into ZbonCombinedRecord (zbonNumber, toTimestamp)
 values (0, current_timestamp);
+delete from MemberCardRecord where true;
+delete from CashAmountLiteral where true;

package/dist/index.js

@@ -120,20 +120,24 @@ async function deviceEcho(data) {
     await new Promise(resolve => setTimeout(() => {
         resolve()
     }, waitSecond))
-
-    await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
-        deviceId: myDeviceId,
-        frontendVersion: frontendVersion,
-        cliVersion,
-        backendVersion: await getCurrentBackendVersion(),
-        timestamp: dayjs().valueOf(),
-        accessFrom: 'aaden-cli v' + cliVersion,
-        diskUsage,
-        lastUptime: upTime,
-        ngrokOk: ngrokIsNew,
-        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
-    })
-    console.log('report to remote server complete')
+    try {
+        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+            deviceId: myDeviceId,
+            frontendVersion: frontendVersion,
+            cliVersion,
+            backendVersion: await getCurrentBackendVersion(),
+            timestamp: dayjs().valueOf(),
+            accessFrom: 'aaden-cli v' + cliVersion,
+            diskUsage,
+            lastUptime: upTime,
+            ngrokOk: ngrokIsNew,
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+        })
+        console.log('report to remote server complete')
+    } catch (e) {
+        console.log(e.message)
+        console.log('report to remote server failed')
+    }
 
 
 }
@@ -18503,7 +18507,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.77"};
+module.exports = {"i8":"1.6.79"};
 
 /***/ })
 
@@ -18632,6 +18636,7 @@ program.command('convert-database').action(convertDataBaseCharset)
 program.command('migrate').action(migrate)
 
 program.command('auto-write-gdpdu').action(autoWriteGdpdu)
+program.command('auto-send-tea-maker-task').action(autoSendTeaMakerTask)
 program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
@@ -19222,6 +19227,11 @@ function autoWriteGdpdu() {
     runMultiple(files)
 }
 
+function autoSendTeaMakerTask() {
+    const files = ['AadenDeploy/Utils/sendTeaMakerTaskService.sh']
+    runMultiple(files)
+}
+
 })();
 
 module.exports = __webpack_exports__;

package/index.js

@@ -55,6 +55,7 @@ program.command('convert-database').action(convertDataBaseCharset)
 program.command('migrate').action(migrate)
 
 program.command('auto-write-gdpdu').action(autoWriteGdpdu)
+program.command('auto-send-tea-maker-task').action(autoSendTeaMakerTask)
 program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
@@ -644,3 +645,8 @@ function autoWriteGdpdu() {
     const files = ['AadenDeploy/Utils/writeGdpduService.sh']
     runMultiple(files)
 }
+
+function autoSendTeaMakerTask() {
+    const files = ['AadenDeploy/Utils/sendTeaMakerTaskService.sh']
+    runMultiple(files)
+}

package/modules/firebase.js

@@ -24,20 +24,24 @@ export async function deviceEcho(data) {
     await new Promise(resolve => setTimeout(() => {
         resolve()
     }, waitSecond))
-
-    await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
-        deviceId: myDeviceId,
-        frontendVersion: frontendVersion,
-        cliVersion,
-        backendVersion: await getCurrentBackendVersion(),
-        timestamp: dayjs().valueOf(),
-        accessFrom: 'aaden-cli v' + cliVersion,
-        diskUsage,
-        lastUptime: upTime,
-        ngrokOk: ngrokIsNew,
-        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
-    })
-    console.log('report to remote server complete')
+    try {
+        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+            deviceId: myDeviceId,
+            frontendVersion: frontendVersion,
+            cliVersion,
+            backendVersion: await getCurrentBackendVersion(),
+            timestamp: dayjs().valueOf(),
+            accessFrom: 'aaden-cli v' + cliVersion,
+            diskUsage,
+            lastUptime: upTime,
+            ngrokOk: ngrokIsNew,
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+        })
+        console.log('report to remote server complete')
+    } catch (e) {
+        console.log(e.message)
+        console.log('report to remote server failed')
+    }
 
 
 }

package/package.json

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