feat：添加队列

.zshrc

@@ -21405,6 +21405,7 @@ namespace  {
             class Notification extends \Illuminate\Support\Facades\Notification {}
             class Password extends \Illuminate\Support\Facades\Password {}
             class Process extends \Illuminate\Support\Facades\Process {}
+            class QrCode extends \SimpleSoftwareIO\QrCode\Facades\QrCode {}
             class Queue extends \Illuminate\Support\Facades\Queue {}
             class RateLimiter extends \Illuminate\Support\Facades\RateLimiter {}
             class Redirect extends \Illuminate\Support\Facades\Redirect {}
@@ -21418,7 +21419,6 @@ namespace  {
             class URL extends \Illuminate\Support\Facades\URL {}
             class Validator extends \Illuminate\Support\Facades\Validator {}
             class View extends \Illuminate\Support\Facades\View {}
-            class QrCode extends \SimpleSoftwareIO\QrCode\Facades\QrCode {}
     }
 
 

app/Jobs/AutoFinishOrder.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Enums\OrderRecordStatus;
+use App\Enums\OrderStatus;
+use App\Models\CoachUser;
+use App\Models\Order;
+use App\Models\OrderRecord;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class AutoFinishOrder implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * 任务最大尝试次数
+     *
+     * @var int
+     */
+    public $tries = 3;
+
+    /**
+     * 任务运行的超时时间
+     *
+     * @var int
+     */
+    public $timeout = 120;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(
+        public Order $order
+    ) {}
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        try {
+            DB::transaction(function () {
+                // 获取订单信息并加锁
+                $order = Order::query()
+                    ->with(['project'])
+                    ->where('id', $this->order->id)
+                    ->lockForUpdate()
+                    ->first();
+
+                // 检查订单是否存在
+                if (! $order) {
+                    Log::error('自动结束订单失败 - 订单不存在', [
+                        'order_id' => $this->order->id,
+                    ]);
+
+                    return;
+                }
+
+                // 检查订单状态是否为服务中
+                if ($order->state !== OrderStatus::SERVING->value) {
+                    Log::info('自动结束订单跳过 - 订单状态不是服务中', [
+                        'order_id' => $order->id,
+                        'current_state' => $order->state,
+                    ]);
+
+                    return;
+                }
+
+                // 更新订单状态为已完成
+                $order->state = OrderStatus::FINISHED->value;
+                $order->finished_at = now();
+                $order->save();
+
+                // 记录订单状态变更日志
+                OrderRecord::create([
+                    'order_id' => $order->id,
+                    'state' => OrderRecordStatus::FINISHED->value,
+                    'object_id' => $order->coach_id,
+                    'object_type' => CoachUser::class,
+                    'remark' => '系统自动完成服务',
+                ]);
+
+                // TODO: 发送通知给用户和技师
+                // event(new OrderFinishedEvent($order));
+
+                Log::info('自动结束订单成功', [
+                    'order_id' => $order->id,
+                    'finished_at' => $order->finished_at,
+                ]);
+            });
+        } catch (\Exception $e) {
+            Log::error('自动结束订单失败', [
+                'order_id' => $this->order->id,
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+            throw $e;
+        }
+    }
+
+    /**
+     * 处理失败的任务
+     */
+    public function failed(\Throwable $exception): void
+    {
+        Log::error('自动结束订单任务执行失败', [
+            'order_id' => $this->order->id,
+            'error' => $exception->getMessage(),
+            'trace' => $exception->getTraceAsString(),
+        ]);
+    }
+}

script/ansible/README.md

@@ -1,3 +1,45 @@
 # 自动部署工具使用说明
 
+## 可用命令
 
+1. `./bin/mydeploy` - 部署项目
+2. `./bin/myfrp` - 配置 frp 客户端
+3. `./bin/myssh` - SSH 连接到服务器
+4. `./bin/mysupervisor` - 配置 Laravel 队列监控
+
+## Supervisor 配置说明
+
+使用 `./bin/mysupervisor` 命令可以：
+
+1. 安装 supervisor
+2. 配置 Laravel 队列处理进程
+3. 自动启动队列处理
+4. 设置日志记录
+5. 配置进程自动重启
+
+### 配置详情：
+
+-   运行 2 个队列处理进程
+-   日志位置：/www/wwwroot/xiaoding/storage/logs/worker.log
+-   进程用户：www
+-   自动重启：是
+-   最大运行时间：3600 秒
+
+### 常用 supervisor 命令：
+
+```bash
+# 查看所有进程状态
+supervisorctl status
+
+# 启动所有进程
+supervisorctl start all
+
+# 停止所有进程
+supervisorctl stop all
+
+# 重启所有进程
+supervisorctl restart all
+
+# 重新加载配置
+supervisorctl reload
+```

script/ansible/bin/mysupervisor

@@ -0,0 +1,3 @@
+#!/bin/bash
+cd script/ansible/bin
+ansible-playbook ../supervisor_playbook.yml -i ../inventory/hosts "$@"

script/ansible/inventory/hosts

@@ -3,3 +3,6 @@
 
 [frpclient]
 192.168.110.85 ansible_ssh_user=root ansible_python_interpreter=/usr/bin/python3.12
+
+[mylocalhost]
+127.0.0.1 ansible_ssh_user=root ansible_python_interpreter=/usr/bin/python3.12

script/ansible/supervisor_playbook.yml

@@ -0,0 +1,71 @@
+---
+- name: Setup and manage Laravel queue supervisor
+  hosts: mylocalhost
+  become: true
+  vars:
+    deploy_path: /www/wwwroot/owl-admin
+    app_user: www
+    app_group: www
+
+  tasks:
+    - name: Install supervisor
+      apt:
+        name: supervisor
+        state: present
+        update_cache: yes
+
+    - name: Create Laravel queue supervisor config
+      copy:
+        dest: /etc/supervisor/conf.d/laravel-queue.conf
+        content: |
+          [program:laravel-queue]
+          process_name=%(program_name)s_%(process_num)02d
+          command=php {{ deploy_path }}/artisan queue:work --sleep=2 --tries=2 --max-time=3600
+          autostart=true
+          autorestart=true
+          stopasgroup=true
+          killasgroup=true
+          user={{ app_user }}
+          numprocs=2
+          redirect_stderr=true
+          stdout_logfile={{ deploy_path }}/storage/logs/worker.log
+          stopwaitsecs=3600
+          startretries=3
+        mode: "0644"
+
+    - name: Ensure supervisor service is running
+      systemd:
+        name: supervisor
+        state: started
+        enabled: true
+
+    - name: Create log directory
+      file:
+        path: "{{ deploy_path }}/storage/logs"
+        state: directory
+        owner: "{{ app_user }}"
+        group: "{{ app_group }}"
+        mode: "0755"
+
+    - name: Create worker log file
+      file:
+        path: "{{ deploy_path }}/storage/logs/worker.log"
+        state: touch
+        owner: "{{ app_user }}"
+        group: "{{ app_group }}"
+        mode: "0644"
+
+    - name: Reload supervisor configuration
+      shell: supervisorctl reread && supervisorctl update
+
+    - name: Start Laravel queue workers
+      shell: supervisorctl start laravel-queue:*
+
+    - name: Check supervisor status
+      shell: supervisorctl status
+      register: supervisor_status
+      changed_when: false
+
+    - name: Display supervisor status
+      debug:
+        var: supervisor_status.stdout_lines