aaden-cli 1.1.129 → 1.1.132

package/.gitattributes

@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Auto detect text files and perform LF normalization
+* text=auto

package/AadenDeploy/Utils/convert.sql

@@ -0,0 +1,32 @@
+USE information_schema;
+SELECT CONCAT("ALTER DATABASE `", table_schema, "` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;") AS _sql
+FROM `TABLES`
+WHERE table_schema LIKE "aaden"
+  AND TABLE_TYPE = 'BASE TABLE'
+GROUP BY table_schema
+UNION
+SELECT CONCAT("ALTER TABLE `", table_schema, "`.`", table_name,
+              "` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;") AS _sql
+FROM `TABLES`
+WHERE table_schema LIKE "aaden"
+  AND TABLE_TYPE = 'BASE TABLE'
+GROUP BY table_schema, table_name
+UNION
+SELECT CONCAT("ALTER TABLE `", `COLUMNS`.table_schema, "`.`", `COLUMNS`.table_name, "` CHANGE `", column_name, "` `",
+              column_name, "` ", data_type, "(", character_maximum_length,
+              ") CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", IF(is_nullable = "YES", " NULL", " NOT NULL"),
+              ";") AS _sql
+FROM `COLUMNS`
+         INNER JOIN `TABLES` ON `TABLES`.table_name = `COLUMNS`.table_name
+WHERE `COLUMNS`.table_schema like "aaden"
+  and data_type in ('varchar', 'char')
+  AND TABLE_TYPE = 'BASE TABLE'
+UNION
+SELECT CONCAT("ALTER TABLE `", `COLUMNS`.table_schema, "`.`", `COLUMNS`.table_name, "` CHANGE `", column_name, "` `",
+              column_name, "` ", data_type, " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci",
+              IF(is_nullable = "YES", " NULL", " NOT NULL"), ";") AS _sql
+FROM `COLUMNS`
+         INNER JOIN `TABLES` ON `TABLES`.table_name = `COLUMNS`.table_name
+WHERE `COLUMNS`.table_schema like "aaden"
+  and data_type in ('text', 'tinytext', 'mediumtext', 'longtext')
+  AND TABLE_TYPE = 'BASE TABLE';

package/AadenDeploy/Utils/updateDataBaseCharSet.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+sudo cp convert.sql ~/c.sql
+cd || exit
+sudo mysql < c.sql > output.sql
+sudo mysql < output.sql

package/AadenDeploy/files/getFile.sh

@@ -6,6 +6,7 @@ echo "Innerken322." | sudo -S mkdir -p /etc/aaden/updateFiles
 
 cd || exit
 rm -rf files
