Merge branch 'dev' of https://gitee.com/zxt_5/user_producer into dev

app/JsonRpc/AuthorityService.php

@@ -2,6 +2,7 @@
 namespace App\JsonRpc;
 use App\Model\Role;
 use App\Model\Menu;
+use App\Model\RoleUser;
 use App\Model\Website;
 use App\Model\WebsiteRoleUser;
 use App\Tools\Result;
@@ -17,24 +18,15 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function getMenuList(array $data): array
     {
-        // TODO: Implement getMenuList() method.
-        $where = [
-            "pid"=>$data['id']
-        ];
-        $data['pageSize'] = $data['pageSize']?$data['pageSize']:10;
-        $data['page'] = $data['page']?$data['page']:1;
-        $result = Menu::where($where)->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->get();
-        $count =  Menu::where($where)->count();
+        $where = [];
+        if(isset($data['id']) && $data['id']){
+            array_push($where,['pid','=',$data['id']]);
+        }
+        $result = Menu::where($where)->get();
         if (empty($result)) {
             return Result::error("没有菜单",0,[]);
         }
-        foreach($result as $k=>$v){
-            $result[$k]['is_links'] = (int)$result[$k]['is_links'];
-            $result[$k]['hidden'] = (int)$result[$k]['hidden'];
-        }
-        $data['rows'] = $result;
-        $data['count'] = $count;
-        return Result::success($data);
+        return Result::success($result);
     }
 
     /**
@@ -43,8 +35,11 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function getMenuInfo(array $data): array
     {
-        // TODO: Implement getMenuInfo() method.
-        return  [];
+        $result = Menu::where(['id'=>$data['id']])->first();
+        if (empty($result)) {
+            return Result::error("没有菜单",0,[]);
+        }
+        return Result::success($result);
     }
 
     /**
@@ -99,44 +94,36 @@ class AuthorityService implements AuthorityServiceInterface
      */
     public function getRecursionMenu(array $data): array
     {
-        //先查询站点ID
-        $websiteData = [
-            'website_url' => $data['logindevice']
-        ];
-        $websiteInfo = Website::where($websiteData)->first();
-//        var_dump($websiteInfo,$data['logindevice']);
-        if(empty($websiteInfo)){
-            return Result::error("网站不存在",0);
-        }
-        //根据网站和用户ID 查询出角色
-        $whereData = [
-            'website_id'=>$websiteInfo['id'],
-            'user_id'=>$data['user_id']??''
-        ];
-        $WebsiteRoleUserInfo = WebsiteRoleUser::where($whereData)->first();
-//        var_dump("++++:",$WebsiteRoleUserInfo['role_id']);
-        if(empty($WebsiteRoleUserInfo)){
-            return Result::error("角色不存在",0);
-        }
-
         //根据角色查询权限信息
         $roleWhere = [
-            'id'=>$WebsiteRoleUserInfo['role_id']
+            'role_user.user_id'=>$data['user_id']
         ];
-        $roleInfo = Role::where($roleWhere)->first();
-//        var_dump("+++++++++++",$roleInfo);
+        $roleInfo = RoleUser::where($roleWhere)
+            ->leftJoin('role', 'role.id', '=', 'role_user.role_id')
+            ->first();
         if(empty($roleInfo)){
             return Result::error("没有权限",0);
         }
-        //查询
-        var_dump("=========:",$roleInfo['rule']);
         $roleArr = json_decode($roleInfo['rule']);
-//        var_dump($roleArr);
         $result = Menu::whereIn('id',$roleArr)->get();
-//        var_dump("+++++++++++",$result);
         if (empty($result)) {
             return Result::error("没有菜单",0,[]);
         }
         return Result::success($result);
     }
+
+    /**
+     * 获取所有的权限
+     * @param array $data
+     * @return array
+     */
+    public function getAllMenuList(array $data): array
+    {
+        $result = Menu::get();
+        if($result){
+            return Result::success($result);
+        }else{
+            return Result::error("没有权限",0,[]);
+        }
+    }
 }

app/JsonRpc/AuthorityServiceInterface.php

@@ -44,4 +44,10 @@ interface AuthorityServiceInterface
      * @return array
      */
     public function getRecursionMenu(array $data): array;
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getAllMenuList(array $data): array;
 }

app/JsonRpc/UserService.php

