优化访问接口报错Server internal error

server/app/api/controller/GameController.php

@@ -3,6 +3,7 @@ declare(strict_types=1);
 
 namespace app\api\controller;
 
+use support\Log;
 use support\Request;
 use support\Response;
 use app\api\logic\GameLogic;
@@ -110,10 +111,13 @@ class GameController extends OpenController
                     'roll_array'         => '[]',
                     'status'             => PlayStartLogic::RECORD_STATUS_TIMEOUT,
                 ]);
-            } catch (\Throwable $_) {
+            } catch (\Exception $e) {
+                $timeout_message = $e->getMessage();
+                Log::error("游玩记录写入超时: ". $e->getMessage());
             }
+
             $payload = $timeoutRecord ? ['record' => $timeoutRecord->toArray()] : [];
-            return $this->success($payload, '服务超时');
+            return $this->success($payload, '服务超时，'.$timeout_message ?? '没有原因');
         }
     }
 }

server/app/api/logic/PlayStartLogic.php

@@ -12,6 +12,7 @@ use app\dice\model\player_ticket_record\DicePlayerTicketRecord;
 use app\dice\model\player_wallet_record\DicePlayerWalletRecord;
 use app\dice\model\reward_config\DiceRewardConfig;
 use plugin\saiadmin\exception\ApiException;
+use support\Log;
 use support\think\Cache;
 use support\think\Db;
 
@@ -69,19 +70,49 @@ class PlayStartLogic
             throw new ApiException('奖池配置不存在');
         }
 
+        // 先按奖池权重抽出档位 T1-T5
         $tier = LotteryService::drawTierByWeights($config);
-        $rewards = DiceRewardConfig::where('tier', $tier)->select();
-        if ($rewards->isEmpty()) {
+
+        // 生成 5 个 1-6 的点数，计算总和 roll_number（即本局摇到的点数）
+        $rollArray = $this->generateRollArray();
+        $rollNumber = (int) array_sum($rollArray);
+
+        // 索引范围为 0~25 共 26 个格子
+        $boardSize = 26;
+
+        // 1. 根据抽到的档位，在 tier 相等的数据中任选一条，其 id 为结束索引 target_index
+        $tierRewards = DiceRewardConfig::where('tier', $tier)->select()->toArray();
+        if (empty($tierRewards)) {
+            Log::error("档位 {$tier} 无任何奖励配置");
             throw new ApiException('该档位暂无奖励配置');
         }
-        $rewardList = $rewards->all();
-        $reward = $rewardList[array_rand($rewardList)];
+        $chosen = $tierRewards[array_rand($tierRewards)];
+        $reward = DiceRewardConfig::find($chosen['id']);
+        if (!$reward) {
+            throw new ApiException('奖励配置不存在');
+        }
+        $targetIndex = (int) $reward->id;
+        $targetIndex = (($targetIndex % $boardSize) + $boardSize) % $boardSize;
+
+        // 2. 根据结果反推起始点 start_index（由 target_index 与方向反算）
+        // 顺时针(direction=0): targetIndex = (startIndex + rollNumber) % 26  =>  startIndex = (targetIndex - rollNumber) % 26
+        // 逆时针(direction=1): targetIndex = (startIndex - rollNumber) % 26  =>  startIndex = (targetIndex + rollNumber) % 26
+        if ($direction === 0) {
+            $startIndex = ($targetIndex - $rollNumber) % $boardSize;
+        } else {
+            $startIndex = ($targetIndex + $rollNumber) % $boardSize;
+        }
+        $startIndex = ($startIndex % $boardSize + $boardSize) % $boardSize;
+
+        Log::info(sprintf(
+            '摇取点数 roll_number=%d, 方向=%d, start_index=%d, target_index=%d',
+            $rollNumber,
+            $direction,
+            $startIndex,
+            $targetIndex
+        ));
         $realEv = (float) $reward->real_ev;
         $winCoin = 100 + $realEv; // 赢取平台币 = 100 + DiceRewardConfig.real_ev
-        $gridNumber = (int) $reward->grid_number;
-        $startIndex = (int) Cache::get(LotteryService::getStartIndexKey($playerId), 0);
-        $targetIndex = (int) $reward->id;
-        $rollArray = $this->generateRollArray($gridNumber);
 
         $record = null;
         $configId = (int) $config->id;
@@ -162,8 +193,6 @@ class PlayStartLogic
                     'wallet_after'   => $coinAfter,
                     'remark'         => '抽奖|play_record_id=' . $record->id,
                 ]);
