aaden-cli 1.1.184 → 1.2.3

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 eol=lf

package/.github/workflows/submit-message.yml

@@ -1,49 +1,49 @@
-# This is a basic workflow to help you get started with Actions
-
-name: AutoSendMessage
-
-# Controls when the action will run.
-on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [ stable ]
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "build"
-  auto-merge-log:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
-      - name: checkout/changeLog
-        uses: actions/checkout@v2
-        with:
-          repository: innerken-gmbh/aaden-vue-change-log
-          path: changeLog
-          token: ${{ secrets.PT }}
-
-      # Runs a set of commands using the runners shell
-      - name: send message to log
-        run: |
-          PROJECT_NAME=$(basename -s .git $(git config --get remote.origin.url))
-          LOG=$(git log -1 --pretty=format:"%h::$PROJECT_NAME::%s")
-          echo $LOG
-          cd changeLog
-          echo $LOG >>CHANGELOG.md
-          node scripts/save-change-log.mjs $LOG
-          git config user.name Haodong Ju
-          git config user.email juhaodong@gmail.com
-          git add .
-          git commit -m "[GITHUB CI] Update changelog"
-          git push
-        shell: bash
-
+# This is a basic workflow to help you get started with Actions
+
+name: AutoSendMessage
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ stable ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  auto-merge-log:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: checkout/changeLog
+        uses: actions/checkout@v2
+        with:
+          repository: innerken-gmbh/aaden-vue-change-log
+          path: changeLog
+          token: ${{ secrets.PT }}
+
+      # Runs a set of commands using the runners shell
+      - name: send message to log
+        run: |
+          PROJECT_NAME=$(basename -s .git $(git config --get remote.origin.url))
+          LOG=$(git log -1 --pretty=format:"%h::$PROJECT_NAME::%s")
+          echo $LOG
+          cd changeLog
+          echo $LOG >>CHANGELOG.md
+          node scripts/save-change-log.mjs $LOG
+          git config user.name Haodong Ju
+          git config user.email juhaodong@gmail.com
+          git add .
+          git commit -m "[GITHUB CI] Update changelog"
+          git push
+        shell: bash
+

package/AadenDeploy/Utils/LoadingUtils.sh

@@ -1,11 +1,11 @@
-i=0
-arr=('|' '/' '-' '\\')
-index=0
-while [ $i -le 100 ]
-do
-    index=`echo $i%4`
-    printf "[%c]\r"  "${arr[$index]}"
-    ((i++))
-    sleep 0.1
-done
-echo
+i=0
+arr=('|' '/' '-' '\\')
+index=0
+while [ $i -le 100 ]
+do
+    index=`echo $i%4`
+    printf "[%c]\r"  "${arr[$index]}"
+    ((i++))
+    sleep 0.1
+done
+echo

package/AadenDeploy/Utils/MyVersion.php

