修正下載規則

.travis.yml

@@ -1,86 +0,0 @@
-language: php
-services:
-  - mysql
-php:
-  - 7.4
-sudo: enabled
-dist: xenial
-addons:
-  hosts:
-    - sspanel.test
-before_install:
-  - echo "$SHELL"
-  - echo "$TRAVIS_BUILD_DIR"
-  - echo $(whoami)
-  - sudo adduser www-data travis
-  - echo "==========================================================="
-  - echo "Install & upgrade linux packages"
-  - echo "==========================================================="
-  - sudo apt-get clean
-  - sudo add-apt-repository ppa:ondrej/php -y
-  - curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
-  # When setup Node, it has just helped me ran apt-get update.
-  - sudo apt-get -qq install -y nodejs php7.4-fpm php7.4-mysql php7.4-curl php7.4-gd php7.4-mbstring php7.4-xml php7.4-xmlrpc php7.4-opcache php7.4-zip php7.4-json php7.4-bz2 php7.4-bcmath nginx dash bash curl
-  - echo "==========================================================="
-  - echo "Configure MySQL"
-  - echo "==========================================================="
-  - sudo mysql -e "CREATE DATABASE sspanel; use sspanel; source sql/glzjin_all.sql;"
-  - sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('sspanel') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
-  - sudo mysql_upgrade -u root -psspanel
-  - sudo service mysql restart
-  - echo "==========================================================="
-  - echo "Configure Nginx"
-  - echo "==========================================================="
-  #- sudo sed -e "s?user www-data;?user travis;?g" --in-place /etc/nginx/nginx.conf
-  - sudo cat /etc/nginx/nginx.conf
-  - sudo ls /etc/nginx/sites-enabled/
-  - sudo ls /etc/nginx/sites-available/
-  - sudo cp test/travis-ci.conf /etc/nginx/sites-available/sspanel.test.conf
-  - sudo rm -rf /etc/nginx/sites-available/default
-  - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$TRAVIS_BUILD_DIR?g" --in-place /etc/nginx/sites-available/sspanel.test.conf
-  - sudo ln -s /etc/nginx/sites-available/sspanel.test.conf /etc/nginx/sites-enabled/
-  - sudo ls /etc/nginx/sites-enabled/
-  - sudo ls /etc/nginx/sites-available/
-  - sudo cat /etc/nginx/sites-enabled/sspanel.test.conf
-install:
-  - composer install
-  - echo "==========================================================="
-  - echo $(git log -1 --pretty=%B | grep 'skip lint')
-  - echo "==========================================================="
-  # I don't need npm audit when npm i. I will do it myself.
-  - npm set audit false
-  - if [[ ! -n "$(git log -1 --pretty=%B | grep 'skip lint')" ]]; then
-      npm i -g phplint;
-    fi
-  - if [[ ! -n "$(git log -1 --pretty=%B | grep 'skip lint')" ]]; then
-      cd test && git clone https://github.com/biinari/smarty-lint && cd .. ;
-    fi
-before_script:
-  - if [[ ! -n "$(git log -1 --pretty=%B | grep 'skip lint')" ]]; then
-      phplint '**/*.php' '!vendor/**';
-    fi
-  - chmod +x ./test/listTpl.sh
-  - if [[ ! -n "$(git log -1 --pretty=%B | grep 'skip lint')" ]]; then
-      ./test/listTpl.sh;
-    fi
-script:
-  - chmod +x test/test.sh
-  - sudo chmod -R 755 *
-  - cp test/config.php config/.config.php
-  - cp config/appprofile.example.php config/appprofile.php
-  - php xcat User createAdmin [email protected] test
-  - php xcat SyncRadius syncusers
-  - php xcat Tool initdownload
-  - php xcat Tool initQQWry
-  - arrcookie=($(php xcat User getCookie 1 | sed 's| |\n|g'))
-  - sudo service php7.4-fpm restart
-  - sudo nginx -c /etc/nginx/nginx.conf
-  - sudo chmod -R 777 $TRAVIS_BUILD_DIR
-  - sudo chown -R www-data:www-data $TRAVIS_BUILD_DIR
-  - ./test/test.sh ${arrcookie[0]} ${arrcookie[1]}
-  - sudo cat /var/log/nginx/access.log
-  - sudo cat /var/log/nginx/error.log
-cache:
-  directories:
-    - uim-index-dev/node_modules
-    - $HOME/.composer/cache/files

Dockerfile

@@ -12,7 +12,7 @@ RUN cp config/.config.example.php config/.config.php && \
     php composer-setup.php && \
     php composer.phar install && \
     php xcat initQQWry && \
-    php xcat initdownload && \
+    php xcat ClientDownload && \
     crontab -l | { cat; echo "30 22 * * * php /var/www/xcat sendDiaryMail"; } | crontab - && \
     crontab -l | { cat; echo "0 0 * * * php /var/www/xcat Job DailyJob"; } | crontab - && \
     crontab -l | { cat; echo "*/1 * * * * php /var/www/xcat Job CheckJob"; } | crontab - && \

src/Command/ClientDownload.php

@@ -50,13 +50,8 @@ class ClientDownload extends Command
             'savePath'  => 'public/clients/',
             'downloads' => [
                 [
-                    'sourceName' => 'Netch.x64-%tagName%.zip',
-                    'saveName'   => 'Netch-x64.zip',
-                    'apkpureUrl' => ''
-                ],
-                [
-                    'sourceName' => 'Netch.x86-%tagName%.zip',
-                    'saveName'   => 'Netch-x86.zip',
+                    'sourceName' => 'Netch.7z',
+                    'saveName'   => 'Netch.7z',
                     'apkpureUrl' => ''
                 ]
             ],
@@ -138,10 +133,25 @@ class ClientDownload extends Command
             'savePath'  => 'public/clients/',
             'downloads' => [
                 [
-                    'sourceName' => 'v2rayNG_%tagName%.apk',
+                    'sourceName' => 'v2rayNG_%tagName%_arm64-v8a.apk',
                     'saveName'   => 'v2rayng.apk',
                     'apkpureUrl' => ''
                 ],
+                [
+                    'sourceName' => 'v2rayNG_%tagName%_armeabi-v7a.apk',
+                    'saveName'   => 'v2rayng_armeabi-v7a.apk',
+                    'apkpureUrl' => ''
+                ],
+                [
+                    'sourceName' => 'v2rayNG_%tagName%_x86.apk',
+                    'saveName'   => 'v2rayng_x86.apk',
+                    'apkpureUrl' => ''
+                ],
+                [
+                    'sourceName' => 'v2rayNG_%tagName%_x86_64.apk',
+                    'saveName'   => 'v2rayng_x86_64.apk',
+                    'apkpureUrl' => ''
+                ],
             ],
         ],
         [