refactor: update qqwry.dat directly via wget

Dockerfile

@@ -13,7 +13,6 @@ RUN cp config/.config.example.php "config/.config.php" && \
     php composer.phar && \
     php composer.phar config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true && \
     php composer.phar install && \
-    php xcat initQQWry && \
     php xcat ClientDownload && \
     crontab -l | { cat; echo "30 23 * * * php /var/www/xcat SendDiaryMail"; } | crontab - && \
     crontab -l | { cat; echo "0 0 * * * php /var/www/xcat Job DailyJob"; } | crontab - && \

install.sh

@@ -21,9 +21,6 @@ do_install_sspanel() {
     wget https://getcomposer.org/installer -O composer.phar
     php composer.phar
     php composer.phar install
-    echo "Updating File Permission..."
-    chmod 755 -R *
-    chown www -R *
     echo "Writting configuration..."
     sed -i -e "s/$_ENV['key']        = 'ChangeMe';/$_ENV['key']        = '$key';/g" \
     -e "s/$_ENV['appName']    = 'SSPanel-UIM';/$_ENV['appName']    = '$app_name';/g" \
@@ -43,7 +40,7 @@ do_install_sspanel() {
     echo "Importing config to database..."
     php vendor/bin/phinx migrate
     php xcat Tool importAllSettings
-    php xcat Tool initQQwry
+    wget https://cdn.jsdelivr.net/gh/sspanel-uim/qqwry.dat@latest/qqwry.dat -O storage/qqwry.dat
     current_dir=$(pwd)
     crontab -l > cron.tmp
     echo "*/1 * * * * /usr/bin/php $current_dir/xcat Job CheckJob" >> cron.tmp
@@ -51,6 +48,9 @@ do_install_sspanel() {
     echo "0 0 * * *   /usr/bin/php -n $current_dir/xcat Job DailyJob" >> cron.tmp
     crontab cron.tmp
     rm cron.tmp
+    echo "Updating File Permission..."
+    chmod 755 -R *
+    chown www -R *
     echo "Installation completed! Now you can create your first admin user by running 'php xcat createAdmin'."
 }
 

src/Command/Job.php

@@ -165,10 +165,6 @@ EOL;
         }
         // ------- 用户每日流量报告
 
-        // ------- 更新 IP 库
-        (new Tool($this->argv))->initQQWry();
-        // ------- 更新 IP 库
-
         // ------- 发送系统运行状况通知
         $sts = new Analytics();
         if (Setting::obtain('telegram_diary')) {

src/Command/Tool.php

@@ -18,7 +18,6 @@ final class Tool extends Command
 {
     public $description = <<<EOL
 ├─=: php xcat Tool [选项]
-│ ├─ initQQWry               - 下载 IP 解析库
 │ ├─ setTelegram             - 设置 Telegram 机器人
 │ ├─ resetAllSettings        - 使用默认值覆盖设置中心设置
 │ ├─ exportAllSettings       - 导出所有设置
@@ -50,37 +49,6 @@ EOL;
         }
     }
 
-    public function initQQWry(): void
-    {
-        echo '正在下载或更新纯真 IP 数据库...' . PHP_EOL;
-        $path = BASE_PATH . '/storage/qqwry.dat';
-        $qqwry = file_get_contents('https://cdn.jsdelivr.net/gh/sspanel-uim/qqwry.dat@latest/qqwry.dat');
-        if ($qqwry !== '') {
-            if (is_file($path)) {
-                rename($path, $path . '.bak');
-            }
-            $fp = fopen($path, 'wb');
-            if ($fp) {
-                fwrite($fp, $qqwry);
-                fclose($fp);
-                echo '纯真 IP 数据库下载成功.' . PHP_EOL;
-                $iplocation = new QQWry();
-                $location = $iplocation->getlocation('8.8.8.8');
-                $Userlocation = $location['country'];
-                if (iconv('gbk', 'utf-8//IGNORE', $Userlocation) !== '美国') {
-                    unlink($path);
-                    if (is_file($path . '.bak')) {
-                        rename($path . '.bak', $path);
-                    }
-                }
-            } else {
-                echo '纯真 IP 数据库保存失败，请检查权限' . PHP_EOL;
-            }
-        } else {
-            echo '纯真 IP 数据库下载失败，请检查下载地址' . PHP_EOL;
-        }
-    }
-
     public function setTelegram(): void
     {
         $WebhookUrl = $_ENV['baseUrl'] . '/telegram_callback?token=' . $_ENV['telegram_request_token'];

src/Command/Update.php

@@ -20,12 +20,6 @@ final class Update extends Command
 
         echo PHP_EOL;
 
-        echo '开始升级 QQWry...' . PHP_EOL;
-        (new Tool($this->argv))->initQQWry();
-        echo '升级 QQWry结束' . PHP_EOL;
-
-        echo PHP_EOL;
-
         $config_old = file_get_contents(BASE_PATH . '/config/.config.php');
         $config_new = file_get_contents(BASE_PATH . '/config/.config.example.php');
 

update.sh

@@ -2,7 +2,7 @@
 
 [ $(id -u) != "0" ] && { echo "Error: You must be root to run this script!"; exit 1; }
 
-do_upgrade_sspanel(){
+do_update_sspanel(){
     git pull
     git reset --hard origin/dev
     git fetch --prune --prune-tags
@@ -12,6 +12,7 @@ do_upgrade_sspanel(){
     php vendor/bin/phinx migrate
     php xcat Update
     php xcat Tool importAllSettings
+    wget https://cdn.jsdelivr.net/gh/sspanel-uim/qqwry.dat@latest/qqwry.dat -O storage/qqwry.dat 
 }
 
-do_upgrade_sspanel
+do_update_sspanel