@@ -1,63 +1,63 @@
-<?php
-cors();
-header("Access-Control-Allow-Origin: *");
-header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept");
-error_reporting(E_ALL);
-ini_set('display_errors', 'On');
-
-function cors()
-{
-    // Allow from any origin
-    if (isset($_SERVER['HTTP_ORIGIN'])) {
-        // Decide if the origin in $_SERVER['HTTP_ORIGIN'] is one
-        // you want to allow, and if so:
-        header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
-        header('Access-Control-Allow-Credentials: true');
-        header('Access-Control-Max-Age: 86400');    // cache for 1 day
-    }
-    // Access-Control headers are received during OPTIONS requests
-    if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
-        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
-            header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
-        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
-            header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
-    }
-}
-
-switch ($_GET['op']) {
-
-    case 'update':
-        update();
-        break;
-    default:
-    case 'version':
-        echo file_get_contents("../package.json");
-        break;
-}
-
-/**
- * @return string
- */
-function update()
-{
-    $connection = ssh2_connect('localhost', 22);
-    ssh2_auth_password($connection, 'aaden', 'Innerken322.');
-    $stream = ssh2_exec($connection, 'aaden-cli update');
-
-    $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
-
-// Enable blocking for both streams
-    stream_set_blocking($errorStream, true);
-    stream_set_blocking($stream, true);
-
-// Whichever of the two below commands is listed first will receive its appropriate output.  The second command receives nothing
-    echo "Output: " . "<pre>" . stream_get_contents($stream) . "</pre>";
-    echo "Error: " . stream_get_contents($errorStream);
-
-// Close the streams
-    fclose($errorStream);
-    fclose($stream);
-
-
-}
-
+<?php
+cors();
+header("Access-Control-Allow-Origin: *");
+header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept");
+error_reporting(E_ALL);
+ini_set('display_errors', 'On');
+
+function cors()
+{
+    // Allow from any origin
+    if (isset($_SERVER['HTTP_ORIGIN'])) {
+        // Decide if the origin in $_SERVER['HTTP_ORIGIN'] is one
+        // you want to allow, and if so:
+        header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
+        header('Access-Control-Allow-Credentials: true');
+        header('Access-Control-Max-Age: 86400');    // cache for 1 day
+    }
+    // Access-Control headers are received during OPTIONS requests
+    if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
+            header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
+        if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
+            header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
+    }
+}
+
+switch ($_GET['op']) {
+
+    case 'update':
+        update();
+        break;
+    default:
+    case 'version':
+        echo file_get_contents("../package.json");
+        break;
+}
+
+/**
+ * @return string
+ */
+function update()
+{
+    $connection = ssh2_connect('localhost', 22);
+    ssh2_auth_password($connection, 'aaden', 'Innerken322.');
+    $stream = ssh2_exec($connection, 'aaden-cli update');
+
+    $errorStream = ssh2_fetch_stream($stream, SSH2_STREAM_STDERR);
+
+// Enable blocking for both streams
+    stream_set_blocking($errorStream, true);
+    stream_set_blocking($stream, true);
+
+// Whichever of the two below commands is listed first will receive its appropriate output.  The second command receives nothing
+    echo "Output: " . "<pre>" . stream_get_contents($stream) . "</pre>";
+    echo "Error: " . stream_get_contents($errorStream);
+
+// Close the streams
+    fclose($errorStream);
+    fclose($stream);
+
+
+}
+

package/AadenDeploy/Utils/configureHttps.sh

@@ -1,5 +1,5 @@
-sudo openssl req -x509 -nodes -days 9999 -newkey rsa:2048 -keyout /etc/ssl/private/my.key -out /etc/ssl/certs/my.crt
-sudo ufw allow 443
-sudo a2ensite default-ssl.conf
-sudo a2enmod ssl
-sudo systemctl restart apache2
+sudo openssl req -x509 -nodes -days 9999 -newkey rsa:2048 -keyout /etc/ssl/private/my.key -out /etc/ssl/certs/my.crt
+sudo ufw allow 443
+sudo a2ensite default-ssl.conf
+sudo a2enmod ssl
+sudo systemctl restart apache2

package/AadenDeploy/Utils/convert.sql

@@ -1,18 +1,18 @@
-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
+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

package/{dist/patch/202204061112ResetCronTab18.sh → AadenDeploy/Utils/fixCronJob.sh}

@@ -1,19 +1,25 @@
-#!/bin/bash
-echo 'Start to Config cronjob.'
-sudo su
-cd  /etc/ || exit
-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 su - aaden -c 'crontab -r'
-echo "Innerken322." | sudo su - aaden -c 'crontab /etc/conf'
-
-echo "Innerken322." | sudo -S rm -f conf
-echo "END CONFIG"
-su aaden
-crontab -l -u aaden
-
+#!/bin/bash
+echo 'Start to Config cronjob.'
+echo "Innerken322." | sudo -S su
+touch conf
+echo "Innerken322." | sudo -S 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
+sudo crontab -u aaden -r
+sudo crontab -u aaden conf
+echo "Innerken322." | sudo -S rm -f conf
+echo "Innerken322." | sudo -S su aaden
+crontab -l -u aaden
+echo "END CONFIG"
+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 -u root -r
+echo "Innerken322." | sudo -S crontab -u root conf
+echo "Innerken322." | sudo -S rm -f conf
+echo "Innerken322." | sudo -S crontab -l
+echo  "END CONFIG"

package/AadenDeploy/Utils/startsUp.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-
-
-# 检查Aaden-cli更新
-aaden-cli backup
-aaden-cli upgrade
+#!/bin/bash
+
+
+# 检查Aaden-cli更新
+aaden-cli backup
+aaden-cli upgrade

package/AadenDeploy/Utils/tseEnable.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
-
-sudo chmod -R 777 /var/www/html/Resource
-sudo php /var/www/html/PHP/RealTse/tseEnable.php
+#!/bin/bash
+
+sudo chmod -R 777 /var/www/html/Resource
+sudo php /var/www/html/PHP/RealTse/tseEnable.php

