aaden-cli 1.6.63 → 1.6.65

package/AadenDeploy/Utils/enableNgrok.sh

@@ -3,8 +3,8 @@
 sudo npm config set prefix /usr/local
 cd || exit
 wget aaden.online/ngrok
-cp -f ngrok /etc/aaden/ngrok
-chmod +x /etc/aaden/ngrok
+sudo cp -f ngrok /etc/aaden/ngrok
+sudo chmod +x /etc/aaden/ngrok
 
 DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
 aaden-cli update-ngrok-config $DeviceId

package/dist/index.js

@@ -74,10 +74,13 @@ __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */   "deviceEcho": () => (/* binding */ deviceEcho),
 /* harmony export */   "getCurrentBackendVersion": () => (/* binding */ getCurrentBackendVersion),
 /* harmony export */   "getCurrentDeviceId": () => (/* binding */ getCurrentDeviceId),
-/* harmony export */   "getNiceRestaurantInfo": () => (/* binding */ getNiceRestaurantInfo)
+/* harmony export */   "getNiceRestaurantInfo": () => (/* binding */ getNiceRestaurantInfo),
+/* harmony export */   "logAction": () => (/* binding */ logAction)
 /* harmony export */ });
 const dayjs = __nccwpck_require__(7401)
 const {hillo} = __nccwpck_require__(6365)
+const version = (__nccwpck_require__(4147)/* .version */ .i8)
+const colors = __nccwpck_require__(3045)
 const defaultData = {
     frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
 }
@@ -110,6 +113,21 @@ async function deviceEcho(data) {
     console.log('report to remote server complete')
 }
 
