Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -197,11 +197,11 @@ class countProject extends Command
     public function countAll(){
     public function countAll(){
         $projectModel = new Project();
         $projectModel = new Project();
         $data['count'] = $projectModel->counts(['deleted_at'=>0]);//所有项目总数
         $data['count'] = $projectModel->counts(['deleted_at'=>0]);//所有项目总数
-        $data['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'deleted_at'=>0]);//上线项目总数
-        $data['promotion_web_count'] = $projectModel->counts(['type'=>3,'deleted_at'=>0]);//推广项目总数
-        $data['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_at'=>0]);//建站项目总数
-        $data['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'deleted_at'=>0]);//未上线项目数量
-        $data['delete_project_count'] = $projectModel->counts(['deleted_at'=>1]);//删除项目数量
+        $data['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'delete_status'=>0]);//上线项目总数
+        $data['promotion_web_count'] = $projectModel->counts(['type'=>3,'delete_status'=>0]);//推广项目总数
+        $data['create_web_count'] = $projectModel->counts(['type'=>2,'delete_status'=>0]);//建站项目总数
+        $data['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'delete_status'=>0]);//未上线项目数量
+        $data['delete_project_count'] = $projectModel->counts(['delete_status'=>1]);//删除项目数量
         $min_info = $projectModel->select('*')
         $min_info = $projectModel->select('*')
             ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
             ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
             ->whereNotNull('uptime')   // 确保 uptime 字段不为空
             ->whereNotNull('uptime')   // 确保 uptime 字段不为空

+<?php
+
+namespace App\Http\Controllers\Aside\PackDir;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Devops\Servers;
+use App\Models\Devops\ServersIp;
+use App\Models\Domain\DomainInfo;
+use App\Models\Manage\Manage;
+use App\Models\PackDir\SitePackTask;
+use App\Models\Project\Project;
+
+class PackDirController extends BaseController
+{
+    /**
+     * 获取打包静态页面任务列表
+     * @author Akun
+     * @date 2024/10/08 16:12
+     */
+    public function getTaskLists()
+    {
+        $autoModule = new SitePackTask();
+        $lists = $autoModule->lists($this->map, $this->page, $this->row);
+        if (!empty($lists)) {
+            $projectModel = new Project();
+            $manageModel = new Manage();
+            $serverModel = new Servers();
+            $domainModel = new DomainInfo();
+            foreach ($lists['list'] as $k => $v) {
+                $lists['list'][$k]['operator_name'] = $manageModel->getName($v['user_id']);
+                $lists['list'][$k]['project_name'] = $projectModel->getProjectName($v['project_id']);
+
+                $download_url = '';
+                if ($v['status'] == 2) {
+                    $server_info = $serverModel->read(['id' => $v['server_id']], ['init_domain']);
+                    $domain_info = $domainModel->read(['project_id' => $v['project_id']], ['domain']);
+                    if ($server_info && $domain_info) {
+                        $download_url = 'https://' . $server_info['init_domain'] . '/pack_sites/' . $domain_info['domain'] . '.zip';
+                    }
+                }
+                $lists['list'][$k]['download_url'] = $download_url;
+            }
+        }
+
+        $this->response('success', Code::SUCCESS, $lists);
+    }
+
+    /**
+     * 添加静态页面打包任务
+     * @throws \App\Exceptions\AsideGlobalException
+     * @author Akun
+     * @date 2024/10/08 16:39
+     */
+    public function saveTask()
+    {
+        $this->request->validate([
+            'project_id' => 'required',
+        ], [
+            'server_id.required' => '项目不能为空'
+        ]);
+
+        $domainModel = new DomainInfo();
+        $domain_info = $domainModel->read(['project_id' => $this->param['project_id']], ['domain']);
+        if (!$domain_info) {
+            $this->fail('项目未上线，无法打包静态页面');
+        }
+        $projectModel = new Project();
+        $project_info = $projectModel->read(['id' => $this->param['project_id']], ['serve_id']);
+        if (!$project_info) {
+            $this->fail('未查询到项目所属服务器信息');
+        }
+        $serverIpModel = new ServersIp();
+        $server_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+        if (!$server_ip_info) {
+            $this->fail('未查询到项目所属服务器信息');
+        }
+
+        $data = [
+            'user_id' => $this->uid,
+            'project_id' => $this->param['project_id'],
+            'server_id' => $server_ip_info['servers_id']
+        ];
+        $model = new SitePackTask();
+        $pack_info = $model->read(array_merge($data, ['status' => ['in', [SitePackTask::STATUS_UN, SitePackTask::STATUS_ING]]]));
+        if ($pack_info) {
+            $this->fail('当前项目已有打包任务进行中，请勿重复提交');
+        }
+        $model->add($data);
+
+        $this->response('success');
+    }
+}

+<?php
+
+namespace App\Models\PackDir;
+
+use App\Models\Base;
+
+class SitePackTask extends Base
+{
+    protected $table = 'gl_site_pack_task';
+
+    const STATUS_UN = 0;
+    const STATUS_ING = 1;
+    const STATUS_SUC = 2;
+    const STATUS_FAL = 3;
+    const STATUS_EXP = 4;
+}

@@ -473,6 +473,13 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/saveTask', [Aside\AutoPull\AutoPullController::class, 'saveTask'])->name('admin.auto_pull_saveTask');
         Route::any('/saveTask', [Aside\AutoPull\AutoPullController::class, 'saveTask'])->name('admin.auto_pull_saveTask');
         Route::any('/taskMap', [Aside\AutoPull\AutoPullController::class, 'taskMap'])->name('admin.auto_pull_taskMap');
         Route::any('/taskMap', [Aside\AutoPull\AutoPullController::class, 'taskMap'])->name('admin.auto_pull_taskMap');
     });
     });
+    /**
+     * 打包静态页面模块
+     */
+    Route::prefix('pack_dir')->group(function () {
+        Route::any('/', [Aside\PackDir\PackDirController::class, 'getTaskLists'])->name('admin.pack_dir_getTaskLists');
+        Route::any('/saveTask', [Aside\PackDir\PackDirController::class, 'saveTask'])->name('admin.pack_dir_saveTask');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组