+echo "Innerken322." | sudo -S rm -rf /var/www/html/PHP/DB/migrations/*
 mkdir -p files/dist
 chmod 777 -R files/dist
 cd files/dist || exit

package/AadenDeploy/readme.md

@@ -1,179 +1,179 @@
-
-
-## Aaden配置说明
----
-
-下载地址[https://2.gp/a72RO]
-
-请将本文件夹整个拷贝到目标电脑上
-
-右键目标电脑上到文件夹
-
-选择在此打开终端
-
-打开终端后 输入
-
-./aadensetup.sh
-
-如果提示权限不够，需要右键sh文件，给予她执行权限
-
-按照流程配置要求配置，请注意查看所有提示文字
-
-----
-
-执行结束后，建立一个最高权限的匿名用户，在终端中执行下面的语句
-
-mysql < aaden.sql
-
----
-
-更改服务器权限
-
-将var/www/html 目录改为777权限，注意选择需要recurisive。
-
-
----
-
-## 配置CronJob
-
-
-进入webmin
-
-在搜索栏中搜索cronjob 选择 Scheduled Cron Jobs
-
-在右上角选择create a new Schedule cron job后进入创建CronJob窗口
-
-选择Execute cron job as root 或 aaden
-
-command 一栏中填写
-```
-/var/www/html/crontab.sh > /dev/null 2>&1
-```
-
-When to execute 一项选择 每分钟执行一次
-
- Times and dates selected below ..
-
- 后面全部选择All
-
-然后点Create
-
-然后会退出
-
-然后点击Save and run now
-
-看到这样的显示说明正常
-
-下面同理，命令换成
-
-每小时执行一次
-
-command:
-```
-	wget -O /dev/null "http://localhost/PHP/AccessLog.php?op=reportStatus" 
-   ```
-
-
-
-
-## 最后一步
-
-记录ip，并获取其他安装包
-
----
-
-如果自动配置失败，此处以下是之前保留的手动配置脚本
-
-## 结构说明
-
-注：ip内容为服务器的ip，如果在服务器本身上访问，可以使用Localhost代替
-
-1. 依赖环境
-PHP，Mysql，Webmin，Crontab，sshserver，net-tools
-
-webmin网址： https://{{ip}}:10000
-
-2. 数据库
-   
-默认用户名:aaden
-
-默认密码:Innerken322.
-
-默认库名：aaden
-
-
-订单 DishesOrder表，DishesOrderDetail表，Zbon表
-
-打印记录 PrintQuest
-
-操作记录 AccessLog
-
-### 重要表：
-
-菜品 Dishes，Category
-
-跑堂 Servant
-
-桌子 Tables
-
-打印机 Printers
-
-
-1. 后台
-
-PHP,Resource 必须放在一起
-
-PHP,Resource 默认应该部署在/var/www/html/
-
-PHP文件夹中，有两个地方是重要的配置文件，第一个是PHP/DB/DBDriver.php 看第一行，使用的是哪一个config文件。进入Configs目录中找到对应的文件，更改相关数据库信息。
-第二个是PHP/GlobalSettings.php,
-edit
- 
-$SERVEMAIL="support@innerken.com"; 这里可以设置客服邮箱，
-
-$DEVICE_NAME='IKDEV';//取名字
-
-$DEVICE_ID=1;//分一个
-
-
-第三个是PHP/Bon/BonBase.php
-
- const LINE_LENGTH = self::LINE_LENGTH_80;
-
- 改为对应的打印机毫米数
-
-
-根链接：http://{{ip}}/PHP/   
--> 
-如果有改动，需要告知技术人员，并且更改前台代码
-
-其中，Resource文件夹必须拥有777权限，否则会导致菜品图片无法上传。
-
-
-
-1. 前台
-前台
-源码/usr/lib/aaden下 找到resources 文件夹 
-
-app/app/下的index.js
-
-这个文件负责控制窗口和命令行的开关
-
-   //     win.webContents.openDevTools(); 
-
-该行，如果取消注释，那么就会打开命令行
-
-app/app/htmlTpl/js/common/tpl.js 
-
-注：需要改变 DEVICEID
-
-
-
-1. 扫码点餐
-
-
-目录在/var/www/html/ScanToOrder/asset/js/GlobalSetting.js
-
-更改
-
-Configs.DEVICEID=1;
+
+
+## Aaden配置说明
+---
+
+下载地址[https://2.gp/a72RO]
+
+请将本文件夹整个拷贝到目标电脑上
+
+右键目标电脑上到文件夹
+
+选择在此打开终端
+
+打开终端后 输入
+
+./aadensetup.sh
+
+如果提示权限不够，需要右键sh文件，给予她执行权限
+
+按照流程配置要求配置，请注意查看所有提示文字
+
+----
+
+执行结束后，建立一个最高权限的匿名用户，在终端中执行下面的语句
+
+mysql < aaden.sql
+
+---
+
+更改服务器权限
+
+将var/www/html 目录改为777权限，注意选择需要recurisive。
+
+
+---
+
+## 配置CronJob
+
+
+进入webmin
+
+在搜索栏中搜索cronjob 选择 Scheduled Cron Jobs
+
+在右上角选择create a new Schedule cron job后进入创建CronJob窗口
+
+选择Execute cron job as root 或 aaden
+
+command 一栏中填写
+```
+/var/www/html/crontab.sh > /dev/null 2>&1
+```
+
+When to execute 一项选择 每分钟执行一次
+
+ Times and dates selected below ..
+
+ 后面全部选择All
+
+然后点Create
+
+然后会退出
+
+然后点击Save and run now
+
+看到这样的显示说明正常
+
+下面同理，命令换成
+
+每小时执行一次
+
+command:
+```
+	wget -O /dev/null "http://localhost/PHP/AccessLog.php?op=reportStatus" 
+   ```
+
+
+
+
+## 最后一步
+
+记录ip，并获取其他安装包
+
+---
+
+如果自动配置失败，此处以下是之前保留的手动配置脚本
+
+## 结构说明
+
+注：ip内容为服务器的ip，如果在服务器本身上访问，可以使用Localhost代替
+
+1. 依赖环境
+PHP，Mysql，Webmin，Crontab，sshserver，net-tools
+
+webmin网址： https://{{ip}}:10000
+
+2. 数据库
+   
+默认用户名:aaden
+
+默认密码:Innerken322.
+
+默认库名：aaden
+
+
+订单 DishesOrder表，DishesOrderDetail表，Zbon表
+
+打印记录 PrintQuest
+
+操作记录 AccessLog
+
+### 重要表：
+
+菜品 Dishes，Category
+
+跑堂 Servant
+
+桌子 Tables
+
+打印机 Printers
+
+
+1. 后台
+
+PHP,Resource 必须放在一起
+
+PHP,Resource 默认应该部署在/var/www/html/
+
+PHP文件夹中，有两个地方是重要的配置文件，第一个是PHP/DB/DBDriver.php 看第一行，使用的是哪一个config文件。进入Configs目录中找到对应的文件，更改相关数据库信息。
+第二个是PHP/GlobalSettings.php,
+edit
+ 
+$SERVEMAIL="support@innerken.com"; 这里可以设置客服邮箱，
+
+$DEVICE_NAME='IKDEV';//取名字
+
+$DEVICE_ID=1;//分一个
+
+
+第三个是PHP/Bon/BonBase.php
+
+ const LINE_LENGTH = self::LINE_LENGTH_80;
+
+ 改为对应的打印机毫米数
+
+
+根链接：http://{{ip}}/PHP/   
+-> 
+如果有改动，需要告知技术人员，并且更改前台代码
+
+其中，Resource文件夹必须拥有777权限，否则会导致菜品图片无法上传。
+
+
+
+1. 前台
+前台
+源码/usr/lib/aaden下 找到resources 文件夹 
+
+app/app/下的index.js
+
+这个文件负责控制窗口和命令行的开关
+
+   //     win.webContents.openDevTools(); 
+
+该行，如果取消注释，那么就会打开命令行
+
+app/app/htmlTpl/js/common/tpl.js 
+
+注：需要改变 DEVICEID
+
+
+
+1. 扫码点餐
+
+
+目录在/var/www/html/ScanToOrder/asset/js/GlobalSetting.js
+
+更改
+
+Configs.DEVICEID=1;

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 juhaodong
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 juhaodong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,37 +1,37 @@
-# aaden-cli
-
-Aaden系统的Cli应用.
-
-usage:
-
-```
-$ >npm istall -g aaden-cli
-
-$ >aaden-cli
-                    _               _____ _      _____
-     /\            | |             / ____| |    |_   _|
-    /  \   __ _  __| | ___ _ __   | |    | |      | |
-   / /\ \ / _` |/ _` |/ _ \ '_ \  | |    | |      | |
-  / ____ \ (_| | (_| |  __/ | | | | |____| |____ _| |_
- /_/    \_\__,_|\__,_|\___|_| |_|  \_____|______|_____|
-
-
-Aaden@InnerKen CLI Version:1.0.19
-
-
-Usage: index [options] [command]
-
-Options:
-  -V, --version                           output the version number
-  -d, --debug                             use Debug Out put
-  -h, --help                              display help for command
-
-Commands:
-  update [channel]
-  install [options] <deviceId> [channel]
-  setup-wifi
-  upgrade
-  where
-  help [command]                          display help for command
-
-```
+# aaden-cli
+
+Aaden系统的Cli应用.
+
+usage:
+
+```
+$ >npm istall -g aaden-cli
+
+$ >aaden-cli
+                    _               _____ _      _____
+     /\            | |             / ____| |    |_   _|
+    /  \   __ _  __| | ___ _ __   | |    | |      | |
+   / /\ \ / _` |/ _` |/ _ \ '_ \  | |    | |      | |
+  / ____ \ (_| | (_| |  __/ | | | | |____| |____ _| |_
+ /_/    \_\__,_|\__,_|\___|_| |_|  \_____|______|_____|
+
+
+Aaden@InnerKen CLI Version:1.0.19
+
+
+Usage: index [options] [command]
+
+Options:
+  -V, --version                           output the version number
+  -d, --debug                             use Debug Out put
+  -h, --help                              display help for command
+
+Commands:
+  update [channel]
+  install [options] <deviceId> [channel]
+  setup-wifi
+  upgrade
+  where
+  help [command]                          display help for command
+
+```

package/dist/index.js

@@ -57454,7 +57454,7 @@ module.exports = JSON.parse('{"rules":{"*/*":{"endpoint":"{service}.{region}.ama
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"Promise based HTTP client for the browser and node.js","main":"index.js","scripts":{"test":"grunt test && bundlesize","start":"node ./sandbox/server.js","build":"NODE_ENV=production grunt build","preversion":"npm test","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json","postversion":"git push && git push --tags","examples":"node ./examples/server.js","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","fix":"eslint --fix lib/**/*.js"},"repository":{"type":"git","url":"https://github.com/axios/axios.git"},"keywords":["xhr","http","ajax","promise","node"],"author":"Matt Zabriskie","license":"MIT","bugs":{"url":"https://github.com/axios/axios/issues"},"homepage":"https://github.com/axios/axios","devDependencies":{"bundlesize":"^0.17.0","coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.0.2","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^20.1.0","grunt-karma":"^2.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^1.0.18","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^1.3.0","karma-chrome-launcher":"^2.2.0","karma-coverage":"^1.1.1","karma-firefox-launcher":"^1.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-opera-launcher":"^1.0.0","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^1.2.0","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.7","karma-webpack":"^1.7.0","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^5.2.0","sinon":"^4.5.0","typescript":"^2.8.1","url-search-params":"^0.10.0","webpack":"^1.13.1","webpack-dev-server":"^1.14.1"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"typings":"./index.d.ts","dependencies":{"follow-redirects":"1.5.10"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}]}');
+module.exports = JSON.parse('{"_args":[["axios@0.19.2","D:\\\\GitRoot\\\\aaden-cli"]],"_from":"axios@0.19.2","_id":"axios@0.19.2","_inBundle":false,"_integrity":"sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==","_location":"/axios","_phantomChildren":{},"_requested":{"type":"version","registry":true,"raw":"axios@0.19.2","name":"axios","escapedName":"axios","rawSpec":"0.19.2","saveSpec":null,"fetchSpec":"0.19.2"},"_requiredBy":["/hillo"],"_resolved":"https://registry.npmjs.org/axios/-/axios-0.19.2.tgz","_spec":"0.19.2","_where":"D:\\\\GitRoot\\\\aaden-cli","author":{"name":"Matt Zabriskie"},"browser":{"./lib/adapters/http.js":"./lib/adapters/xhr.js"},"bugs":{"url":"https://github.com/axios/axios/issues"},"bundlesize":[{"path":"./dist/axios.min.js","threshold":"5kB"}],"dependencies":{"follow-redirects":"1.5.10"},"description":"Promise based HTTP client for the browser and node.js","devDependencies":{"bundlesize":"^0.17.0","coveralls":"^3.0.0","es6-promise":"^4.2.4","grunt":"^1.0.2","grunt-banner":"^0.6.0","grunt-cli":"^1.2.0","grunt-contrib-clean":"^1.1.0","grunt-contrib-watch":"^1.0.0","grunt-eslint":"^20.1.0","grunt-karma":"^2.0.0","grunt-mocha-test":"^0.13.3","grunt-ts":"^6.0.0-beta.19","grunt-webpack":"^1.0.18","istanbul-instrumenter-loader":"^1.0.0","jasmine-core":"^2.4.1","karma":"^1.3.0","karma-chrome-launcher":"^2.2.0","karma-coverage":"^1.1.1","karma-firefox-launcher":"^1.1.0","karma-jasmine":"^1.1.1","karma-jasmine-ajax":"^0.1.13","karma-opera-launcher":"^1.0.0","karma-safari-launcher":"^1.0.0","karma-sauce-launcher":"^1.2.0","karma-sinon":"^1.0.5","karma-sourcemap-loader":"^0.3.7","karma-webpack":"^1.7.0","load-grunt-tasks":"^3.5.2","minimist":"^1.2.0","mocha":"^5.2.0","sinon":"^4.5.0","typescript":"^2.8.1","url-search-params":"^0.10.0","webpack":"^1.13.1","webpack-dev-server":"^1.14.1"},"homepage":"https://github.com/axios/axios","keywords":["xhr","http","ajax","promise","node"],"license":"MIT","main":"index.js","name":"axios","repository":{"type":"git","url":"git+https://github.com/axios/axios.git"},"scripts":{"build":"NODE_ENV=production grunt build","coveralls":"cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js","examples":"node ./examples/server.js","fix":"eslint --fix lib/**/*.js","postversion":"git push && git push --tags","preversion":"npm test","start":"node ./sandbox/server.js","test":"grunt test && bundlesize","version":"npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"},"typings":"./index.d.ts","version":"0.19.2"}');
 
 /***/ }),
 