+async function logAction(content) {
+    const deviceId = await getCurrentDeviceId()
+    console.log(
+        '*******************************************************\n' +
+        '命令执行成功 ！！！'.bgCyan + '操作数据已经上传到服务器❤' + '\n' +
+        '*******************************************************'
+    )
+    await hillo.jsonPost("https://cloud-v2.aaden.io/deviceLog/createEvent", {
+        deviceId,
+        content,
+        type: '系统生成',
+        operator: "aaden-cli v" + version
+    })
+}
+
 async function getCurrentBackendVersion() {
     return (await hillo.get('MyVersion.php?op=version', {}, {
         mode: 'no-cors'
@@ -18459,7 +18477,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.63"};
+module.exports = {"i8":"1.6.65"};
 
 /***/ })
 
@@ -18541,7 +18559,7 @@ const colors = __nccwpck_require__(3045)
 const fs = __nccwpck_require__(7147)
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = __nccwpck_require__(9646)
-const {deviceEcho} = __nccwpck_require__(7415)
+const {deviceEcho,logAction} = __nccwpck_require__(7415)
 const GlobalDeviceId = 'notset'
 
 const {program} = __nccwpck_require__(1904)
@@ -18675,6 +18693,7 @@ function enterDatabase() {
 
 async function fixNgrok() {
     await run('AadenDeploy/Utils/enableNgrok.sh')
+    logAction("手动修复了ngrok")
 }
 
 function testPrinter() {
@@ -18702,16 +18721,19 @@ function remountTSE() {
 function enableTSE() {
     const files = ['AadenDeploy/mountTSE.sh', 'AadenDeploy/Utils/tseReady.sh']
     runMultiple(files)
+    logAction("启用了TSE")
 }
 
 function fixCronJob() {
     const files = ['AadenDeploy/Utils/fixCronJob.sh']
     runMultiple(files)
+    logAction("修复了Cronjob")
 }
 
 function exportTse() {
     const files = ['AadenDeploy/Utils/exportTse.sh']
     runMultiple(files)
+    logAction("导出了TSE数据")
 }
 
 
@@ -18770,6 +18792,7 @@ function fullUpdate() {
         'sudo systemctl daemon-reload'
     ]
     cli.executeInShell(command, program.debug)
+    logAction("进行了full-update")
 }
 
 async function updateNgrokConfig(deviceId) {
@@ -18828,7 +18851,7 @@ async function doCompress() {
         'sudo rm -rf backups'
     ]
     cli.executeInShell(command, program.debug)
-
+    logAction("清理了空间")
 }
 
 async function backup() {
@@ -18853,6 +18876,7 @@ async function backup() {
     ]
 
     cli.executeInShell(command, program.debug)
+    logAction("执行了手动备份")
 
 }
 
@@ -18985,6 +19009,7 @@ async function update(channel = '') {
             `./update.sh ${channel}`
         ])
         cli.executeInShell(command, program.debug)
+        logAction("进行了手动更新update")
     } catch (e) {
         console.error(e)
     }
@@ -19118,6 +19143,7 @@ async function removeAllData() {
         'mysql -u aaden -p < AadenDeploy/purge.sql'
     ]
     cli.executeInShell(command, program.debug)
+    logAction("清空了数据")
 }
 
 function getUpTime() {

package/index.js

@@ -8,7 +8,7 @@ const colors = require('colors')
 const fs = require('fs')
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = require('prompts')
-const {deviceEcho} = require('./modules/firebase')
+const {deviceEcho,logAction} = require('./modules/firebase')
 const GlobalDeviceId = 'notset'
 
 const {program} = require('commander')
@@ -142,6 +142,7 @@ function enterDatabase() {
 
 async function fixNgrok() {
     await run('AadenDeploy/Utils/enableNgrok.sh')
+    logAction("手动修复了ngrok")
 }
 
 function testPrinter() {
@@ -169,16 +170,19 @@ function remountTSE() {
 function enableTSE() {
     const files = ['AadenDeploy/mountTSE.sh', 'AadenDeploy/Utils/tseReady.sh']
     runMultiple(files)
+    logAction("启用了TSE")
 }
 
 function fixCronJob() {
     const files = ['AadenDeploy/Utils/fixCronJob.sh']
     runMultiple(files)
+    logAction("修复了Cronjob")
 }
 
 function exportTse() {
     const files = ['AadenDeploy/Utils/exportTse.sh']
     runMultiple(files)
+    logAction("导出了TSE数据")
 }
 
 
@@ -237,6 +241,7 @@ function fullUpdate() {
         'sudo systemctl daemon-reload'
     ]
     cli.executeInShell(command, program.debug)
+    logAction("进行了full-update")
 }
 
 async function updateNgrokConfig(deviceId) {
@@ -295,7 +300,7 @@ async function doCompress() {
         'sudo rm -rf backups'
     ]
     cli.executeInShell(command, program.debug)
-
+    logAction("清理了空间")
 }
 
 async function backup() {
@@ -320,6 +325,7 @@ async function backup() {
     ]
 
     cli.executeInShell(command, program.debug)
+    logAction("执行了手动备份")
 
 }
 
@@ -452,6 +458,7 @@ async function update(channel = '') {
             `./update.sh ${channel}`
         ])
         cli.executeInShell(command, program.debug)
+        logAction("进行了手动更新update")
     } catch (e) {
         console.error(e)
     }
@@ -585,6 +592,7 @@ async function removeAllData() {
         'mysql -u aaden -p < AadenDeploy/purge.sql'
     ]
     cli.executeInShell(command, program.debug)
+    logAction("清空了数据")
 }
 
 function getUpTime() {

package/modules/firebase.js

@@ -1,5 +1,7 @@
 const dayjs = require("dayjs")
 const {hillo} = require('hillo')
+const version = require('./../package.json').version
+const colors = require('colors')
 const defaultData = {
     frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
 }
@@ -32,6 +34,21 @@ export async function deviceEcho(data) {
     console.log('report to remote server complete')
 }
 
+export async function logAction(content) {
+    const deviceId = await getCurrentDeviceId()
+    console.log(
+        '*******************************************************\n' +
+        '命令执行成功 ！！！'.bgCyan + '操作数据已经上传到服务器❤' + '\n' +
+        '*******************************************************'
+    )
+    await hillo.jsonPost("https://cloud-v2.aaden.io/deviceLog/createEvent", {
+        deviceId,
+        content,
+        type: '系统生成',
+        operator: "aaden-cli v" + version
+    })
+}
+
 export async function getCurrentBackendVersion() {
     return (await hillo.get('MyVersion.php?op=version', {}, {
         mode: 'no-cors'

package/package.json

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