Merge pull request #225 from 4x99/develop

v1.6.2

Author: yoonper

.env.docker-compose.example

@@ -7,7 +7,7 @@ MYSQL_PORT=3306
 # MySQL 数据库名
 MYSQL_DATABASE=code6
 
-# MySQL 用户名
+# MySQL 用户名（请使用非 root 用户）
 MYSQL_USER=
 
 # MySQL 密码

Dockerfile

@@ -19,7 +19,7 @@ RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak;\
 echo 'deb http://mirrors.aliyun.com/debian buster main' >> /etc/apt/sources.list;\
 echo 'deb http://mirrors.aliyun.com/debian buster-updates main' >> /etc/apt/sources.list;\
 apt-get update;\
-apt-get install -y --allow-downgrades zip cron vim zlib1g=1:1.2.11.dfsg-1 zlib1g-dev libpng-dev;\
+apt-get install -y --allow-downgrades zip cron vim zlib1g=1:1.2.11.dfsg-1+deb10u1 zlib1g-dev libpng-dev;\
 rm -rf /var/lib/apt/lists/*;\
 # 安装 PHP 扩展
 docker-php-ext-install pdo_mysql;\

app/Console/Commands/JobRunCommand.php

@@ -98,6 +98,7 @@ public function handle()
                 $lastResponse = ResponseMediator::getPagination($client->getLastResponse());
             } while ($lastResponse['next'] && (++$page <= $configJob->scan_page));
             $configJob->save();
+            $job->delete();
         }
 
         $this->log->info('Work done');
@@ -127,7 +128,6 @@ private function takeJob()
         if (!$job = QueueJob::orderBy('created_at')->first()) {
             return false;
         }
-        $job->delete();
         return $job;
     }
 

app/Http/Controllers/ConfigJobController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\ConfigJob;
+use App\Models\QueueJob;
 use Cron\CronExpression;
 use Illuminate\Http\Request;
 
@@ -111,6 +112,20 @@ public function batchDestroy(Request $request)
         }
     }
 
+    /**
+     * 任务队列
+     *
+     * @return array
+     */
+    public function queue()
+    {
+        $data = QueueJob::orderBy('created_at')->get();
+        foreach ($data as $k => $v) {
+            $data[$k]['status'] = $k == 0 ? 1 : 0;
+        }
+        return $data;
+    }
+
     /**
      * 下次扫描时间
      *

app/Services/GitHubService.php

@@ -44,7 +44,7 @@ public function __construct()
      */
     public function init()
     {
-        $this->proxy = $this->testProxy($this->proxy) ? $this->proxy : null;
+        $this->proxy = $this->proxy ? ($this->testProxy($this->proxy) ? $this->proxy : null) : null;
         $tokens = ConfigToken::inRandomOrder()->get()->pluck('token');
         foreach ($tokens as $token) {
             $client = ['token' => $token];

composer.lock

@@ -24,7 +24,7 @@ MYSQL_PORT=3306
 # MySQL 数据库名
 MYSQL_DATABASE=code6
 
-# MySQL 用户名
+# MySQL 用户名（请使用非 root 用户）
 MYSQL_USER=
 
 # MySQL 密码

doc/deploy-docker-compose.md

@@ -87,7 +87,6 @@ crontab -e -u <用户>
 
 ## 创建用户
 ```
-docker exec -it code6-server /bin/bash
 php artisan code6:user-add <邮箱> <密码>
 ```
 

doc/deploy-source.md

@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   mysql:
-    image: mysql/mysql-server
+    image: mysql/mysql-server:5.7
     container_name: code6-mysql
     restart: always
     env_file:

docker-compose.yaml

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # 项目配置
-cp .env.example .env
+cp -i .env.example .env
 chmod -R 755 storage
 chown -R www-data:www-data storage
 php artisan key:generate