@@ -2,6 +2,7 @@
 namespace App\JsonRpc;
 use App\Model\Role;
 use App\Model\RoleLog;
+use App\Model\RoleUser;
 use App\Model\User;
 use App\Model\UserInfo;
 use App\Model\UserLogin;
@@ -67,57 +68,52 @@ class UserService implements UserServiceInterface
      */
     public function getUserList(array $data): array
     {
-
-        $where = [
-            ['user.user_name','like','%'.$data['keyword'].'%']
-        ];
-        if(isset($data['pageSize'])){
-            $result = User::where($where)
+        $where = [];
+        if(isset($data['keyword']) && $data['keyword']){
+            array_push($where, ['user.user_name','like','%'.$data['keyword'].'%']);
+        }
+        $result = User::where($where)
                 ->leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
                 ->leftJoin('user_level', 'user.level_id', '=', 'user_level.id')
-                ->select('user.*', 'user_info.id as user_info_id',
-                    'user_info.id_card',
-                    'user_info.birthday',
-                    'user_info.gender',
-                    'user_info.real_name',
-                    'user_info.business_name',
-                    'user_info.job',
-                    'user_info.city_id',
-                    'user_level.name as level_name'
-                )
-                ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->orderBy("user.id","desc")->get();
-        }else{
-            $result = User::where($where)
-                ->select('user.*', 'user_info.id as user_info_id',
-                    'user_info.id_card',
-                    'user_info.birthday',
-                    'user_info.gender',
-                    'user_info.real_name',
-                    'user_info.business_name',
-                    'user_info.job',
-                    'user_info.city_id',
+                ->leftJoin("user as userA",'user.admin_id',"userA.id")
+                ->orderBy("user.id","desc")->paginate(intval($data['pageSize']), ['user.*', 'user_info.id as user_info_id',
+                'user_info.id_card',
+                'user_info.birthday',
+                'user_info.gender',
+                'user_info.real_name',
+                'user_info.business_name',
+                'user_info.job',
+                'user_info.city_id',
+                'userA.nickname as admin_nickname',
+                'user_level.name as level_name'], 'page', intval($data['page']));
 
-                )
-                ->leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
-                ->get();
-        }
-        var_dump("用户列表",$result->toArray());
-        $count = User::where($where)->count();
+//                ->select('user.*', 'user_info.id as user_info_id',
+//                    'user_info.id_card',
+//                    'user_info.birthday',
+//                    'user_info.gender',
+//                    'user_info.real_name',
+//                    'user_info.business_name',
+//                    'user_info.job',
+//                    'user_info.city_id',
+//                    'user_level.name as level_name'
+//                )
+//            ->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->orderBy("user.id","desc")->get();
+        $count = $result->total();
         if (empty($result)) {
             return Result::error("没有数据",0);
         }
-        $rep = $result->toArray();
+        $rep = $result->items();
         $type = ['1'=>"个人会员",'2'=>"政务会员",'3'=>"企业会员"];
         $gender = ['0'=>"未知",'1'=>"男",'2'=>"女"];
         $status = ['1'=>"正常",'2'=>"冻结"];
-        if($rep){
-            foreach ($rep as $k=>$v){
-                $rep[$k]['type_name'] = $type[$v['type_id']];
-                $rep[$k]['gender_name'] = $gender[$v['gender']];
-                $rep[$k]['status_name'] = $status[$v['status']];
-                $rep[$k]['city_id'] = $v['city_id']?json_decode($v['city_id']):[];
-            }
-        }
+//        if($rep){
+//            foreach ($rep as $k=>$v){
+//                $rep[$k]['type_name'] = $type[$v['type_id']];
+//                $rep[$k]['gender_name'] = $gender[$v['gender']];
+//                $rep[$k]['status_name'] = $status[$v['status']];
+//                $rep[$k]['city_id'] = $v['city_id']?json_decode($v['city_id']):[];
+//            }
+//        }
         $data = [
             'rows'=>$rep,
             'count'=>$count
@@ -280,6 +276,7 @@ class UserService implements UserServiceInterface
                 'type'=>2
             ];
             RoleLog::insertGetId($logData);
+            RoleUser::where(['role_id'=>$data['id']])->delete();
             $result = Role::where(['id'=>$data['id']])->delete();
             Db::commit();
         } catch(\Throwable $ex){
@@ -294,12 +291,21 @@ class UserService implements UserServiceInterface
      */
     public function updateRole(array $data) :array
     {
-
-        $result = Role::where(['id'=>$data['id']])->update($data);
-        if ($result) {
-            return Result::success($result);
+        Db::beginTransaction();
+        try{
+            $result = Role::where(['id'=>$data['id']])->update($data);
+            $logData = [
+                'user_id'=>$data['user_id'],
+                'data'=>json_encode($data),
+                'type'=>3
+            ];
+            RoleLog::insertGetId($logData);
+            Db::commit();
+        } catch(\Throwable $ex){
+            Db::rollBack();
+            return  Result::error("更新失败");
         }
-        return  Result::error("更新失败");
+        return Result::success($result);
     }
     /**
      * @param array $data
@@ -320,15 +326,11 @@ class UserService implements UserServiceInterface
      */
     public function roleList(array $data) :array
     {
-        $where = [
-            ['role_name','like','%'.$data['keyword'].'%']
-        ];
-        if(isset($data['pageSize'])){
-            $result = Role::where($where)->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->get();
-        }else{
-            $result = Role::where($where)->get();
+        $where = [];
+        if(isset($data['keyword']) && $data['keyword']){
+            array_push($where,  ['role.role_name','like','%'.$data['keyword'].'%']);
         }
-
+        $result = Role::withCount('users')->where($where)->limit($data['pageSize'])->offset(($data['page']-1)*$data['pageSize'])->get();
         $count = Role::where($where)->count();
         if (empty($result)) {
             return Result::error("没有数据",0);

app/JsonRpc/UserServiceInterface.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\JsonRpc;
+
 interface UserServiceInterface
 {
     /**
@@ -54,63 +55,62 @@ interface UserServiceInterface
      * @param int $id
      * @return array
      */
-    public function  delUser(int $id) :array;
+    public function delUser(int $id): array;
 
     /**
      * 添加角色
      * @param array $data
      * @return array
      */
-    public function addRole(array $data) :array;
+    public function addRole(array $data): array;
 
     /**
      * 删除角色
      * @param array $data
      * @return array
      */
-    public function delRole(array $data) :array;
+    public function delRole(array $data): array;
 
     /**
      * 更新角色
      * @param array $data
      * @return array
      */
-    public function updateRole(array $data) :array;
+    public function updateRole(array $data): array;
 
     /**
      * 角色列表
      * @param array $data
      * @return array
      */
-    public function roleList(array $data) :array;
+    public function roleList(array $data): array;
 
     /**
      * 角色信息
      * @param array $data
      * @return array
      */
-    public function roleInfo(array $data) :array;
+    public function roleInfo(array $data): array;
 
     /**
      * 查询是否注册
      * @param array $data
      * @return array
      */
-    public function getWechatInfo(array $data) :array;
+    public function getWechatInfo(array $data): array;
 
     /**
      * 添加注册信息
      * @param array $data
      * @return array
      */
-    public function addWechatInfo(array $data) :array;
-
+    public function addWechatInfo(array $data): array;
 
     /**
      * 修改密码
      * @param array $data
      * @return array
      */
-    public function changePassword(array $data) :array;
+    public function changePassword(array $data): array;
 
-}
+}

app/Model/Role.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace App\Model;
 
+use App\Model\RoleUser;
 use Hyperf\DbConnection\Model\Model;
-
 /**
  */
 class Role extends Model
@@ -24,4 +24,10 @@ class Role extends Model
      * The attributes that should be cast to native types.
      */
     protected array $casts = [];
+
+
+    public function users()
+    {
+        return $this->hasMany(RoleUser::class);
+    }
 }

app/Model/RoleUser.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use Hyperf\DbConnection\Model\Model;
+
+/**
+ */
+class RoleUser extends Model
+{
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'role_user';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = [];
+
+    /**
+     * The attributes that should be cast to native types.
+     */
+    protected array $casts = [];
+
+    public function role()
+    {
+        return $this->belongsTo(Role::class);
+    }
+}

composer.json

@@ -30,6 +30,7 @@
         "hyperf/logger": "~3.1.0",
         "hyperf/memory": "~3.1.0",
         "hyperf/nacos": "^3.1",
+        "hyperf/paginator": "^3.1",
         "hyperf/process": "~3.1.0",
         "hyperf/redis": "~3.1.0",
         "hyperf/rpc-server": "^3.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fd89ad12a5dc0409848c1863c865895d",
+    "content-hash": "c81bba5288bb0c3b162f61d34f2b0d1f",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -3145,6 +3145,74 @@
             ],
             "time": "2024-03-23T11:28:51+00:00"
         },
+        {
+            "name": "hyperf/paginator",
+            "version": "v3.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hyperf/paginator.git",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hyperf/paginator/zipball/b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "shasum": ""
+            },
+            "require": {
+                "hyperf/contract": "~3.1.0",
+                "hyperf/support": "~3.1.0",
+                "hyperf/utils": "~3.1.0",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "hyperf/event": "Reqiured to use PageResolverListener.",
+                "hyperf/framework": "Reqiured to use PageResolverListener.",
+                "hyperf/http-server": "Reqiured to use PageResolverListener."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                },
+                "hyperf": {
+                    "config": "Hyperf\\Paginator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hyperf\\Paginator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A paginator component for hyperf.",
+            "homepage": "https://hyperf.io",
+            "keywords": [
+                "hyperf",
+                "paginator",
+                "php"
+            ],
+            "support": {
+                "docs": "https://hyperf.wiki",
+                "issues": "https://github.com/hyperf/hyperf/issues",
+                "pull-request": "https://github.com/hyperf/hyperf/pulls",
+                "source": "https://github.com/hyperf/hyperf"
+            },
+            "funding": [
+                {
+                    "url": "https://hyperf.wiki/#/zh-cn/donate",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/hyperf",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-09-25T02:54:12+00:00"
+        },
         {
             "name": "hyperf/pipeline",
             "version": "v3.1.15",

runtime/hyperf.pid

@@ -1 +1 @@
-1864
+99590

runtime/logs/hyperf.log

@@ -0,0 +1,100 @@
+[2024-10-29 05:36:02] sql.INFO: [3.76] select * from `menu` [] []
+[2024-10-29 05:36:02] sql.INFO: [1.76] select * from `menu` [] []
+[2024-10-29 05:36:23] sql.INFO: [2.74] select * from `menu` [] []
+[2024-10-29 05:36:23] sql.INFO: [1.89] select * from `menu` [] []
+[2024-10-29 05:42:33] sql.INFO: [5.81] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '32') limit 1 [] []
+[2024-10-29 05:42:33] sql.INFO: [12.36] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '32' limit 1 [] []
+[2024-10-29 05:42:33] sql.INFO: [2.02] select * from `menu` where `id` in ('1', '4', '8', '33', '34', '35', '49', '51', '52', '58', '59', '60', '64', '65', '66', '67', '68', '69', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '83', '84') [] []
+[2024-10-29 05:42:47] sql.INFO: [1.56] select * from `user` where (`user_name` = '1') limit 1 [] []
+[2024-10-29 05:42:47] sql.INFO: [1.72] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '32') limit 1 [] []
+[2024-10-29 05:42:47] sql.INFO: [1.74] select * from `menu` where `id` in ('1', '4', '8', '33', '34', '35', '49', '51', '52', '58', '59', '60', '64', '65', '66', '67', '68', '69', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '83', '84') [] []
+[2024-10-29 05:42:47] sql.INFO: [1.48] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '32' limit 1 [] []
+[2024-10-29 05:43:04] sql.INFO: [2.73] select * from `menu` where (`pid` = '1') [] []
+[2024-10-29 05:43:06] sql.INFO: [2.23] select * from `menu` where (`pid` = '1') [] []
+[2024-10-29 05:43:19] sql.INFO: [1.49] select * from `menu` where (`pid` = '1') [] []
+[2024-10-29 05:44:23] sql.INFO: [4.03] select * from `menu` where (`pid` = '91') [] []
+[2024-10-29 05:44:23] sql.INFO: [17.05] delete from `menu` where (`id` = '91') [] []
+[2024-10-29 05:51:29] sql.INFO: [4.68] select * from `user` where (`user_name` = '15210211200') limit 1 [] []
+[2024-10-29 05:51:29] sql.INFO: [2] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 05:51:29] sql.INFO: [1.3] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 05:51:29] sql.INFO: [1.68] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 05:51:34] sql.INFO: [2.28] select * from `menu` [] []
+[2024-10-29 05:51:37] sql.INFO: [6.39] select * from `menu` where (`pid` = '90') [] []
+[2024-10-29 05:51:37] sql.INFO: [23.79] delete from `menu` where (`id` = '90') [] []
+[2024-10-29 05:51:37] sql.INFO: [3.43] select * from `menu` [] []
+[2024-10-29 06:00:47] sql.INFO: [17.12] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:00:47] sql.INFO: [4.55] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:00:47] sql.INFO: [3.31] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:00:56] sql.INFO: [3] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:00:56] sql.INFO: [3.41] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:00:56] sql.INFO: [2.08] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:02:18] sql.INFO: [6.34] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:02:18] sql.INFO: [3.83] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:02:18] sql.INFO: [3.09] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:02:33] sql.INFO: [4.67] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:02:33] sql.INFO: [1.72] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:02:33] sql.INFO: [1.71] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:02:59] sql.INFO: [6.02] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:02:59] sql.INFO: [1.58] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:02:59] sql.INFO: [1.75] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:14:49] sql.INFO: [5.57] select * from `menu` [] []
+[2024-10-29 06:18:49] sql.INFO: [16.71] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:18:49] sql.INFO: [3.43] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:18:49] sql.INFO: [1.94] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:18:49] sql.INFO: [1.87] select * from `menu` [] []
+[2024-10-29 06:21:33] sql.INFO: [13.5] select * from `menu` [] []
+[2024-10-29 06:24:53] sql.INFO: [9.58] select * from `menu` [] []
+[2024-10-29 06:26:22] sql.INFO: [12.07] select * from `menu` [] []
+[2024-10-29 06:27:24] sql.INFO: [5.22] select * from `menu` [] []
+[2024-10-29 06:27:48] sql.INFO: [2.16] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:27:48] sql.INFO: [6.63] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:27:48] sql.INFO: [3.08] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:27:49] sql.INFO: [4.34] select * from `menu` [] []
+[2024-10-29 06:29:04] sql.INFO: [18.58] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:29:04] sql.INFO: [6.09] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:29:04] sql.INFO: [3.75] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:29:04] sql.INFO: [4.86] select * from `menu` [] []
+[2024-10-29 06:31:32] sql.INFO: [7.99] select * from `menu` [] []
+[2024-10-29 06:32:10] sql.INFO: [2.17] select * from `menu` [] []
+[2024-10-29 06:32:18] sql.INFO: [2.71] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:32:18] sql.INFO: [5.01] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:32:18] sql.INFO: [4.02] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:32:19] sql.INFO: [4.47] select * from `menu` [] []
+[2024-10-29 06:33:08] sql.INFO: [3.46] select * from `menu` [] []
+[2024-10-29 06:36:03] sql.INFO: [10.93] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:36:03] sql.INFO: [1.84] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:36:03] sql.INFO: [1.61] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:36:03] sql.INFO: [1.81] select * from `menu` [] []
+[2024-10-29 06:39:09] sql.INFO: [8.88] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:39:09] sql.INFO: [1.99] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:39:09] sql.INFO: [1.82] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 06:39:10] sql.INFO: [5.6] select * from `menu` [] []
+[2024-10-29 06:41:46] sql.INFO: [14.26] select * from `menu` [] []
+[2024-10-29 06:41:57] sql.INFO: [2.35] select * from `menu` [] []
+[2024-10-29 06:42:05] sql.INFO: [3.07] select * from `menu` [] []
+[2024-10-29 06:42:44] sql.INFO: [1.85] select * from `menu` [] []
+[2024-10-29 06:44:34] sql.INFO: [12.52] select * from `menu` [] []
+[2024-10-29 06:45:14] sql.INFO: [20.96] insert into `menu` (`label`, `url`, `icon`, `selected_icon`, `sort`, `pid_arr`, `pid`) values ('测试顶级导航', '/#/top', 'http://192.168.1.201:9501/image/20241029/1730184298773667.png', 'http://192.168.1.201:9501/image/20241029/1730184303296818.png', '11', '[0]', '0') [] []
+[2024-10-29 06:45:14] sql.INFO: [1.74] select * from `menu` [] []
+[2024-10-29 06:53:19] sql.INFO: [4.81] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '32' limit 1 [] []
+[2024-10-29 06:53:19] sql.INFO: [4.89] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '32') limit 1 [] []
+[2024-10-29 06:53:19] sql.INFO: [1.53] select * from `menu` where `id` in ('1', '4', '8', '33', '34', '35', '49', '51', '52', '58', '59', '60', '64', '65', '66', '67', '68', '69', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '83', '84') [] []
+[2024-10-29 06:53:33] sql.INFO: [1.6] select * from `user` where (`user_name` = '1') limit 1 [] []
+[2024-10-29 06:53:33] sql.INFO: [1.73] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '32') limit 1 [] []
+[2024-10-29 06:53:33] sql.INFO: [1.61] select * from `menu` where `id` in ('1', '4', '8', '33', '34', '35', '49', '51', '52', '58', '59', '60', '64', '65', '66', '67', '68', '69', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '83', '84') [] []
+[2024-10-29 06:53:33] sql.INFO: [1.8] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '32' limit 1 [] []
+[2024-10-29 06:53:44] sql.INFO: [1.7] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '32') limit 1 [] []
+[2024-10-29 06:53:44] sql.INFO: [1.86] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '32' limit 1 [] []
+[2024-10-29 06:53:44] sql.INFO: [2.28] select * from `menu` where `id` in ('1', '4', '8', '33', '34', '35', '49', '51', '52', '58', '59', '60', '64', '65', '66', '67', '68', '69', '71', '72', '73', '74', '75', '76', '77', '78', '79', '80', '83', '84') [] []
+[2024-10-29 06:56:51] sql.INFO: [10.05] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 06:56:51] sql.INFO: [2.02] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 06:56:51] sql.INFO: [2.29] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 07:06:29] sql.INFO: [10.22] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 07:06:29] sql.INFO: [2.19] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 07:06:29] sql.INFO: [2.15] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 07:06:52] sql.INFO: [3.3] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 07:06:52] sql.INFO: [1.67] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 07:06:52] sql.INFO: [1.36] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []
+[2024-10-29 07:07:50] sql.INFO: [1.63] select `user`.*, `user_info`.`id` as `user_info_id`, `user_info`.`id_card`, `user_info`.`birthday`, `user_info`.`gender`, `user_info`.`real_name` from `user` left join `user_info` on `user`.`id` = `user_info`.`user_id` where `user`.`id` = '73' limit 1 [] []
+[2024-10-29 07:07:50] sql.INFO: [3.38] select * from `role_user` left join `role` on `role`.`id` = `role_user`.`role_id` where (`role_user`.`user_id` = '73') limit 1 [] []
+[2024-10-29 07:07:50] sql.INFO: [2.59] select * from `menu` where `id` in ('77', '78', '79', '80', '83', '84', '85', '86', '87', '88', '89') [] []