-
-                Cache::set(LotteryService::getStartIndexKey($playerId), $targetIndex, 86400 * 30);
             });
         } catch (\Throwable $e) {
             if ($record === null) {
@@ -202,23 +231,13 @@ class PlayStartLogic
         return $arr;
     }
 
-    /** 生成 5 个 1-6 的点数，和为 grid_number（5~30），严格不超范围 */
-    private function generateRollArray(int $gridNumber): array
+    /** 生成 5 个 1-6 的点数，roll_number 为其总和 */
+    private function generateRollArray(): array
     {
-        $minSum = 5;
-        $maxSum = 30;
-        $n = max($minSum, min($maxSum, $gridNumber));
-        $dice = [1, 1, 1, 1, 1];
-        $remain = $n - 5;
-        while ($remain > 0) {
-            $i = array_rand($dice);
-            if ($dice[$i] < 6) {
-                $add = min($remain, 6 - $dice[$i]);
-                $dice[$i] += $add;
-                $remain -= $add;
-            }
+        $dice = [];
+        for ($i = 0; $i < 5; $i++) {
+            $dice[] = random_int(1, 6);
         }
-        shuffle($dice);
         return $dice;
     }
 }

server/plugin/saiadmin/app/controller/SystemController.php

@@ -33,24 +33,26 @@ class SystemController extends BaseController
      */
     public function userInfo(): Response
     {
-        $info['user'] = $this->adminInfo;
+        if ($this->adminInfo === null || !is_array($this->adminInfo) || !isset($this->adminInfo['id'])) {
+            return $this->fail('登录已过期或用户信息无效，请重新登录', 401);
+        }
         $info = [];
         $info['id'] = $this->adminInfo['id'];
         $info['username'] = $this->adminInfo['username'];
-        $info['dashboard'] = $this->adminInfo['dashboard'];
-        $info['avatar'] = $this->adminInfo['avatar'];
-        $info['email'] = $this->adminInfo['email'];
-        $info['phone'] = $this->adminInfo['phone'];
-        $info['gender'] = $this->adminInfo['gender'];
-        $info['signed'] = $this->adminInfo['signed'];
-        $info['realname'] = $this->adminInfo['realname'];
-        $info['department'] = $this->adminInfo['deptList'];
-        if ($this->adminInfo['id'] === 1) {
+        $info['dashboard'] = $this->adminInfo['dashboard'] ?? '';
+        $info['avatar'] = $this->adminInfo['avatar'] ?? '';
+        $info['email'] = $this->adminInfo['email'] ?? '';
+        $info['phone'] = $this->adminInfo['phone'] ?? '';
+        $info['gender'] = $this->adminInfo['gender'] ?? '';
+        $info['signed'] = $this->adminInfo['signed'] ?? '';
+        $info['realname'] = $this->adminInfo['realname'] ?? '';
+        $info['department'] = $this->adminInfo['deptList'] ?? [];
+        if ((int) $this->adminInfo['id'] === 1) {
             $info['buttons'] = ['*'];
             $info['roles'] = ['super_admin'];
         } else {
             $info['buttons'] = UserAuthCache::getUserAuth($this->adminInfo['id']);
-            $info['roles'] = Arr::getArrayColumn($this->adminInfo['roleList'], 'code');
+            $info['roles'] = Arr::getArrayColumn($this->adminInfo['roleList'] ?? [], 'code');
         }
         return $this->success($info);
     }
@@ -70,6 +72,9 @@ class SystemController extends BaseController
      */
     public function menu(): Response
     {
+        if ($this->adminInfo === null || !is_array($this->adminInfo) || !isset($this->adminInfo['id'])) {
+            return $this->fail('登录已过期或用户信息无效，请重新登录', 401);
+        }
         $data = UserMenuCache::getUserMenu($this->adminInfo['id']);
         return $this->success($data);
     }

server/plugin/saiadmin/app/exception/Handler.php

@@ -40,29 +40,35 @@ class Handler extends ExceptionHandler
         $this->logger->error($logs);
     }
 
-    public function render(Request $request, Throwable $exception): Response
-    {
-        $debug = config('app.debug', true);
-        $code = $exception->getCode();
-        $json = [
-            'code' => $code ? $code : 500,
-            'message' => $code !== 500 ? $exception->getMessage() : 'Server internal error',
-            'type' => 'failed'
-        ];
-        if ($debug) {
-            $json['request_url'] = $request->method() . ' ' . $request->uri();
-            $json['timestamp'] = date('Y-m-d H:i:s');
-            $json['client_ip'] = $request->getRealIp();
-            $json['request_param'] = $request->all();
-            $json['exception_handle'] = get_class($exception);
-            $json['exception_info'] = [
-                'code' => $exception->getCode(),
-                'message' => $exception->getMessage(),
-                'file' => $exception->getFile(),
-                'line' => $exception->getLine(),
-                'trace' => explode("\n", $exception->getTraceAsString())
-            ];
-        }
-        return new Response(200, ['Content-Type' => 'application/json;charset=utf-8'], json_encode($json));
-    }
+//    public function render(Request $request, Throwable $exception): Response
+//    {
+//        $debug = config('app.debug', true);
+//        $code = $exception->getCode();
+//        $httpCode = ($code >= 400 && $code < 600) ? $code : 500;
+//        // 开启 debug 时始终返回真实错误信息，便于排查；未开启时 500 不暴露详情
+//        $message = $exception->getMessage();
+//        if (!$debug && $httpCode === 500) {
+//            $message = 'Server internal error';
+//        }
+//        $json = [
+//            'code' => $httpCode,
+//            'message' => $message,
+//            'type' => 'failed'
+//        ];
+//        if ($debug) {
+//            $json['request_url'] = $request->method() . ' ' . $request->uri();
+//            $json['timestamp'] = date('Y-m-d H:i:s');
+//            $json['client_ip'] = $request->getRealIp();
+//            $json['request_param'] = $request->all();
+//            $json['exception_handle'] = get_class($exception);
+//            $json['exception_info'] = [
+//                'code' => $exception->getCode(),
+//                'message' => $exception->getMessage(),
+//                'file' => $exception->getFile(),
+//                'line' => $exception->getLine(),
+//                'trace' => explode("\n", $exception->getTraceAsString())
+//            ];
+//        }
+//        return new Response(200, ['Content-Type' => 'application/json;charset=utf-8'], json_encode($json));
+//    }
 }

