fix : common request

app/Aspect/AdminLoginLogAspect.php

@@ -50,7 +50,7 @@ class AdminLoginLogAspect extends AbstractAspect
      */
     public function __construct(
         protected readonly Logger $logger,
-        protected readonly RequestInterface $request,
+        protected RequestInterface $request,
         protected readonly AdminUserRepository $adminUserRepository,
         protected readonly AdminUserLoginLog $adminUserLoginLogModel,
     ) {}
@@ -61,7 +61,7 @@ class AdminLoginLogAspect extends AbstractAspect
      * @throws Exception
      * @throws Throwable
      */
-    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    public function process(ProceedingJoinPoint $proceedingJoinPoint): mixed
     {
         // 写日志
 
@@ -87,8 +87,8 @@ class AdminLoginLogAspect extends AbstractAspect
      */
     private function writeLoginLog(): void
     {
-        Coroutine::create(function () {
         $userInfo = $this->adminUserRepository->findByUserName($this->request->input('username'));
+
         $context = [
             'username' => $this->request->input('username',''),
             'password' => $this->request->input('password',''),
@@ -98,12 +98,13 @@ class AdminLoginLogAspect extends AbstractAspect
             'browser' => $this->request->header('User-Agent') ?: 'unknown',
         ];
 
+        Coroutine::create(function () use ($userInfo, $context) {
             $this->logger->request()->info('admin_login_log', $context);
 
-            $this->adminUserLoginLogModel->save([
+            $this->adminUserLoginLogModel->create([
                 'admin_user_id' => $userInfo?->id ?? 0,
                 'username' => $userInfo?->username ?? '',
-                'ip' => $context['ip'],
+                'ip' => current($context['ip']) ?: '0.0.0.0',
                 'os' => $context['os'],
                 'browser' => $context['browser'] ?? '',
                 'status' => $this->loginSuccess ? 1 : 2,

app/Aspect/AdminReturnLogAspect.php

@@ -15,6 +15,7 @@ use Hyperf\Coroutine\Coroutine;
 use Hyperf\Di\Annotation\Aspect;
 use Hyperf\Di\Aop\AbstractAspect;
 use Hyperf\Di\Aop\ProceedingJoinPoint;
+use Hyperf\Di\Exception\Exception;
 use Hyperf\HttpServer\Contract\RequestInterface;
 
 #[Aspect]
@@ -48,13 +49,18 @@ class AdminReturnLogAspect extends AbstractAspect
      */
     public function __construct(
         protected readonly Logger $logger,
-        protected readonly RequestInterface $request,
+        protected RequestInterface $request,
         protected readonly AdminUserOperationLog $adminUserOperationLogModel,
     ) {
         $this->adminId = Context::get('current_admin_id',0);
         if ($this->adminId > 0) $this->adminUserInfo = $this->getAdminUserInfo($this->adminId);
     }
 
+    /**
+     * @param ProceedingJoinPoint $proceedingJoinPoint
+     * @return mixed
+     * @throws Exception
+     */
     public function process(ProceedingJoinPoint $proceedingJoinPoint)
     {
         // 直接从方法参数获取请求数据
@@ -63,11 +69,14 @@ class AdminReturnLogAspect extends AbstractAspect
         // 执行原方法并获取返回值
         $responseData =  $proceedingJoinPoint->process();
 
+        // 没登录不记录日志
+        if ($this->adminId <= 0) return $responseData;
+
         // 写日志
         $this->writeOperationLog($requestData, $responseData);
 
         // 返回
-        return $requestData;
+        return $responseData;
     }
 
     /**
@@ -77,7 +86,6 @@ class AdminReturnLogAspect extends AbstractAspect
      */
     private function writeOperationLog(array $requestData = [], array $responseData = []): void
     {
-        Coroutine::create(function () use ($requestData, $responseData) {
         $context = [
             'user_id' => $this->adminId,
             'method' => $this->request->getMethod(),
@@ -87,15 +95,16 @@ class AdminReturnLogAspect extends AbstractAspect
             'response_data' => $responseData,
         ];
 
+        Coroutine::create(function () use ($requestData, $responseData, $context) {
             $this->logger->request()->info('admin_request_log', $context);
 
-            $this->adminUserOperationLogModel->save([
+            $this->adminUserOperationLogModel->create([
                 'admin_user_id' => $this->adminId,
                 'username' => $this->adminUserInfo?->username ?? '',
                 'method' => $context['method'],
                 'router' => $context['router'],
                 'service_name' => $context['service_name'] ?? '',
-                'ip' => $context['ip'],
+                'ip' => current($context['ip']) ?: '0.0.0.0',
             ]);
         });
     }

app/Common/Trait/ClientIpTrait.php

@@ -15,7 +15,7 @@ trait ClientIpTrait
      * @var RequestInterface
      */
     #[Inject]
-    protected readonly RequestInterface $request;
+    protected RequestInterface $request;
 
     /**
      * @var string[]

app/Common/Trait/ClientOsTrait.php

@@ -11,7 +11,7 @@ trait ClientOsTrait
      * @var RequestInterface
      */
     #[Inject]
-    protected readonly RequestInterface $request;
+    protected RequestInterface $request;
 
     /**
      * @return string

app/Middleware/Admin/PermissionMiddleware.php

@@ -45,7 +45,7 @@ class PermissionMiddleware implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $adminId = $this->getToken()?->claims()?->get(RegisteredClaims::ID) ?? 0;
+        $adminId = (int) $this->getToken()?->claims()?->get(RegisteredClaims::ID) ?? 0;
         if ($adminId <= 0) throw new ErrException('账户不存在');
 
         $this->adminUserInfo = $this->getAdminUserInfo($adminId);

app/Model/AdminUserLoginLog.php

@@ -34,7 +34,7 @@ class AdminUserLoginLog extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['id', 'username', 'ip', 'os', 'browser', 'status', 'message', 'login_time', 'remark'];
+    protected array $fillable = ['id','admin_user_id', 'username', 'ip', 'os', 'browser', 'status', 'message', 'login_time', 'remark'];
 
     /**
      * The attributes that should be cast to native types.

app/Model/AdminUserOperationLog.php

@@ -28,7 +28,7 @@ class AdminUserOperationLog extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['id', 'username', 'method', 'router', 'service_name', 'ip', 'ip_location', 'created_at', 'updated_at', 'remark'];
+    protected array $fillable = ['id', 'admin_user_id','username', 'method', 'router', 'service_name', 'ip', 'ip_location', 'created_at', 'updated_at', 'remark'];
 
     /**
      * The attributes that should be cast to native types.

app/Service/Admin/AdminUser/PermissionService.php

@@ -19,6 +19,7 @@ use App\Constants\ResultCode;
 use App\Exception\ErrException;
 use App\Service\Admin\BaseAdminService;
 use Hyperf\Collection\Arr;
+use Hyperf\Di\Annotation\Inject;
 
 class PermissionService extends BaseAdminService
 {
@@ -27,11 +28,13 @@ class PermissionService extends BaseAdminService
     /**
      * @var AdminRoleRepository
      */
+    #[Inject]
     protected AdminRoleRepository $adminRoleRepository;
 
     /**
      * @var AdminMenuRepository
      */
+    #[Inject]
     protected AdminMenuRepository $adminMenuRepository;
 
     /**

app/Service/Admin/AdminUser/UserService.php

@@ -58,7 +58,7 @@ class UserService extends BaseAdminService
         return $this->adminReturn->success(
             'success',
             Arr::only(
-                $this->getAdminUserInfo($this->adminId) ?: [],
+                $this->getAdminUserInfo($this->adminId)?->toArray() ?: [],
                 ['username', 'nickname', 'avatar', 'signed', 'backend_setting', 'phone', 'email']
             )
         );