package/AadenDeploy/Utils/tseReady.sh

@@ -1,33 +1,33 @@
-#!/bin/bash
-
-sudo apt-get update -y
-sudo apt-get install default-jdk -y
-
-sudo chmod -R 777 /var/www/html/Resource
-sudo php /var/www/html/PHP/RealTse/tseReady.php
-
-ServiceFileName=/etc/systemd/system/aaden-tse.service
-
-sudo touch $ServiceFileName
-sudo chmod 777 $ServiceFileName
-echo -e "
-[Unit]
-Description=Tse Service For Aaden
-
-[Service]
-Type=simple
-Restart=always
-RestartSec=1
-User=root
-ExecStart=/bin/bash /var/www/html/TseHost/tseServing.sh
-
-[Install]
-WantedBy=multi-user.target
-" > $ServiceFileName
-
-sudo systemctl start aaden-tse.service
-sudo systemctl enable aaden-tse.service
-echo 'YOU CAN USE aaden-cli check-tse to check tse status'
-sudo service aaden-tse start
-
-sudo php /var/www/html/PHP/RealTse/tseEnable.php
+#!/bin/bash
+
+sudo apt-get update -y
+sudo apt-get install default-jdk -y
+
+sudo chmod -R 777 /var/www/html/Resource
+sudo php /var/www/html/PHP/RealTse/tseReady.php
+
+ServiceFileName=/etc/systemd/system/aaden-tse.service
+
+sudo touch $ServiceFileName
+sudo chmod 777 $ServiceFileName
+echo -e "
+[Unit]
+Description=Tse Service For Aaden
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=root
+ExecStart=/bin/bash /var/www/html/TseHost/tseServing.sh
+
+[Install]
+WantedBy=multi-user.target
+" > $ServiceFileName
+
+sudo systemctl start aaden-tse.service
+sudo systemctl enable aaden-tse.service
+echo 'YOU CAN USE aaden-cli check-tse to check tse status'
+sudo service aaden-tse start
+
+sudo php /var/www/html/PHP/RealTse/tseEnable.php

package/AadenDeploy/Utils/updateDataBaseCharSet.sh

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

package/AadenDeploy/Utils/usbPrinterSetup.sh

@@ -1,11 +1,11 @@
-
-echo "------------------"
-echo "use fileName=$1 idVendor=$2"
-echo "------------------"
-
-sudo touch /etc/udev/rules.d/50-$1.rules
-sudo chmod 0777 /etc/udev/rules.d/50-$1.rules
-echo "SUBSYSTEMS=='usb', ATTRS{idVendor}=='$2', MODE='0777'" > /etc/udev/rules.d/50-$1.rules
-sudo udevadm control --reload
-
-echo "Config OK"
+
+echo "------------------"
+echo "use fileName=$1 idVendor=$2"
+echo "------------------"
+
+sudo touch /etc/udev/rules.d/50-$1.rules
+sudo chmod 0777 /etc/udev/rules.d/50-$1.rules
+echo "SUBSYSTEMS=='usb', ATTRS{idVendor}=='$2', MODE='0777'" > /etc/udev/rules.d/50-$1.rules
+sudo udevadm control --reload
+
+echo "Config OK"

package/AadenDeploy/Utils/wlansetup.sh

@@ -1,12 +1,12 @@
-echo "Setting up Wlan driver for HP"
-echo "Please use ctrl + pagedown to confirm later."
-echo "need to reboot and select enroll mok to complete install process"
-
-sudo apt-get install --reinstall git dkms build-essential linux-headers-$(uname -r) -y
-sudo mkdir rtl8821ce
-sudo chmod 0777 rtl8821ce
-git clone https://github.com/tomaspinho/rtl8821ce
-cd rtl8821ce
-chmod +x dkms-install.sh
-chmod +x dkms-remove.sh
-sudo ./dkms-install.sh
+echo "Setting up Wlan driver for HP"
+echo "Please use ctrl + pagedown to confirm later."
+echo "need to reboot and select enroll mok to complete install process"
+
+sudo apt-get install --reinstall git dkms build-essential linux-headers-$(uname -r) -y
+sudo mkdir rtl8821ce
+sudo chmod 0777 rtl8821ce
+git clone https://github.com/tomaspinho/rtl8821ce
+cd rtl8821ce
+chmod +x dkms-install.sh
+chmod +x dkms-remove.sh
+sudo ./dkms-install.sh