server/plugin/saiadmin/app/middleware/CheckLogin.php

@@ -32,8 +32,11 @@ class CheckLogin implements MiddlewareInterface
             if ($token['plat'] !== 'saiadmin') {
                 throw new ApiException('登录凭证校验失败');
             }
-            $request->setHeader('check_login', true);
-            $request->setHeader('check_admin', $token);
+            // 一次合并设置，避免 setHeader 覆盖导致只保留最后一个
+            $request->setHeader(array_merge($request->header() ?: [], [
+                'check_login' => true,
+                'check_admin' => $token,
+            ]));
         }
         return $handler($request);
     }

server/plugin/saiadmin/basic/BaseController.php

@@ -45,16 +45,20 @@ class BaseController extends OpenController
      */
     protected function init(): void
     {
-        // 登录模式赋值
+        // 登录模式赋值（仅当 check_admin 有效时赋值，避免登录接口等未带 token 时访问 null 导致报错）
         $isLogin = request()->header('check_login', false);
-        if ($isLogin) {
-            $result = request()->header('check_admin');
-            $this->adminId = $result['id'];
-            $this->adminName = $result['username'];
-            $this->adminInfo = UserInfoCache::getUserInfo($result['id']);
+        $result = request()->header('check_admin');
+        if ($isLogin && $result !== null && (is_array($result) || is_object($result))) {
+            $arr = is_array($result) ? $result : (array) $result;
+            $adminId = $arr['id'] ?? null;
+            if ($adminId !== null) {
+                $this->adminId = (int) $adminId;
+                $this->adminName = $arr['username'] ?? '';
+                $this->adminInfo = UserInfoCache::getUserInfo($adminId);
 
-            // 用户数据传递给逻辑层
-            $this->logic && $this->logic->init($this->adminInfo);
+                // 用户数据传递给逻辑层
+                $this->logic && $this->logic->init($this->adminInfo);
+            }
         }
     }
 

server/plugin/saiadmin/basic/think/BaseModel.php

@@ -106,18 +106,21 @@ class BaseModel extends Model implements ModelInterface
      */
     public static function onBeforeInsert($model): void
     {
-        $createTime = $model->createTime ?? 'create_time';
-        if ($createTime && !$model->getData($createTime)) {
-            $model->set($createTime, date('Y-m-d H:i:s'));
+        try {
+            $createTime = $model->createTime ?? 'create_time';
+            if ($createTime && !$model->getData($createTime)) {
+                $model->set($createTime, date('Y-m-d H:i:s'));
+            }
+        } catch (\Throwable $e) {
         }
-        if (function_exists('getCurrentInfo')) {
-            $info = getCurrentInfo();
-            if (!empty($info['id'])) {
-                try {
+        try {
+            if (function_exists('getCurrentInfo')) {
+                $info = getCurrentInfo();
+                if (!empty($info['id'])) {
                     $model->setAttr('created_by', $info['id']);
-                } catch (\Throwable $e) {
                 }
             }
+        } catch (\Throwable $e) {
         }
     }
 
@@ -128,20 +131,23 @@ class BaseModel extends Model implements ModelInterface
      */
     public static function onBeforeWrite($model): void
     {
-        if ($model->isExists()) {
-            $updateTime = $model->updateTime ?? 'update_time';
-            if ($updateTime) {
-                $model->set($updateTime, date('Y-m-d H:i:s'));
-            }
-        }
-        if (function_exists('getCurrentInfo')) {
-            $info = getCurrentInfo();
-            if (!empty($info['id'])) {
-                try {
-                    $model->setAttr('updated_by', $info['id']);
-                } catch (\Throwable $e) {
+        try {
+            if ($model->isExists()) {
+                $updateTime = $model->updateTime ?? 'update_time';
+                if ($updateTime) {
+                    $model->set($updateTime, date('Y-m-d H:i:s'));
                 }
             }
+        } catch (\Throwable $e) {
+        }
+        try {
+            if (function_exists('getCurrentInfo')) {
+                $info = getCurrentInfo();
+                if (!empty($info['id'])) {
+                    $model->setAttr('updated_by', $info['id']);
+                }
+            }
+        } catch (\Throwable $e) {
         }
     }
 }