vendor/composer/autoload_classmap.php

@@ -21,6 +21,7 @@ return array(
     'App\\Model\\Model' => $baseDir . '/app/Model/Model.php',
     'App\\Model\\Role' => $baseDir . '/app/Model/Role.php',
     'App\\Model\\RoleLog' => $baseDir . '/app/Model/RoleLog.php',
+    'App\\Model\\RoleUser' => $baseDir . '/app/Model/RoleUser.php',
     'App\\Model\\User' => $baseDir . '/app/Model/User.php',
     'App\\Model\\UserInfo' => $baseDir . '/app/Model/UserInfo.php',
     'App\\Model\\UserLevel' => $baseDir . '/app/Model/UserLevel.php',
@@ -1295,6 +1296,16 @@ return array(
     'Hyperf\\Nacos\\Provider\\InstanceProvider' => $vendorDir . '/hyperf/nacos/src/Provider/InstanceProvider.php',
     'Hyperf\\Nacos\\Provider\\OperatorProvider' => $vendorDir . '/hyperf/nacos/src/Provider/OperatorProvider.php',
     'Hyperf\\Nacos\\Provider\\ServiceProvider' => $vendorDir . '/hyperf/nacos/src/Provider/ServiceProvider.php',
+    'Hyperf\\Paginator\\AbstractCursorPaginator' => $vendorDir . '/hyperf/paginator/src/AbstractCursorPaginator.php',
+    'Hyperf\\Paginator\\AbstractPaginator' => $vendorDir . '/hyperf/paginator/src/AbstractPaginator.php',
+    'Hyperf\\Paginator\\ConfigProvider' => $vendorDir . '/hyperf/paginator/src/ConfigProvider.php',
+    'Hyperf\\Paginator\\Contract\\CursorPaginator' => $vendorDir . '/hyperf/paginator/src/Contract/CursorPaginator.php',
+    'Hyperf\\Paginator\\Cursor' => $vendorDir . '/hyperf/paginator/src/Cursor.php',
+    'Hyperf\\Paginator\\CursorPaginator' => $vendorDir . '/hyperf/paginator/src/CursorPaginator.php',
+    'Hyperf\\Paginator\\LengthAwarePaginator' => $vendorDir . '/hyperf/paginator/src/LengthAwarePaginator.php',
+    'Hyperf\\Paginator\\Listener\\PageResolverListener' => $vendorDir . '/hyperf/paginator/src/Listener/PageResolverListener.php',
+    'Hyperf\\Paginator\\Paginator' => $vendorDir . '/hyperf/paginator/src/Paginator.php',
+    'Hyperf\\Paginator\\UrlWindow' => $vendorDir . '/hyperf/paginator/src/UrlWindow.php',
     'Hyperf\\Pipeline\\Pipeline' => $vendorDir . '/hyperf/pipeline/src/Pipeline.php',
     'Hyperf\\Pool\\Channel' => $vendorDir . '/hyperf/pool/src/Channel.php',
     'Hyperf\\Pool\\ConfigProvider' => $vendorDir . '/hyperf/pool/src/ConfigProvider.php',

vendor/composer/autoload_psr4.php

@@ -70,6 +70,7 @@ return array(
     'Hyperf\\Process\\' => array($vendorDir . '/hyperf/process/src'),
     'Hyperf\\Pool\\' => array($vendorDir . '/hyperf/pool/src'),
     'Hyperf\\Pipeline\\' => array($vendorDir . '/hyperf/pipeline/src'),
+    'Hyperf\\Paginator\\' => array($vendorDir . '/hyperf/paginator/src'),
     'Hyperf\\Nacos\\' => array($vendorDir . '/hyperf/nacos/src'),
     'Hyperf\\ModelListener\\' => array($vendorDir . '/hyperf/model-listener/src'),
     'Hyperf\\Memory\\' => array($vendorDir . '/hyperf/memory/src'),

vendor/composer/autoload_static.php

@@ -122,6 +122,7 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
             'Hyperf\\Process\\' => 15,
             'Hyperf\\Pool\\' => 12,
             'Hyperf\\Pipeline\\' => 16,
+            'Hyperf\\Paginator\\' => 17,
             'Hyperf\\Nacos\\' => 13,
             'Hyperf\\ModelListener\\' => 21,
             'Hyperf\\Memory\\' => 14,
@@ -459,6 +460,10 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         array (
             0 => __DIR__ . '/..' . '/hyperf/pipeline/src',
         ),
+        'Hyperf\\Paginator\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/hyperf/paginator/src',
+        ),
         'Hyperf\\Nacos\\' => 
         array (
             0 => __DIR__ . '/..' . '/hyperf/nacos/src',
@@ -705,6 +710,7 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\Model' => __DIR__ . '/../..' . '/app/Model/Model.php',
         'App\\Model\\Role' => __DIR__ . '/../..' . '/app/Model/Role.php',
         'App\\Model\\RoleLog' => __DIR__ . '/../..' . '/app/Model/RoleLog.php',
+        'App\\Model\\RoleUser' => __DIR__ . '/../..' . '/app/Model/RoleUser.php',
         'App\\Model\\User' => __DIR__ . '/../..' . '/app/Model/User.php',
         'App\\Model\\UserInfo' => __DIR__ . '/../..' . '/app/Model/UserInfo.php',
         'App\\Model\\UserLevel' => __DIR__ . '/../..' . '/app/Model/UserLevel.php',
@@ -1979,6 +1985,16 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'Hyperf\\Nacos\\Provider\\InstanceProvider' => __DIR__ . '/..' . '/hyperf/nacos/src/Provider/InstanceProvider.php',
         'Hyperf\\Nacos\\Provider\\OperatorProvider' => __DIR__ . '/..' . '/hyperf/nacos/src/Provider/OperatorProvider.php',
         'Hyperf\\Nacos\\Provider\\ServiceProvider' => __DIR__ . '/..' . '/hyperf/nacos/src/Provider/ServiceProvider.php',
+        'Hyperf\\Paginator\\AbstractCursorPaginator' => __DIR__ . '/..' . '/hyperf/paginator/src/AbstractCursorPaginator.php',
+        'Hyperf\\Paginator\\AbstractPaginator' => __DIR__ . '/..' . '/hyperf/paginator/src/AbstractPaginator.php',
+        'Hyperf\\Paginator\\ConfigProvider' => __DIR__ . '/..' . '/hyperf/paginator/src/ConfigProvider.php',
+        'Hyperf\\Paginator\\Contract\\CursorPaginator' => __DIR__ . '/..' . '/hyperf/paginator/src/Contract/CursorPaginator.php',
+        'Hyperf\\Paginator\\Cursor' => __DIR__ . '/..' . '/hyperf/paginator/src/Cursor.php',
+        'Hyperf\\Paginator\\CursorPaginator' => __DIR__ . '/..' . '/hyperf/paginator/src/CursorPaginator.php',
+        'Hyperf\\Paginator\\LengthAwarePaginator' => __DIR__ . '/..' . '/hyperf/paginator/src/LengthAwarePaginator.php',
+        'Hyperf\\Paginator\\Listener\\PageResolverListener' => __DIR__ . '/..' . '/hyperf/paginator/src/Listener/PageResolverListener.php',
+        'Hyperf\\Paginator\\Paginator' => __DIR__ . '/..' . '/hyperf/paginator/src/Paginator.php',
+        'Hyperf\\Paginator\\UrlWindow' => __DIR__ . '/..' . '/hyperf/paginator/src/UrlWindow.php',
         'Hyperf\\Pipeline\\Pipeline' => __DIR__ . '/..' . '/hyperf/pipeline/src/Pipeline.php',
         'Hyperf\\Pool\\Channel' => __DIR__ . '/..' . '/hyperf/pool/src/Channel.php',
         'Hyperf\\Pool\\ConfigProvider' => __DIR__ . '/..' . '/hyperf/pool/src/ConfigProvider.php',

vendor/composer/installed.json

@@ -3907,6 +3907,77 @@
             ],
             "install-path": "../hyperf/nacos"
         },
+        {
+            "name": "hyperf/paginator",
+            "version": "v3.1.42",
+            "version_normalized": "3.1.42.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hyperf/paginator.git",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hyperf/paginator/zipball/b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "shasum": ""
+            },
+            "require": {
+                "hyperf/contract": "~3.1.0",
+                "hyperf/support": "~3.1.0",
+                "hyperf/utils": "~3.1.0",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "hyperf/event": "Reqiured to use PageResolverListener.",
+                "hyperf/framework": "Reqiured to use PageResolverListener.",
+                "hyperf/http-server": "Reqiured to use PageResolverListener."
+            },
+            "time": "2024-09-25T02:54:12+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                },
+                "hyperf": {
+                    "config": "Hyperf\\Paginator\\ConfigProvider"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Hyperf\\Paginator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A paginator component for hyperf.",
+            "homepage": "https://hyperf.io",
+            "keywords": [
+                "hyperf",
+                "paginator",
+                "php"
+            ],
+            "support": {
+                "docs": "https://hyperf.wiki",
+                "issues": "https://github.com/hyperf/hyperf/issues",
+                "pull-request": "https://github.com/hyperf/hyperf/pulls",
+                "source": "https://github.com/hyperf/hyperf"
+            },
+            "funding": [
+                {
+                    "url": "https://hyperf.wiki/#/zh-cn/donate",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/hyperf",
+                    "type": "open_collective"
+                }
+            ],
+            "install-path": "../hyperf/paginator"
+        },
         {
             "name": "hyperf/pipeline",
             "version": "v3.1.15",

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '2ca41ed66e11bff26b338e76a094da8061ce4d06',
+        'reference' => '5b45b0f0eb4388d1f26f5231c2be1e47e21b2631',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -439,7 +439,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '2ca41ed66e11bff26b338e76a094da8061ce4d06',
+            'reference' => '5b45b0f0eb4388d1f26f5231c2be1e47e21b2631',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -508,6 +508,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'hyperf/paginator' => array(
+            'pretty_version' => 'v3.1.42',
+            'version' => '3.1.42.0',
+            'reference' => 'b637a3deeee69f4a3e5a6d62ab8214244b98412a',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../hyperf/paginator',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'hyperf/pipeline' => array(
             'pretty_version' => 'v3.1.15',
             'version' => '3.1.15.0',