@@ -57462,7 +57462,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.1.128"};
+module.exports = {"i8":"1.1.131"};
 
 /***/ }),
 
@@ -57737,6 +57737,7 @@ program.command('printer-test').action(testPrinter)
 program.command('log').action(log)
 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>')
@@ -58014,6 +58015,29 @@ async function updateCheck (channel = '') {
   return result
 }
 
+async function convertDataBaseCharset () {
+  try {
+    const result = await updateCheck()
+    if (result.version) {
+      return
+    }
+    if (!result.file) {
+      const command = [
+        ...getPrivilegeCMD('AadenDeploy/Utils/updateDataBaseCharSet.sh'),
+        'cd AadenDeploy/Utils',
+        `./updateDataBaseCharSet.sh`
+      ]
+      cli.executeInShell(command, program.debug)
+    } else {
+      console.log('已经转换完成')
+    }
+  } catch (e) {
+    console.error(e)
+  }
+
+}
+
+
 async function loadNewVersion () {
   try {
     const result = await updateCheck()

package/dist/patch/202009221441ConfigCloudCronJob.sh

@@ -0,0 +1,9 @@
+sudo touch conf
+sudo chmod 777 conf
+crontab -l >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
+crontab conf
+sudo rm -f conf
+echo "END CONFIG"
+crontab -l

package/dist/patch/202010291652setupCliAutoUpgrade.sh

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

package/dist/patch/{addDatevCronJob.sh → 20201105fixWrongOverwrite.sh}

@@ -1,15 +1,10 @@
-#!/bin/bash
-echo 'Start to Config cronjob.'
-cd || exit
-touch conf
+sudo touch conf
+sudo chmod 777 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
-crontab -r
 crontab conf
-echo "Innerken322." | sudo -S rm -f conf
+sudo rm -f conf
 echo "END CONFIG"
 crontab -l

package/dist/patch/20210208addPerminentVirtualMemory.sh

@@ -0,0 +1,7 @@
+sudo bash -c "echo 'vm.swappiness = 10' > /etc/sysctl.conf"
+sudo sysctl -p
+sudo dd if=/dev/zero of=/swapfile bs=1024 count=8388608
+sudo chmod 600 /swapfile
+sudo mkswap /swapfile
+sudo swapon /swapfile
+sudo bash -c "echo '/swapfile       swap            swap    defaults        0       0' >> /etc/fstab"

package/dist/patch/202103030938AptUpgrade.sh

@@ -0,0 +1,3 @@
+sudo apt-get update
+sudo apt-get upgrade -y
+

package/dist/patch/202105061264addVersionPHP.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+
+cd AadenDeploy/Utils || exit
+echo "Innerken322." | sudo -S cp -f MyVersion.php /var/www/html/PHP/
+echo "Innerken322." | sudo -S chmod 777 /var/www/html/MyVersion.php
+echo "Innerken322." | sudo -S apt-get install php-ssh2 -y
+echo "Innerken322." | sudo -S /etc/init.d/apache2 restart

package/dist/patch/{202107211050resetCronjob7.sh → 202105061454resetCronjob.sh}

@@ -1,15 +1,14 @@
 #!/bin/bash
 echo 'Start to Config cronjob.'
-cd || exit
-touch conf
+sudo crontab -r
+sudo touch conf
+sudo chmod 777 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
 crontab -r
 crontab conf
-echo "Innerken322." | sudo -S rm -f conf
+sudo rm -f conf
 echo "END CONFIG"
 crontab -l

package/dist/patch/202105061658resetAutoUpgradeFixAuthProblem.sh

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

package/dist/patch/{202107211049resetAutoUpgradeFixAuthProblem10.sh → 202106151659resetAutoUpgradeFixAuthProblem.sh}

@@ -1,9 +1,7 @@
 #!/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
 

package/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/index.js

@@ -55,6 +55,7 @@ program.command('printer-test').action(testPrinter)
 program.command('log').action(log)
 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>')
@@ -332,6 +333,29 @@ async function updateCheck (channel = '') {
   return result
 }
 
+async function convertDataBaseCharset () {
+  try {
+    const result = await updateCheck()
+    if (result.version) {
+      return
+    }
+    if (!result.file) {
+      const command = [
+        ...getPrivilegeCMD('AadenDeploy/Utils/updateDataBaseCharSet.sh'),
+        'cd AadenDeploy/Utils',
+        `./updateDataBaseCharSet.sh`
+      ]
+      cli.executeInShell(command, program.debug)
+    } else {
+      console.log('已经转换完成')
+    }
+  } catch (e) {
+    console.error(e)
+  }
+
+}
+
+
 async function loadNewVersion () {
   try {
     const result = await updateCheck()

package/package.json

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

package/patch/202202221050resetCronjob8.sh

@@ -8,8 +8,9 @@ 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
-su - aaden -c 'crontab -r'
-su - aaden -c 'crontab conf'
+echo "Innerken322." | sudo su - aaden -c 'crontab -r'
+echo "Innerken322." | sudo su - aaden -c 'crontab conf'
+
 echo "Innerken322." | sudo -S rm -f conf
 echo "END CONFIG"
 crontab -l

package/dist/patch/202202221050resetCronjob8.sh

@@ -1,15 +0,0 @@
-#!/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 - aaden -c 'crontab -r'
-su - aaden -c 'crontab conf'
-echo "Innerken322." | sudo -S rm -f conf
-echo "END CONFIG"
-crontab -l

package/dist/patch/addDatevCronJob2.sh

@@ -1,15 +0,0 @@
-#!/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