aaden-cli 1.1.113 → 1.1.117

package/index.js

@@ -7,9 +7,10 @@ const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = require('prompts')
 const GlobalDeviceId = 'notset'
 
-const { program } = require('commander')
+const {program} = require('commander')
 const cli = require('./modules/cli-utils')
-const { hillo } = require('hillo')
+const {hillo} = require('hillo')
+const {uploadFile} = require('./aws')
 const version = require('./package.json').version
 
 program.version(version)
@@ -53,6 +54,12 @@ program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
 program.command('enable-mile-pay').action(enableMilePay)
 program.command('start-mile-pay').action(startService)
+program.command('mile-pay-option')
+  .option('-k, --access-key <accessKey>')
+  .option('-s, --access-secret <accessSecret>')
+  .option('-m, --merchant-no <merchantNo>')
+  .action(milePayOption)
+
 
 if (program.debug) {
   debugInfo()
@@ -80,17 +87,17 @@ async function selectOption () {
     message: 'Select what you want to do next? ' +
       '请选择下一步要进行的操作',
     choices: [
-      { title: 'Upgrade Aaden-cli 手动更新Aaden-cli到最新版本', description: '', value: 'upgrade' },
-      { title: 'Backup all backend data 备份后端数据库数据', description: '操作数据库数据前请先备份', value: 'backup' },
-      { title: 'Full update 全更新', description: '更新前请先备份', value: 'full-update' },
-      { title: 'Check Tse 检查Tse设备', description: '', value: 'check-tse' },
-      { title: 'Start Ngrok 打开Ngrok服务', description: '', value: 'ngrok' },
-      { title: 'Install Aaden Kasse 安装最新版Aaden Kasse', value: `install ${GlobalDeviceId}` },
-      { title: 'Add Dishes 执行上菜脚本app.py', description: '-p ImgPath -i DishCSVPath -a AttrPath', value: 'add-dish' },
-      { title: 'Check version 检查后端版本号', description: '', value: 'check-version' },
-      { title: 'Patch 打补丁', description: '请勿手动执行', value: 'patch' },
-      { title: 'Remove all data 删除所有数据', description: '谨慎操作'.red, value: 'remove-all-data' },
-      { title: 'Setup Tse 安装Tse', description: '谨慎操作'.red + ' 每个设备只能安装一次TSE', value: 'setup-tse' },
+      {title: 'Upgrade Aaden-cli 手动更新Aaden-cli到最新版本', description: '', value: 'upgrade'},
+      {title: 'Backup all backend data 备份后端数据库数据', description: '操作数据库数据前请先备份', value: 'backup'},
+      {title: 'Full update 全更新', description: '更新前请先备份', value: 'full-update'},
+      {title: 'Check Tse 检查Tse设备', description: '', value: 'check-tse'},
+      {title: 'Start Ngrok 打开Ngrok服务', description: '', value: 'ngrok'},
+      {title: 'Install Aaden Kasse 安装最新版Aaden Kasse', value: `install ${GlobalDeviceId}`},
+      {title: 'Add Dishes 执行上菜脚本app.py', description: '-p ImgPath -i DishCSVPath -a AttrPath', value: 'add-dish'},
+      {title: 'Check version 检查后端版本号', description: '', value: 'check-version'},
+      {title: 'Patch 打补丁', description: '请勿手动执行', value: 'patch'},
+      {title: 'Remove all data 删除所有数据', description: '谨慎操作'.red, value: 'remove-all-data'},
+      {title: 'Setup Tse 安装Tse', description: '谨慎操作'.red + ' 每个设备只能安装一次TSE', value: 'setup-tse'},
       {
         title: 'Mount Tse 永久挂载Tse设备', description: '谨慎操作'.red + ' ' +
           '进行此操作会导致TSE重新自检,使用前请先检查是否已经正确插入Tse设备（Tse设备是否正常亮灯）', value: 'mount-tse'
@@ -100,7 +107,7 @@ async function selectOption () {
         description: '输入本设备的DeviceId，更新Ngrok配置',
         value: `update-ngrok-config ${GlobalDeviceId}`
       },
-      { title: 'Exit 退出', description: 'return to terminal', value: 'return-terminal' }
+      {title: 'Exit 退出', description: 'return to terminal', value: 'return-terminal'}
     ],
     initial: 1
   })
@@ -277,7 +284,15 @@ async function backup (full = true) {
     'cd ' + backupHome,
     'sudo rsync -av --delete /var/www/html/ .'
   ]
+
   cli.executeInShell(command, program.debug)
+  setTimeout(() => {
+    const homedir = require('os').homedir()
+    const fileName = [homedir, 'backups', timeStamp, `${timeStamp}@cli.sql`].join('/')
+    uploadFile(fileName)
+  }, 8000)
+
+
 }
 
 async function updateCheck (channel = '') {
@@ -550,7 +565,7 @@ async function enableMilePay () {
     'mkdir log',
     'cd /etc/systemd/system',
     'sudo wget https://innerken.com/biomace/biomace.service',
-    'aaden-cli start-mile-pay',
+    'aaden-cli start-mile-pay'
   ], program.debug)
 }
 
@@ -567,10 +582,34 @@ async function startService () {
     'sudo systemctl enable biomace.service',
     'sudo service biomace start',
     'echo "请输入数据库密码(和开机密码，sudo密码相同)"',
-    'mysql -uaaden -Daaden -p < /home/aaden/biomace/mile-pay-pay-method.sql',
+    'mysql -uaaden -Daaden -p < /home/aaden/biomace/mile-pay-pay-method.sql'
   ], program.debug)
 }
 
+async function milePayOption (options) {
+  const operations = {
+    accessKey: (accessKey, res) => res.replace(/access-key: +[a-zA-Z0-9]+/g, 'access-key: ' + accessKey),
+    accessSecret: (accessSecret, res) => res.replace(/access-secret: +[a-zA-Z0-9]+/g, 'access-secret: ' + accessSecret),
+    merchantNo: (merchantNo, res) => res.replace(/merchant-no: +\d+/g, 'merchant-no: ' + merchantNo)
+  }
+
+  Object.entries(operations).forEach(entry => {
+    const [key, value] = entry
+    const newValue = options[key]
+    if (newValue !== undefined) {
+      editMilePaySettings(newValue, value)
+      console.log(`${key} 已变更为 ${newValue}`)
+    }
+  })
+}
+
+function editMilePaySettings (newValue, transform) {
+  const filePath = '/home/aaden/biomace/application.yml'
+  const res = fs.readFileSync(filePath).toString()
+  const out = transform(newValue, res)
+  fs.writeFileSync(filePath, out)
+}
+
 function returnTerminal () {
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.1.113",
+  "version": "1.1.117",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -34,5 +34,8 @@
     "prompts": "^2.4.0",
     "read-ini-file": "^3.0.0",
     "release-it": "^13.6.3"
+  },
+  "dependencies": {
+    "aws-sdk": "^2.1046.0"
   }
 }