aaden-cli 1.1.111 → 1.1.115

package/dist/index.js

@@ -18248,7 +18248,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.110"};
+module.exports = {"i8":"1.1.114"};
 
 /***/ }),
 
@@ -18465,6 +18465,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()
@@ -18983,6 +18989,30 @@ async function startService () {
   ], 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/{patch/addDatevCronJob.sh → dist/patch/202107211050resetCronjob6.sh}

@@ -8,8 +8,8 @@ echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportS
 echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
 echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
 echo "Innerken322." | sudo -S su aaden
-crontab -r
-crontab conf
+su -c aaden --command crontab -r
+su -c aaden --command crontab conf
 echo "Innerken322." | sudo -S rm -f conf
 echo "END CONFIG"
 crontab -l

package/{patch/202107211050resetCronjob4.sh → dist/patch/addDatevCronJob2.sh}

@@ -6,9 +6,10 @@ echo "0 */12 * * * wget -O /dev/null http://localhost/PHP/CloudStuff/ReportAllTe
 echo "* * * * * wget -O /dev/null http://localhost/PHP/CloudStuff/FetchOrdersForAllTerminal.php" >>conf
 echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportStatus" >>conf
 echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
+echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
 echo "Innerken322." | sudo -S su aaden
-crontab -r
-crontab conf
+su -c aaden --command crontab -r
+su -c aaden --command crontab conf
 echo "Innerken322." | sudo -S rm -f conf
 echo "END CONFIG"
 crontab -l

package/index.js

@@ -53,6 +53,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()
@@ -571,6 +577,30 @@ async function startService () {
   ], 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.111",
+  "version": "1.1.115",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/patch/202107211049resetAutoUpgradeFixAuthProblem7.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+
+
+
+echo "Innerken322." | sudo -S rm -rf /etc/cron.d/aaden-cli-upgrade
+echo "Innerken322." | sudo -S touch conf
+echo "Innerken322." | sudo -S chmod 777 conf
+
+echo  "*/5 * * * * /usr/local/bin/aaden-cli auto-upgrade" >>conf
+
+echo "Innerken322." | sudo -S crontab conf
+echo "Innerken322." | sudo -S rm -f conf
+
+echo  "END CONFIG"
+echo "Innerken322." | sudo -S crontab -l

package/patch/202107211050resetCronjob6.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+echo 'Start to Config cronjob.'
+cd || exit
+touch conf
+echo "0 */12 * * * wget -O /dev/null http://localhost/PHP/CloudStuff/ReportAllTerminalData.php" >>conf
+echo "* * * * * wget -O /dev/null http://localhost/PHP/CloudStuff/FetchOrdersForAllTerminal.php" >>conf
+echo "* * * * *  wget -O /dev/null http://localhost/PHP/AccessLog.php?op=reportStatus" >>conf
+echo "* * * * *  /var/www/html/crontab.sh > /dev/null" >>conf
+echo "59 4 1 * *   wget -O /dev/null http://localhost/PHP/Datev.php?op=autoSendDatevCsv > /dev/null" >>conf
+echo "Innerken322." | sudo -S su aaden
+su -c aaden --command crontab -r
+su -c aaden --command crontab conf
+echo "Innerken322." | sudo -S rm -f conf
+echo "END CONFIG"
+crontab -l