aaden-cli 1.3.13 → 1.3.15

package/index.js

@@ -13,7 +13,6 @@ const GlobalDeviceId = 'notset'
 const {program} = require('commander')
 const cli = require('./modules/cli-utils')
 const {hillo} = require('hillo')
-const {uploadFile} = require('./aws')
 const version = require('./package.json').version
 
 program.version(version)
@@ -43,8 +42,6 @@ program.command('local-version').action(() => {
 program.command('backup [noUpload]').action(backup)
 program.command('ngrok').action(startNgrokService)
 program.command('update-ngrok-config <deviceId>').action(updateNgrokConfig)
-program.command('get-database').action(getDatabase)
-program.command('get-newdatabase').action(getNewDatabase)
 program.command('run <filePath>').action(run)
 program.command('patch').action(patch)
 program.command('check-tse').action(checkTse)
@@ -57,14 +54,8 @@ program.command('db').action(enterDatabase)
 program.command('printer-test').action(testPrinter)
 program.command('log').action(log)
 program.command('fix-cronjob').action(fixCronJob)
-program.command('enable-mile-pay').action(enableMilePay)
-program.command('start-mile-pay').action(startService)
 program.command('convert-database').action(convertDataBaseCharset)
-program.command('mile-pay-option')
-    .option('-k, --access-key <accessKey>')
-    .option('-s, --access-secret <accessSecret>')
-    .option('-m, --merchant-no <merchantNo>')
-    .action(milePayOption)
+
 program.command('enable-resource-track').action(enableResourceTrack)
 program.command('start-resource-track').action(startResourceTrack)
 program.command('auto-send-mail').action(editIni)
@@ -80,6 +71,7 @@ program.command('send-single-bon-without-zip-false').action(editConfigIni(setCon
 program.command('auto-write-gdpdu').action(autoWriteGdpdu)
 program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
+program.command('do-log').action(doLog)
 
 if (program.debug) {
     debugInfo()
@@ -161,7 +153,7 @@ function enterDatabase() {
 }
 
 function fixNgrok() {
-   run('AadenDeploy/Utils/enableNgrok.sh')
+    run('AadenDeploy/Utils/enableNgrok.sh')
 }
 
 function testPrinter() {
@@ -630,62 +622,14 @@ async function removeAllData() {
     cli.executeInShell(command, program.debug)
 }
 
-async function enableMilePay() {
-    cli.executeInShell([
-        'cd /home/aaden',
-        'mkdir biomace',
-        'cd biomace',
-        'wget https://innerken.com/biomace/biomace.sh',
-        'wget https://innerken.com/biomace/logback-spring-biomace.xml',
-        'wget https://innerken.com/biomace/application.yml',
-        'axel -n 6 https://innerken.com/biomace/biomace-0.0.1-SNAPSHOT.jar',
-        'wget https://innerken.com/biomace/mile-pay-pay-method.sql',
-        'mkdir log',
-        'cd /etc/systemd/system',
-        'sudo wget https://innerken.com/biomace/biomace.service',
-        'aaden-cli start-mile-pay'
-    ], program.debug)
-}
-
-async function startService() {
-    const deviceId = getMyDeviceId()
-    if (deviceId === -1) return
-    const filePath = '/home/aaden/biomace/application.yml'
-    const res = fs.readFileSync(filePath).toString()
-    const out = res.replace('identifier: IK0001', 'identifier: IK' + deviceId)
-    fs.writeFileSync(filePath, out)
-
-    cli.executeInShell([
-        'sudo systemctl start biomace.service',
-        'sudo systemctl enable biomace.service',
-        'sudo service biomace start',
-        'echo "请输入数据库密码(和开机密码，sudo密码相同)"',
-        '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)
-    }
+async function doLog() {
+    const res = cli.executeInShell(['snap info aaden-vue-app'])
+    const log = res.stdout
+    console.log(log.split('\n'))
+    await deviceEcho(log, version)
 
-    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)
 }
 
 async function enableResourceTrack() {

package/modules/cli-utils.js

@@ -1,6 +1,6 @@
 const util = require('util')
 const colors = require('colors')
-const spawn = require('child_process').spawn
+const {spawnSync} = require('child_process')
 
 function getLine (char, lineLength = 20) {
   return char.repeat(lineLength)
@@ -21,12 +21,16 @@ function executeInShell (cmd, debug = false) {
   try {
     showCommand(cmd)
     if (debug) {
-      return
+      return {
+        result:false
+      }
     }
-    spawn(_cmd, [], {
+    return {
+      result: true,
+      ...spawnSync(_cmd, [], {
       shell: true,
       stdio: 'inherit'
-    })
+    })}
   } catch (e) {
     console.log(getLine('*'))
     console.log(e.bgRed)
@@ -34,6 +38,7 @@ function executeInShell (cmd, debug = false) {
     console.log(getLine('*'))
   }
   console.log(getLine('*'))
+  return { result:false}
 }
 
 module.exports = {

package/modules/firebase.mjs

@@ -0,0 +1,66 @@
+// Import the functions you need from the SDKs you need
+import { initializeApp } from "firebase/app";
+import { getAnalytics } from "firebase/analytics";
+import { doc, getFirestore, setDoc, updateDoc } from 'firebase/firestore'
+import dayjs from "dayjs";
+import hillo from "hillo";
+
+
+// https://firebase.google.com/docs/web/setup#available-libraries
+
+// Your web app's Firebase configuration
+// For Firebase JS SDK v7.20.0 and later, measurementId is optional
+const firebaseConfig = {
+    apiKey: "AIzaSyCtvQ3d-HAtHTUg_-505c-qXRnlz8RlZeg",
+    authDomain: "aaden-saas.firebaseapp.com",
+    projectId: "aaden-saas",
+    storageBucket: "aaden-saas.appspot.com",
+    messagingSenderId: "169167876904",
+    appId: "1:169167876904:web:454ff7fc59672c55cc161d",
+    measurementId: "G-21L0J096PE"
+};
+// Initialize Firebase
+const app = initializeApp(firebaseConfig);
+const db = getFirestore(app)
+
+const deviceEchoPath = 'DeviceEcho'
+
+
+const echoLogPath = 'echoLog'
+hillo.initial('http://localhost/PHP/')
+
+export async function deviceEcho (frontEndVersion,cliVersion) {
+    const myDeviceId = await getCurrentDeviceId()
+    if (parseInt(myDeviceId) === -1) {
+        return
+    }
+    const timestamp = dayjs().format('YYYY-MM-DD')
+    await setDoc(doc(db, deviceEchoPath, myDeviceId, echoLogPath, timestamp), {
+        frontendVersion: frontEndVersion,
+        cliVersion,
+        backendVersion: await getCurrentBackendVersion(),
+        timestamp: dayjs().valueOf(),
+        restaurantInfo: await getNiceRestaurantInfo(),
+        deviceId: myDeviceId,
+        accessFrom: location.toString()
+    })
+    console.log('report to remote server complete')
+}
+
+export async function getCurrentBackendVersion () {
+    return (await hillo.get('MyVersion.php?op=version', {}, {
+        mode: 'no-cors'
+    })).version
+}
+
+export async function getCurrentDeviceId () {
+    try {
+        return (await hillo.get('AccessLog.php?op=deviceId')).content
+    } catch (e) {
+        return -1
+    }
+}
+export async function getNiceRestaurantInfo () {
+    return (await hillo.get('Restaurant.php?op=view')).content[0]
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -28,15 +28,15 @@
     "@vercel/ncc": "^0.28.5",
     "colors": "^1.4.0",
     "commander": "^5.1.0",
-    "dayjs": "^1.9.6",
-    "hillo": "^1.1.12",
+    "dayjs": "^1.11.10",
+    "hillo": "^1.1.23",
     "innerken-js-utils": "^1.0.6",
     "prompts": "^2.4.0",
     "read-ini-file": "^3.0.0",
     "release-it": "^13.6.3"
   },
   "dependencies": {
-    "aws-sdk": "^2.1046.0",
+    "firebase": "^10.6.0",
     "ini": "^3.0.1"
   }
 }

package/aws.js

@@ -1,42 +0,0 @@
-const AWS = require('aws-sdk')
-const fs = require('fs')
-
-const id = 'AKIA4TTJEQRYQ7CBPK5W'
-const secret = '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'
-const bucketName = 'aaden-backup-bucket'
-
-const s3 = new AWS.S3({
-  accessKeyId: id,
-  secretAccessKey: secret
-})
-
-function getMyDeviceId () {
-  const loadIniFile = require('read-ini-file')
-  try {
-    return loadIniFile.sync('/var/www/html/Resource/config/config.ini').Device.DeviceId
-  } catch (e) {
-    return -1
-  }
-
-}
-
-const uploadFile = (fileName) => {
-  const fileContent = fs.readFileSync(fileName)
-
-  const params = {
-    Bucket: bucketName,
-    Key: getMyDeviceId() + '/backups/' + 'backup.sql',
-    Body: fileContent
-  }
-
-  s3.upload(params, function (err, data) {
-    if (err) {
-      throw err
-    }
-    console.log(`File uploaded successfully. ${data.Location}`)
-  })
-}
-
-module.exports = {
-  uploadFile
-}

package/generateFullSql.js

@@ -1,21 +0,0 @@
-const fs = require('fs')
-const sql = fs.readFileSync('sql/1.sql')
-
-
-const queries = sql.toString().split(';')
-const res = []
-queries.forEach(q => {
-  // console.log(q)
-  const lines = q.split('\n')
-  // console.log(lines)
-  const tableName = lines.find(l => l.includes('INTO'))
-  if (tableName) {
-    const realTableName = tableName.split('`')[1]
-    const ids = lines.filter(l => l.includes('(')).map(l => l.split('(')[1].split(',')[0])
-    const query = 'Delete from ' + realTableName + ' where id in (' + ids.join(',') + ');'
-    // console.log(query)
-    res.push(query)
-  }
-
-})
-fs.writeFileSync('sql/clean.sql', res.join('\n'))