aaden-cli 1.1.181 → 1.2.1

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/AadenDeploy/scureSql.sh

@@ -1,91 +1,91 @@
-#!/bin/bash
-
-#
-# Automate mysql secure installation for debian-baed systems
-#
-#  - You can set a password for root accounts.
-#  - You can remove root accounts that are accessible from outside the local host.
-#  - You can remove anonymous-user accounts.
-#  - You can remove the test database (which by default can be accessed by all users, even anonymous users),
-#    and privileges that permit anyone to access databases with names that start with test_.
-#  For details see documentation: http://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html
-#
-# @version 13.08.2014 00:39 +03:00
-# Tested on Debian 7.6 (wheezy)
-#
-# Usage:
-#  Setup mysql root password:  ./mysql_secure.sh 'your_new_root_password'
-#  Change mysql root password: ./mysql_secure.sh 'your_old_root_password' 'your_new_root_password'"
-#
-
-# Delete package expect when script is done
-# 0 - No;
-# 1 - Yes.
-PURGE_EXPECT_WHEN_DONE=0
-
-#
-# Check the bash shell script is being run by root
-#
-if [[ $EUID -ne 0 ]]; then
-  echo "This script must be run as root" 1>&2
-  exit 1
-fi
-
-#
-# Check input params
-#
-if [ -n "${1}" -a -z "${2}" ]; then
-  # Setup root password
-  CURRENT_MYSQL_PASSWORD=''
-  NEW_MYSQL_PASSWORD="${1}"
-elif [ -n "${1}" -a -n "${2}" ]; then
-  # Change existens root password
-  CURRENT_MYSQL_PASSWORD="${1}"
-  NEW_MYSQL_PASSWORD="${2}"
-else
-  echo "Usage:"
-  echo "  Setup mysql root password: ${0} 'your_new_root_password'"
-  echo "  Change mysql root password: ${0} 'your_old_root_password' 'your_new_root_password'"
-  exit 1
-fi
-
-#
-# Check is expect package installed
-#
-if [ $(dpkg-query -W -f='${Status}' expect 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
-  echo "Can't find expect. Trying install it..."
-  aptitude -y install expect
-
-fi
-
-SECURE_MYSQL=$(expect -c '
-set timeout 3
-spawn mysql_secure_installation
-expect "Press y\|Y for Yes, any other key for No: "
-send "n\r"
-expect "New password:"
-send '$NEW_MYSQL_PASSWORD'"\r"
-expect "Re-enter new password:"
-send '$NEW_MYSQL_PASSWORD'"\r"
-expect "Remove anonymous users?"
-send "y\r"
-expect "Disallow root login remotely?"
-send "y\r"
-expect "Remove test database and access to it?"
-send "y\r"
-expect "Reload privilege tables now?"
-send "y\r"
-expect eof
-')
-
-#
-# Execution mysql_secure_installation
-#
-echo "${SECURE_MYSQL}"
-
-if [ "${PURGE_EXPECT_WHEN_DONE}" -eq 1 ]; then
-  # Uninstalling expect package
-  aptitude -y purge expect
-fi
-
-exit 0
+#!/bin/bash
+
+#
+# Automate mysql secure installation for debian-baed systems
+#
+#  - You can set a password for root accounts.
+#  - You can remove root accounts that are accessible from outside the local host.
+#  - You can remove anonymous-user accounts.
+#  - You can remove the test database (which by default can be accessed by all users, even anonymous users),
+#    and privileges that permit anyone to access databases with names that start with test_.
+#  For details see documentation: http://dev.mysql.com/doc/refman/5.7/en/mysql-secure-installation.html
+#
+# @version 13.08.2014 00:39 +03:00
+# Tested on Debian 7.6 (wheezy)
+#
+# Usage:
+#  Setup mysql root password:  ./mysql_secure.sh 'your_new_root_password'
+#  Change mysql root password: ./mysql_secure.sh 'your_old_root_password' 'your_new_root_password'"
+#
+
+# Delete package expect when script is done
+# 0 - No;
+# 1 - Yes.
+PURGE_EXPECT_WHEN_DONE=0
+
+#
+# Check the bash shell script is being run by root
+#
+if [[ $EUID -ne 0 ]]; then
+  echo "This script must be run as root" 1>&2
+  exit 1
+fi
+
+#
+# Check input params
+#
+if [ -n "${1}" -a -z "${2}" ]; then
+  # Setup root password
+  CURRENT_MYSQL_PASSWORD=''
+  NEW_MYSQL_PASSWORD="${1}"
+elif [ -n "${1}" -a -n "${2}" ]; then
+  # Change existens root password
+  CURRENT_MYSQL_PASSWORD="${1}"
+  NEW_MYSQL_PASSWORD="${2}"
+else
+  echo "Usage:"
+  echo "  Setup mysql root password: ${0} 'your_new_root_password'"
+  echo "  Change mysql root password: ${0} 'your_old_root_password' 'your_new_root_password'"
+  exit 1
+fi
+
+#
+# Check is expect package installed
+#
+if [ $(dpkg-query -W -f='${Status}' expect 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+  echo "Can't find expect. Trying install it..."
+  aptitude -y install expect
+
+fi
+
+SECURE_MYSQL=$(expect -c '
+set timeout 3
+spawn mysql_secure_installation
+expect "Press y\|Y for Yes, any other key for No: "
+send "n\r"
+expect "New password:"
+send '$NEW_MYSQL_PASSWORD'"\r"
+expect "Re-enter new password:"
+send '$NEW_MYSQL_PASSWORD'"\r"
+expect "Remove anonymous users?"
+send "y\r"
+expect "Disallow root login remotely?"
+send "y\r"
+expect "Remove test database and access to it?"
+send "y\r"
+expect "Reload privilege tables now?"
+send "y\r"
+expect eof
+')
+
+#
+# Execution mysql_secure_installation
+#
+echo "${SECURE_MYSQL}"
+
+if [ "${PURGE_EXPECT_WHEN_DONE}" -eq 1 ]; then
+  # Uninstalling expect package
+  aptitude -y purge expect
+fi
+
+exit 0

package/AadenDeploy/update.sh

@@ -1,22 +1,22 @@
-#!/bin/bash
-#sudo snap set system refresh.hold="$(date --date=+10year  +%Y-%m-%dT%H:%M:%S%:z)"
-
-sudo snap install axel
-echo "Innerken322." | sudo -S mkdir -p /var/www/html/PHP/CloudStuff/scripts
-echo "Innerken322." | sudo -S chmod -R 777 /var/www/html/PHP/CloudStuff/scripts
-
-cd /etc/aaden/updateFiles || exit
-echo "Innerken322." | sudo -S rm -rf /var/www/html/PHP/DB/migrations/*
-echo "Innerken322." | sudo -S cp -rf backendFiles/* /var/www/html/
-echo "Innerken322." | sudo -S chmod -R 777 /var/www/html/Resource
-echo "Innerken322." | sudo -S chmod +x /var/www/html/crontab.sh
-
-# give excute permission to migrations
-echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/bin/phinx
-echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/robmorgan/phinx/bin/phinx
-
-echo "Innerken322." | sudo -S snap refresh aaden-vue-app
-
-# run migrations
-cd /var/www/html/PHP || exit
-vendor/bin/phinx migrate
+#!/bin/bash
+#sudo snap set system refresh.hold="$(date --date=+10year  +%Y-%m-%dT%H:%M:%S%:z)"
+
+sudo snap install axel
+echo "Innerken322." | sudo -S mkdir -p /var/www/html/PHP/CloudStuff/scripts
+echo "Innerken322." | sudo -S chmod -R 777 /var/www/html/PHP/CloudStuff/scripts
+
+cd /etc/aaden/updateFiles || exit
+echo "Innerken322." | sudo -S rm -rf /var/www/html/PHP/DB/migrations/*
+echo "Innerken322." | sudo -S cp -rf backendFiles/* /var/www/html/
+echo "Innerken322." | sudo -S chmod -R 777 /var/www/html/Resource
+echo "Innerken322." | sudo -S chmod +x /var/www/html/crontab.sh
+
+# give excute permission to migrations
+echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/bin/phinx
+echo "Innerken322." | sudo -S chmod +x /var/www/html/PHP/vendor/robmorgan/phinx/bin/phinx
+
+echo "Innerken322." | sudo -S snap refresh aaden-vue-app
+
+# run migrations
+cd /var/www/html/PHP || exit
+vendor/bin/phinx migrate

package/AadenDeploy/upgrade.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
-
-
-
-echo "Innerken322." | sudo -S mkdir -p /etc/aaden/config
-echo "Innerken322." | sudo -S chmod -R 777 /etc/aaden/config
-
-echo "Innerken322." | sudo -S npm update aaden-cli -g
-
-/usr/local/bin/aaden-cli patch
-/usr/local/bin/aaden-cli load-new-version
+#!/bin/bash
+
+
+
+echo "Innerken322." | sudo -S mkdir -p /etc/aaden/config
+echo "Innerken322." | sudo -S chmod -R 777 /etc/aaden/config
+
+echo "Innerken322." | sudo -S npm update aaden-cli -g
+
+/usr/local/bin/aaden-cli patch
+/usr/local/bin/aaden-cli load-new-version

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.