Merge branch 'cedar2025:master' into master

Author: lithromantic

.docker/supervisor/supervisord.conf

@@ -61,4 +61,21 @@ stopwaitsecs=3
 stopsignal=TERM
 stopasgroup=true
 killasgroup=true
-priority=300 
+priority=300
+
+[program:ws-server]
+process_name=%(program_name)s_%(process_num)02d
+command=php /www/artisan ws-server start
+autostart=%(ENV_ENABLE_WS_SERVER)s
+autorestart=true
+user=www
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stdout_logfile_backups=0
+numprocs=1
+stopwaitsecs=5
+stopsignal=SIGINT
+stopasgroup=true
+killasgroup=true
+priority=400 

.env.example

@@ -1,5 +1,5 @@
 APP_NAME=XBoard
-APP_ENV=local
+APP_ENV=production
 APP_KEY=base64:PZXk5vTuTinfeEVG5FpYv2l6WEhLsyvGpiWK7IgJJ60=
 APP_DEBUG=false
 APP_URL=http://localhost

.github/workflows/docker-publish.yml

@@ -58,7 +58,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
-            type=sha,format=long
+            type=sha,format=short,prefix=,enable=true
             type=raw,value=new,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
             type=raw,value=${{ steps.get_version.outputs.version }}
@@ -98,12 +98,3 @@ jobs:
           allow: |
             network.host
 
-      - name: Install cosign
-        uses: sigstore/cosign-installer@v3.4.0
-        with:
-          cosign-release: 'v2.2.2'
-
-      - name: Sign image
-        if: steps.build-and-push.outputs.digest != ''
-        run: |
-          echo "${{ steps.meta.outputs.tags }}" | xargs -I {} cosign sign --yes "{}@${{ steps.build-and-push.outputs.digest }}"

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "public/assets/admin"]
+	path = public/assets/admin
+	url = https://github.com/cedar2025/xboard-admin-dist.git

Dockerfile

@@ -25,20 +25,23 @@ RUN echo "Attempting to clone branch: ${BRANCH_NAME} from ${REPO_URL} with CACHE
     rm -rf ./* && \
     rm -rf .git && \
     git config --global --add safe.directory /www && \
-    git clone --depth 1 --branch ${BRANCH_NAME} ${REPO_URL} .
+    git clone --depth 1 --branch ${BRANCH_NAME} ${REPO_URL} . && \
+    git submodule update --init --recursive --force
 
 COPY .docker/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 RUN composer install --no-cache --no-dev \
     && php artisan storage:link \
+    && cp -r plugins/ /opt/default-plugins/ \
     && chown -R www:www /www \
     && chmod -R 775 /www \
     && mkdir -p /data \
     && chown redis:redis /data
 
 ENV ENABLE_WEB=true \
     ENABLE_HORIZON=true \
-    ENABLE_REDIS=false 
+    ENABLE_REDIS=false \
+    ENABLE_WS_SERVER=false
 
 EXPOSE 7001
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] 
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] 

app/Console/Commands/CheckCommission.php

@@ -104,9 +104,9 @@ public function payHandle($inviteUserId, Order $order)
             $commissionBalance = $order->commission_balance * ($commissionShareLevels[$l] / 100);
             if (!$commissionBalance) continue;
             if ((int)admin_setting('withdraw_close_enable', 0)) {
-                $inviter->balance = $inviter->balance + $commissionBalance;
+                $inviter->increment('balance', $commissionBalance);
             } else {
-                $inviter->commission_balance = $inviter->commission_balance + $commissionBalance;
+                $inviter->increment('commission_balance', $commissionBalance);
             }
             if (!$inviter->save()) {
                 DB::rollBack();

app/Console/Commands/CheckOrder.php

@@ -43,12 +43,11 @@ public function __construct()
      */
     public function handle()
     {
-        ini_set('memory_limit', -1);
-        $orders = Order::whereIn('status', [Order::STATUS_PENDING, Order::STATUS_PROCESSING])
+        Order::whereIn('status', [Order::STATUS_PENDING, Order::STATUS_PROCESSING])
             ->orderBy('created_at', 'ASC')
-            ->get();
-        foreach ($orders as $order) {
-            OrderHandleJob::dispatch($order->trade_no);
-        }
+            ->lazyById(200)
+            ->each(function ($order) {
+                OrderHandleJob::dispatch($order->trade_no);
+            });
     }
 }

app/Console/Commands/CheckTicket.php

@@ -38,15 +38,14 @@ public function __construct()
      */
     public function handle()
     {
-        ini_set('memory_limit', -1);
-        $tickets = Ticket::where('status', 0)
+        Ticket::where('status', 0)
             ->where('updated_at', '<=', time() - 24 * 3600)
             ->where('reply_status', 0)
-            ->get();
-        foreach ($tickets as $ticket) {
-            if ($ticket->user_id === $ticket->last_reply_user_id) continue;
-            $ticket->status = Ticket::STATUS_CLOSED;
-            $ticket->save();
-        }
+            ->lazyById(200)
+            ->each(function ($ticket) {
+                if ($ticket->user_id === $ticket->last_reply_user_id) return;
+                $ticket->status = Ticket::STATUS_CLOSED;
+                $ticket->save();
+            });
     }
 }

app/Console/Commands/CheckTrafficExceeded.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use App\Models\User;
+use App\Services\NodeSyncService;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Redis;
+
+class CheckTrafficExceeded extends Command
+{
+    protected $signature = 'check:traffic-exceeded';
+    protected $description = '检查流量超标用户并通知节点';
+
+    public function handle()
+    {
+        $count = Redis::scard('traffic:pending_check');
+        if ($count <= 0) {
+            return;
+        }
+
+        $pendingUserIds = array_map('intval', Redis::spop('traffic:pending_check', $count));
+
+        $exceededUsers = User::toBase()
+            ->whereIn('id', $pendingUserIds)
+            ->whereRaw('u + d >= transfer_enable')
+            ->where('transfer_enable', '>', 0)
+            ->where('banned', 0)
+            ->select(['id', 'group_id'])
+            ->get();
+
+        if ($exceededUsers->isEmpty()) {
+            return;
+        }
+
+        $groupedUsers = $exceededUsers->groupBy('group_id');
+        $notifiedCount = 0;
+
+        foreach ($groupedUsers as $groupId => $users) {
+            if (!$groupId) {
+                continue;
+            }
+
+            $userIdsInGroup = $users->pluck('id')->toArray();
+            $servers = Server::whereJsonContains('group_ids', (string) $groupId)->get();
+
+            foreach ($servers as $server) {
+                if (!NodeSyncService::isNodeOnline($server->id)) {
+                    continue;
+                }
+
+                NodeSyncService::push($server->id, 'sync.user.delta', [
+                    'action' => 'remove',
+                    'users' => array_map(fn($id) => ['id' => $id], $userIdsInGroup),
+                ]);
+                $notifiedCount++;
+            }
+        }
+
+        $this->info("Checked " . count($pendingUserIds) . " users, notified {$notifiedCount} nodes for " . $exceededUsers->count() . " exceeded users.");
+    }
+}