恒星站

README.md

@@ -44,8 +44,8 @@ abstract class AbstractController
         $this->logger = $loggerFactory->get('admin_consumer:', 'default');
 
          $headers = $this->request->getHeaders();
-        var_dump($headers);
-        if($headers &&  isset($headers['token']) && isset($headers['token'][0])){
+        var_dump( $headers['token'][0]!='null');
+        if($headers &&  isset($headers['token']) && $headers['token'][0]!='null' && isset($headers['token'][0])){
             $userInfo = $this->jwt->getClaimsByToken($headers['token'][0]);
             $this->UserId = $userInfo['uid'];
         }

app/Controller/AuthorityController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\AuthorityServiceInterface;
+use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
@@ -68,19 +69,19 @@ class AuthorityController extends AbstractController
      * 添加菜单
      * @return array|void
      */
-    public function addMent()
+    public function addMenu()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'pid' => 'required',
+
                 'label' => 'required',
                 'url' => 'required',
 
             ],
             [
-                'pid.required' => '父级id不能为空',
+
                 'label.required' => '菜单名称不能为空',
                 'url.required' => '路由地址不能为空',
             ]
@@ -89,7 +90,14 @@ class AuthorityController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
+        if(isset($requireData['pid']) && is_array($requireData['pid'])){
+            $requireData['pid_arr'] = json_encode($requireData['pid']);
+            $requireData['pid'] = end($requireData['pid']);
+        }else{
+            $id = [0];
+            $requireData['pid_arr'] = json_encode($id);
+            $requireData['pid'] = end($id);
+        }
         $result = $this->authorityServiceClient->addMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -97,7 +105,7 @@ class AuthorityController extends AbstractController
      * 修改菜单
      * @return array|void
      */
-    public function updateMent()
+    public function updateMenu()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -120,10 +128,28 @@ class AuthorityController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        if(isset($requireData['pid']) && is_array($requireData['pid'])){
+            $requireData['pid_arr'] = json_encode($requireData['pid']);
+            $requireData['pid'] = end($requireData['pid']);
+        }else{
+            $id = [0];
+            $requireData['pid_arr'] = json_encode($id);
+            $requireData['pid'] = end($id);
+        }
+
         $result = $this->authorityServiceClient->updateMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
-
+    /**
+     * 菜单递归查询处理
+     * @return void
+     */
+    public  function  getRecursionMenu()
+    {
+       $result =  $this->authorityServiceClient->getRecursionMenu([]);
+       $rep = PublicData::buildMenuTree($result['data']);
+       return $rep?Result::success($rep):Result::error("查询失败");
+    }
 
 }

app/Controller/PublicController.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+namespace App\Controller;
+
+use App\JsonRpc\PublicRpcServiceInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
+/**
+ * Class PublicController
+ * @package App\Controller
+ */
+#[AutoController]
+class PublicController extends AbstractController
+{
+
+    /**
+     * @var PublicRpcServiceInterface
+     */
+    #[Inject]
+    private $publicServiceClient;
+
+    /**
+     * 创建站点
+     * @return array
+     */
+    public function getDistrictList()
+    {
+        $pid = $this->request->input("pid",0);
+        $data = [
+            'pid'=>$pid
+        ];
+        $result = $this->publicServiceClient->getDistrictList($data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+}

app/Controller/UserController.php

@@ -60,16 +60,16 @@ class UserController extends AbstractController
             'password'=>$requireData['password'],
             'avatar'=>$requireData['avatar'],
             'mobile'=>$requireData['mobile'],
-            'status'=>isset($requireData['status'])?$requireData['status']:1,
-            'role_id'=>$requireData['role_id']?$requireData['role_id']:0,
-            'email'=>$requireData['email']?$requireData['email']:'',
+            'status'=>isset($requireData['status'])??1,
+            'role_id'=>$requireData['role_id']??0,
+            'email'=>$requireData['email']??'',
             'salt'=>$salt,
             'rong_token'=>'',
             'level_id'=>$requireData['level_id'], //会员等级
-            'id_card'=>isset($requireData['id_card'])?$requireData['id_card']:'', //身份证号
-            'birthday'=>isset($requireData['birthday'])?$requireData['status']:'', //生日
-            'gender'=>isset($requireData['gender'])?$requireData['status']:'', //性别
-            'real_name'=>isset($requireData['real_name'])?$requireData['status']:'', //真实名称
+            'id_card'=>isset($requireData['id_card'])??'', //身份证号
+            'birthday'=>isset($requireData['birthday'])??'', //生日
+            'gender'=>isset($requireData['gender'])??'', //性别
+            'real_name'=>isset($requireData['real_name'])??'', //真实名称
         ];
         $this->logger->info("创建用户入参：", $data);
         $result =  $this->userServiceClient->createUser($data);
@@ -82,7 +82,6 @@ class UserController extends AbstractController
      */
     public function getUserInfo()
     {
-        var_dump($this->UserId,"GGGGGGGGG");
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -104,913 +103,112 @@ class UserController extends AbstractController
         return Result::success($result['data']);
     }
 
-    public function getMenuList()
+    /**
+     * @return array|void
+     */
+    public function roleList()
+    {
+        $requireData = $this->request->all();
+        $result =  $this->userServiceClient->roleList($requireData);
+        if($result['data']){
+            foreach ($result['data']['rows'] as $k=>$v) {
+                $result['data']['rows'][$k]['rule'] = $v['rule']?json_decode($v['rule']):[];
+            }
+        }
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * 添加角色
+     * @return array
+     */
+    public function addRole()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'role_name' => 'required'
+            ],
+            [
+                'role_name.required' => '角色名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = $this->UserId;
+        $result =  $this->userServiceClient->addRole($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * 删除角色
+     * @return array
+     */
+    public function delRole()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required'
+            ],
+            [
+                'id.required' => '角色ID不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = $this->UserId;
+        $result =  $this->userServiceClient->delRole($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
+    }
+
+    /**
+     * 更新角色
+     * @return array
+     */
+    public function updateRole()
     {
-        $data =
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
             [
-                [
-                    "label"=> "工作台",
-                    "url"=> "/#/left/home",
-                    "action"=> "home",
-                    "children"=> [
-                        [
-                            "id"=> 773,
-                            "label"=> "商品列表-JAVA",
-                            "mark"=> "",
-                            "url"=> "/#/left/newGoodsList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 3
-                        ],
-                        [
-                            "id"=> 773,
-                            "label"=> "商品列表-JAVA",
-                            "mark"=> "",
-                            "url"=> "/#/left/newGoodsList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 3
-                        ],
-                        ]
-                ],
-                [
-                    "id"=> 1,
-                    "label"=> "商品",
-                    "mark"=> "",
-                    "url"=> "/#/left/newGoodsList",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 1,
-                    "children"=> [
-                        [
-                            "id"=> 773,
-                            "label"=> "商品列表-JAVA",
-                            "mark"=> "",
-                            "url"=> "/#/left/newGoodsList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 3
-                        ],
-                        [
-                            "id"=> 402,
-                            "label"=> "点评列表",
-                            "mark"=> "",
-                            "url"=> "/#/left/goodsCommentList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 5
-                        ],
-                        [
-                            "id"=> 407,
-                            "label"=> "品牌列表",
-                            "mark"=> "",
-                            "url"=> "/#/left/brandList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 6
-                        ],
-                        [
-                            "id"=> 604,
-                            "label"=> "标准商品库",
-                            "mark"=> "0",
-                            "url"=> "/#/left/standardGoods/goodList",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 7
-                        ],
-                        [
-                            "id"=> 821,
-                            "label"=> "商品通知图管理-Java",
-                            "mark"=> "",
-                            "url"=> "/#/left/goodsNoticeImg",
-                            "parent_id"=> 1,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 22
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 17,
-                    "label"=> "促销",
-                    "mark"=> "",
-                    "url"=> "/#/left/platformMarketingActivities",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 2,
-                    "children"=> [
-                        [
-                            "id"=> 622,
-                            "label"=> "平台营销活动",
-                            "mark"=> "",
-                            "url"=> "/#/left/platformMarketingActivities",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 16
-                        ],
-                        [
-                            "id"=> 28,
-                            "label"=> "优惠券",
-                            "mark"=> "",
-                            "url"=> "/#/coupons",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 17
-                        ],
-                        [
-                            "id"=> 392,
-                            "label"=> "订单优惠",
-                            "mark"=> "",
-                            "url"=> "/seller/fullDiscount?act=list",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 18
-                        ],
-                        [
-                            "id"=> 31,
-                            "label"=> "搭售活动",
-                            "mark"=> "",
-                            "url"=> "/#/left/tyingActivitiesList",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 20
-                        ],
-                        [
-                            "id"=> 404,
-                            "label"=> "抽奖",
-                            "mark"=> "",
-                            "url"=> "/#/left/luckDraw",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 21
-                        ],
-                        [
-                            "id"=> 401,
-                            "label"=> "限时秒杀",
-                            "mark"=> "",
-                            "url"=> "/#/left/secondKillActivity",
-                            "parent_id"=> 17,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 21
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 35,
-                    "label"=> "订单",
-                    "mark"=> "",
-                    "url"=> "/#/left/goodsOrderList",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 3,
-                    "children"=> [
-                        [
-                            "id"=> 377,
-                            "label"=> "销售订单",
-                            "mark"=> "",
-                            "url"=> "",
-                            "parent_id"=> 35,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 4,
-                            "children"=> [
-                                [
-                                    "id"=> 384,
-                                    "label"=> "商品订单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/goodsOrderList",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 20
-                                ],
-                                [
-                                    "id"=> 776,
-                                    "label"=> "付款订单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/billOrder",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 30
-                                ],
-                                [
-                                    "id"=> 658,
-                                    "label"=> "服务订单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/serviceOrderList",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 40
-                                ],
-                                [
-                                    "id"=> 827,
-                                    "label"=> "发货单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/invoiceorder",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 70
-                                ],
-                                [
-                                    "id"=> 527,
-                                    "label"=> "退货售后列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/afterSalesOrder?pageType=sale",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 80
-                                ],
-                                [
-                                    "id"=> 828,
-                                    "label"=> "自提核销",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/selfDrawVerify",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 100
-                                ],
-                                [
-                                    "id"=> 768,
-                                    "label"=> "销售统计",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/saleReport",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 110
-                                ],
-                                [
-                                    "id"=> 718,
-                                    "label"=> "门店订单看板",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/shopOrderBoard",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 120
-                                ],
-                                [
-                                    "id"=> 717,
-                                    "label"=> "门店订单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/shopOrderList",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 130
-                                ],
-                                [
-                                    "id"=> 668,
-                                    "label"=> "O2O订单管理",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/o2oOrderList",
-                                    "parent_id"=> 377,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 140
-                                ]
-                            ]
-                        ],
-                        [
-                            "id"=> 378,
-                            "label"=> "采购订单",
-                            "mark"=> "",
-                            "url"=> "",
-                            "parent_id"=> 35,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 5,
-                            "children"=> [
-                                [
-                                    "id"=> 571,
-                                    "label"=> "信用额度查询",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/creditLimitZSW",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 10
-                                ],
-                                [
-                                    "id"=> 49,
-                                    "label"=> "采购订单列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/orderList",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 20
-                                ],
-                                [
-                                    "id"=> 890,
-                                    "label"=> "退货售后列表",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/afterSalesOrder?pageType=purchase",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 30
-                                ],
-                                [
-                                    "id"=> 894,
-                                    "label"=> "待开票列表",
-                                    "mark"=> "订单合并-智商务-待开票列表",
-                                    "url"=> "/#/left/toMakeInvoiceListNew",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 40
-                                ],
-                                [
-                                    "id"=> 899,
-                                    "label"=> "开票申请列表",
-                                    "mark"=> "订单合并-智商务-采购管理",
-                                    "url"=> "/#/left/applyMakeInvoiceListZSWNew",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 50
-                                ],
-                                [
-                                    "id"=> 886,
-                                    "label"=> "备件捆绑主机",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/newBindPcMechine",
-                                    "parent_id"=> 378,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 60
-                                ]
-                            ]
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 114,
-                    "label"=> "商家",
-                    "mark"=> "",
-                    "url"=> "/#/left/merchantsAccount",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 4,
-                    "children"=> [
-                        [
-                            "id"=> 394,
-                            "label"=> "店铺账户",
-                            "mark"=> "",
-                            "url"=> "/#/left/merchantsAccount",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 12
-                        ],
-                        [
-                            "id"=> 864,
-                            "label"=> "在线客服设置(新)",
-                            "mark"=> "",
-                            "url"=> "/#/left/customerService",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 20
-                        ],
-                        [
-                            "id"=> 766,
-                            "label"=> "服务站信息管理(新)",
-                            "mark"=> "",
-                            "url"=> "/#/left/serviceStationInfoManage",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 24
-                        ],
-                        [
-                            "id"=> 755,
-                            "label"=> "服务网点列表(新)",
-                            "mark"=> "",
-                            "url"=> "/#/left/serviceNetworkManage",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 24
-                        ],
-                        [
-                            "id"=> 856,
-                            "label"=> "工程师管理(新)",
-                            "mark"=> "",
-                            "url"=> "/#/left/engineerManage",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 25
-                        ],
-                        [
-                            "id"=> 722,
-                            "label"=> "带货人管理",
-                            "mark"=> "",
-                            "url"=> "/seller/service_manage.php?act=carrier_list",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 26
-                        ],
-                        [
-                            "id"=> 745,
-                            "label"=> "任务单列表",
-                            "mark"=> "",
-                            "url"=> "/#/left/missionOrderList",
-                            "parent_id"=> 114,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 30
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 82,
-                    "label"=> "设置",
-                    "mark"=> "",
-                    "url"=> "/#/left/setFreight",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 6,
-                    "children"=> [
-                        [
-                            "id"=> 872,
-                            "label"=> "运费设置(新)",
-                            "mark"=> "",
-                            "url"=> "/#/left/setFreight",
-                            "parent_id"=> 82,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 13
-                        ],
-                        [
-                            "id"=> 403,
-                            "label"=> "短信设置",
-                            "mark"=> "",
-                            "url"=> "/#/left/setSms",
-                            "parent_id"=> 82,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 14
-                        ],
-                        [
-                            "id"=> 526,
-                            "label"=> "退货设置",
-                            "mark"=> "",
-                            "url"=> "/#/left/returnSetting",
-                            "parent_id"=> 82,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 15
-                        ],
-                        [
-                            "id"=> 633,
-                            "label"=> "物流方式",
-                            "mark"=> "",
-                            "url"=> "/#/left/express",
-                            "parent_id"=> 82,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 20
-                        ],
-                        [
-                            "id"=> 642,
-                            "label"=> "库房位置",
-                            "mark"=> "",
-                            "url"=> "/#/left/setStorehouse",
-                            "parent_id"=> 82,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 25
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 71,
-                    "label"=> "权限",
-                    "mark"=> "",
-                    "url"=> "/#/left/roleManagement",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 7,
-                    "children"=> [
-                        [
-                            "id"=> 742,
-                            "label"=> "新角色管理",
-                            "mark"=> "",
-                            "url"=> "/#/left/roleManagement",
-                            "parent_id"=> 71,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 10
-                        ],
-                        [
-                            "id"=> 743,
-                            "label"=> "新员工管理",
-                            "mark"=> "",
-                            "url"=> "/#/left/staffManagement",
-                            "parent_id"=> 71,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 11
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 125,
-                    "label"=> "店铺",
-                    "mark"=> "",
-                    "url"=> "/#/left/microstation",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 8,
-                    "children"=> [
-                        [
-                            "id"=> 154,
-                            "label"=> "微站",
-                            "mark"=> "",
-                            "url"=> "",
-                            "parent_id"=> 125,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 5,
-                            "children"=> [
-                                [
-                                    "id"=> 869,
-                                    "label"=> "微站(新)",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/microstation",
-                                    "parent_id"=> 154,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 1
-                                ],
-                                [
-                                    "id"=> 870,
-                                    "label"=> "Logo管理(新)",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/logoManage",
-                                    "parent_id"=> 154,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 2
-                                ],
-                                [
-                                    "id"=> 871,
-                                    "label"=> "店铺名称管理(新)",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/shopNameManage",
-                                    "parent_id"=> 154,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 12
-                                ]
-                            ]
-                        ],
-                        [
-                            "id"=> 132,
-                            "label"=> "店铺装修",
-                            "mark"=> "",
-                            "url"=> "",
-                            "parent_id"=> 125,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 80,
-                            "children"=> [
-                                [
-                                    "id"=> 395,
-                                    "label"=> "前台分类设置",
-                                    "mark"=> "",
-                                    "url"=> "/seller/business_category.php?act=data_list",
-                                    "parent_id"=> 132,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 801
-                                ],
-                                [
-                                    "id"=> 396,
-                                    "label"=> "热门搜索设置",
-                                    "mark"=> "",
-                                    "url"=> "/seller/business_category.php?act=hot_keyword",
-                                    "parent_id"=> 132,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 802
-                                ]
-                            ]
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 171,
-                    "label"=> "财务",
-                    "mark"=> "",
-                    "url"=> "/#/left/balance",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 9,
-                    "children"=> [
-                        [
-                            "id"=> 612,
-                            "label"=> "账户余额明细",
-                            "mark"=> "",
-                            "url"=> "/#/left/balance",
-                            "parent_id"=> 171,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 41
-                        ],
-                        [
-                            "id"=> 672,
-                            "label"=> "外部订单结费统计",
-                            "mark"=> "",
-                            "url"=> "/#/left/allPlatformMarketing",
-                            "parent_id"=> 171,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 42
-                        ],
-                        [
-                            "id"=> 582,
-                            "label"=> "订单对账管理",
-                            "mark"=> "0",
-                            "url"=> "/#/left/finance",
-                            "parent_id"=> 171,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 12622
-                        ],
-                        [
-                            "id"=> 609,
-                            "label"=> "申请开票管理",
-                            "mark"=> "0",
-                            "url"=> "/#/left/applyInvoice",
-                            "parent_id"=> 171,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 12624
-                        ],
-                        [
-                            "id"=> 610,
-                            "label"=> "开票申请列表",
-                            "mark"=> "0",
-                            "url"=> "/#/left/applyFeeList",
-                            "parent_id"=> 171,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 12625
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 405,
-                    "label"=> "数据",
-                    "mark"=> "",
-                    "url"=> "/#/left/dataBoard",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 12,
-                    "children"=> [
-                        [
-                            "id"=> 406,
-                            "label"=> "数据看板",
-                            "mark"=> "",
-                            "url"=> "/#/left/dataBoard",
-                            "parent_id"=> 405,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 1
-                        ],
-                        [
-                            "id"=> 544,
-                            "label"=> "员工销售数据",
-                            "mark"=> "",
-                            "url"=> "/#/left/staffSales",
-                            "parent_id"=> 405,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 2
-                        ],
-                        [
-                            "id"=> 583,
-                            "label"=> "加装改配查询",
-                            "mark"=> "0",
-                            "url"=> "/#/left/computerInfoSearch",
-                            "parent_id"=> 405,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 4
-                        ]
-                    ]
-                ],
-                [
-                    "id"=> 564,
-                    "label"=> "进销存",
-                    "mark"=> "0",
-                    "url"=> "/#/left/POOrderListZSW",
-                    "parent_id"=> 0,
-                    "is_curr"=> false,
-                    "can_do"=> false,
-                    "sort"=> 13,
-                    "children"=> [
-                        [
-                            "id"=> 674,
-                            "label"=> "采购管理",
-                            "mark"=> "采购管理",
-                            "url"=> "",
-                            "parent_id"=> 564,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 2,
-                            "children"=> [
-                                [
-                                    "id"=> 572,
-                                    "label"=> "PO采购列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/POOrderListZSW",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 8
-                                ],
-                                [
-                                    "id"=> 723,
-                                    "label"=> "退货单列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/zswRefundList",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 9
-                                ],
-                                [
-                                    "id"=> 573,
-                                    "label"=> "SO订单列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/SOOrderListZSW",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 9
-                                ],
-                                [
-                                    "id"=> 570,
-                                    "label"=> "单品库存管理",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/singleProductZSW",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 10
-                                ],
-                                [
-                                    "id"=> 574,
-                                    "label"=> "付款订单列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/payListZSW",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 11
-                                ],
-                                [
-                                    "id"=> 588,
-                                    "label"=> "待开票列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/toMakeInvoiceList",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 12
-                                ],
-                                [
-                                    "id"=> 589,
-                                    "label"=> "开票申请列表",
-                                    "mark"=> "服务商-采购管理",
-                                    "url"=> "/#/left/applyMakeInvoiceListZSW",
-                                    "parent_id"=> 674,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 13
-                                ]
-                            ]
-                        ],
-                        [
-                            "id"=> 708,
-                            "label"=> "库存管理",
-                            "mark"=> "",
-                            "url"=> "",
-                            "parent_id"=> 564,
-                            "is_curr"=> false,
-                            "can_do"=> false,
-                            "sort"=> 25,
-                            "children"=> [
-                                [
-                                    "id"=> 709,
-                                    "label"=> "物料入库通知",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/warehousingNotice",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 25
-                                ],
-                                [
-                                    "id"=> 710,
-                                    "label"=> "物料出库通知",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/deliveryNotice",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 26
-                                ],
-                                [
-                                    "id"=> 711,
-                                    "label"=> "物料调拨通知",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/allocatingNotice",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 27
-                                ],
-                                [
-                                    "id"=> 712,
-                                    "label"=> "物料入库单查询",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/warehousingQuery",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 28
-                                ],
-                                [
-                                    "id"=> 713,
-                                    "label"=> "物料出库单查询",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/outboundQuery",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 29
-                                ],
-                                [
-                                    "id"=> 714,
-                                    "label"=> "物料库存",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/inventory",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 30
-                                ],
-                                [
-                                    "id"=> 716,
-                                    "label"=> "自营物料档案",
-                                    "mark"=> "",
-                                    "url"=> "/#/left/materialFile",
-                                    "parent_id"=> 708,
-                                    "is_curr"=> false,
-                                    "can_do"=> false,
-                                    "sort"=> 31
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
-            ];
-        return Result::success($data);
+                'role_name' => 'required',
+                'id' => 'required'
+            ],
+            [
+                'id.required' => '角色ID不能为空',
+                'role_name.required' => '角色名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = $this->UserId;
+        $requireData['rule'] = $requireData['rule']?json_encode($requireData['rule']):[];
+        $result =  $this->userServiceClient->updateRole($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        return Result::success($result['data']);
     }
 
 
 
+
 }

app/Controller/WebsiteController.php

@@ -3,12 +3,11 @@ declare(strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\WebsiteServiceInterface;
+use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
-use App\Constants\ErrorCode;
-
-use Psr\Log\LoggerInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 
 /**
  * Class WebsiteController
@@ -17,6 +16,8 @@ use Psr\Log\LoggerInterface;
 #[AutoController]
 class WebsiteController extends AbstractController
 {
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
 
     /**
      * @var WebsiteServiceInterface
@@ -24,17 +25,50 @@ class WebsiteController extends AbstractController
     #[Inject]
     private $websiteServiceClient;
 
-
-
-
     /**
      * 创建站点
      * @return array
      */
-    public function createWebsite()
+    public function addWebsite()
     {
-        $data = $this->request->all();
-        $result = $this->websiteServiceClient->createWebsite($data);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_column_id' => 'required',
+                'website_name' => 'required',
+                'website_url' => 'required',
+            ],
+            [
+                'website_column_id.required' => '栏目id不能为空',
+                'website_name.required' => '站点名称不能为空',
+                'website_url.required' => '网站地址不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if(isset($requireData['website_column_id']) &&  is_array($requireData['website_column_id'])){
+            $requireData['website_column_arr_id'] = json_encode($requireData['website_column_id']);
+            $requireData['website_column_id'] = end($requireData['website_column_id']);
+        }else if($requireData['website_column_id']=="0"){
+            $requireData['website_column_id'] = [0];
+        }else{
+            $id = [$requireData['website_column_id']];
+            $requireData['website_column_arr_id'] = json_encode($id);
+            $requireData['website_column_id'] = end($id);
+        }
+
+        if(isset($requireData['city_id']) && is_array($requireData['city_id'])){
+            $requireData['city_arr_id'] = json_encode($requireData['city_id']);
+            $requireData['city_id'] = end($requireData['city_id']);
+        }else{
+            $city_id = [0];
+            $requireData['city_arr_id'] = json_encode($city_id);
+            $requireData['city_id'] = end($city_id);
+        }
+        $result = $this->websiteServiceClient->createWebsite($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -42,12 +76,19 @@ class WebsiteController extends AbstractController
      * 获取站点列表
      * @return void
      */
-    public function getWebsitetList()
+    public function getWebsiteList()
     {
-        $keyword = $this->request->input("keyword",'');
+        $keyword = $this->request->input("keyWord",'');
         $page = (int)$this->request->input("page",1);
         $pageSize = (int)$this->request->input("pageSize",10);
+
         $result = $this->websiteServiceClient->getWebsitetList($keyword,$page,$pageSize);
+        if($result['data']){
+            foreach ($result['data']['rows'] as $k=>$v) {
+                $result['data']['rows'][$k]['city_arr_id'] = $v['city_arr_id']?json_decode($v['city_arr_id']):'';
+            }
+        }
+
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -57,10 +98,45 @@ class WebsiteController extends AbstractController
      */
     public function updateWebsite()
     {
-        $id = (int)$this->request->input("id",'');
-        $req = $this->request->all();
-        unset($req['id']);
-        $result = $this->websiteServiceClient->updateWebsite($id,$req);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+                'website_column_id' => 'required',
+                'website_name' => 'required',
+                'website_url' => 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'website_column_id.required' => '栏目id不能为空',
+                'website_name.required' => '站点名称不能为空',
+                'website_url.required' => '网站地址不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if(isset($requireData['website_column_id']) && is_array($requireData['website_column_id'])){
+            $requireData['website_column_arr_id'] = json_encode($requireData['website_column_id']);
+            $requireData['website_column_id'] = end($requireData['website_column_id']);
+        }else if($requireData['website_column_id']=="0"){
+            $requireData['website_column_id'] = [0];
+        }else{
+            $id = [$requireData['website_column_id']];
+            $requireData['website_column_arr_id'] = json_encode($id);
+            $requireData['website_column_id'] = end($id);
+        }
+        if(isset($requireData['city_id']) && is_array($requireData['city_id'])){
+            $requireData['city_arr_id'] = json_encode($requireData['city_id']);
+            $requireData['city_id'] = end($requireData['city_id']);
+        }else{
+            $city_id = [0];
+            $requireData['city_arr_id'] = json_encode($city_id);
+            $requireData['city_id'] = end($city_id);
+        }
+        $result = $this->websiteServiceClient->updateWebsite($requireData['id'],$requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -85,7 +161,113 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->getWebsiteInfo($id);
 
         $this->logger->info('hello world',[1=>"ceshi"],["a"=>"11"]);
-//        $this->logger->error("====@@");
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    public function getWebsiteColumn()
+    {
+        $pid =  (int)$this->request->input("pid",0);
+        $result = $this->websiteServiceClient->getWebsiteColumn([]);
+        $rep = PublicData::buildMenuTree($result['data']);
+        return $rep?Result::success($rep):Result::error("查询失败");
+    }
+
+    /**
+     * 获取站点列表
+     * @return void
+     */
+    public function getWebsiteColumnList()
+    {
+        $keyword = $this->request->input("keyWord",'');
+        $page = (int)$this->request->input("page",1);
+        $pageSize = (int)$this->request->input("pageSize",10);
+
+        $result = $this->websiteServiceClient->getWebsiteColumnList($keyword,$page,$pageSize);
+        if($result['data']){
+            foreach ($result['data']['rows'] as $k=>$v) {
+                $result['data']['rows'][$k]['column_arr_id'] = $v['column_arr_id']?json_decode($v['column_arr_id']):[0];
+            }
+        }
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 创建栏目
+     * @return array
+     */
+    public function addWebsiteColumn()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'column_name' => 'required',
+                'column_arr_id' => 'required'
+            ],
+            [
+                'column_name.required' => '栏目名称不能为空',
+                'column_arr_id.required' => '栏目ID不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if(isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])){
+            $requireData['pid'] = end($requireData['column_arr_id']);
+            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
+
+        }else{
+            $column_arr_id= [0];
+            $requireData['column_arr_id'] = json_encode($column_arr_id);
+            $requireData['pid'] = end($column_arr_id);
+        }
+        $result = $this->websiteServiceClient->createWebsiteColumn($requireData);
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 创建栏目
+     * @return array
+     */
+    public function updateWebsiteColumn()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'column_name' => 'required',
+                'column_arr_id' => 'required'
+            ],
+            [
+                'column_name.required' => '栏目名称不能为空',
+                'column_arr_id.required' => '栏目ID不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if(isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])){
+            $requireData['pid'] = end($requireData['column_arr_id']);
+            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
+
+        }else{
+            $column_arr_id= [0];
+            $requireData['column_arr_id'] = json_encode($column_arr_id);
+            $requireData['pid'] = end($column_arr_id);
+        }
+        $result = $this->websiteServiceClient->updateWebsiteColumn($requireData['id'],$requireData);
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 删除栏目
+     * @return array
+     */
+    public function delWebsiteColumn()
+    {
+        $id = (int)$this->request->input("id",'');
+        $result = $this->websiteServiceClient->delWebsiteColumn($id);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 

app/JsonRpc/AuthorityService.php

@@ -63,4 +63,13 @@ class AuthorityService extends AbstractServiceClient implements AuthorityService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getRecursionMenu(array $data )
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/AuthorityServiceInterface.php

@@ -37,4 +37,11 @@ interface AuthorityServiceInterface
      * @return array
      */
     public function addMenu(array $data);
+
+    /**
+     * 查询菜单
+     * @param array $data
+     * @return array
+     */
+    public function getRecursionMenu(array $data);
 }

app/JsonRpc/PublicRpcService.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\JsonRpc;
+
+use Hyperf\RpcClient\AbstractServiceClient;
+
+class PublicRpcService extends AbstractServiceClient implements PublicRpcServiceInterface
+{
+    /**
+     * 定义对应服务提供者的服务名称
+     * @var string
+     */
+    protected string $serviceName = 'PublicRpcService';
+    /**
+     * 定义对应服务提供者的服务协议
+     * @var string
+     */
+    protected string $protocol = 'jsonrpc-http';
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getDistrictList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+}

app/JsonRpc/PublicRpcServiceInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\JsonRpc;
+interface PublicRpcServiceInterface
+{
+    /**
+     * @param array $data
+     */
+    public function getDistrictList(array $data);
+
+
+}

app/JsonRpc/UserService.php

@@ -75,4 +75,45 @@ class UserService extends AbstractServiceClient implements UserServiceInterface
     public function  delUser(int $id){
         return $this->__request(__FUNCTION__, compact('id'));
     }
+
+    /**
+     * 添加角色
+     * @param array $data
+     * @return array
+     */
+    public function addRole(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 删除角色
+     * @param array $data
+     * @return array
+     */
+    public function delRole(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 更新角色
+     * @param array $data
+     * @return array
+     */
+    public function updateRole(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 角色列表
+     * @param array $data
+     * @return array
+     */
+    public function roleList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 角色信息
+     * @param array $data
+     * @return array
+     */
+    public function roleInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/UserServiceInterface.php

@@ -47,4 +47,40 @@ interface UserServiceInterface
      * @return array
      */
     public function  delUser(int $id);
+
+
+    /**
+     * 添加角色
+     * @param array $data
+     * @return array
+     */
+    public function addRole(array $data);
+
+    /**
+     * 删除角色
+     * @param array $data
+     * @return array
+     */
+    public function delRole(array $data);
+
+    /**
+     * 更新角色
+     * @param array $data
+     * @return array
+     */
+    public function updateRole(array $data);
+
+    /**
+     * 角色列表
+     * @param array $data
+     * @return array
+     */
+    public function roleList(array $data);
+
+    /**
+     * 角色信息
+     * @param array $data
+     * @return array
+     */
+    public function roleInfo(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -26,7 +26,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsitetList(string $keyword, int $page, int $pageSize)
     {
-        // TODO: Implement getWebsitetList() method.
         return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
     }
 
@@ -36,7 +35,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function createWebsite(array $data)
     {
-        // TODO: Implement createWebsite() method.
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -47,7 +45,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsite(int $id, array $data)
     {
-        // TODO: Implement updateWebsite() method.
         return $this->__request(__FUNCTION__,$id, $data);
     }
 
@@ -57,7 +54,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsite(int $id)
     {
-        // TODO: Implement delWebsite() method.
         return $this->__request(__FUNCTION__,$id);
     }
 
@@ -67,7 +63,55 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsiteInfo(int $id)
     {
-        // TODO: Implement getWebsiteInfo() method.
+        return $this->__request(__FUNCTION__,$id);
+    }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteColumn(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+
+    /**
+     * @param string $keyword
+     * @param int $page
+     * @param int $pageSize
+     * @return mixed
+     */
+    public function getWebsiteColumnList(string $keyword, int $page, int $pageSize)
+    {
+        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function createWebsiteColumn(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param int $id
+     * @param array $data
+     * @return mixed
+     */
+    public function updateWebsiteColumn(int $id, array $data)
+    {
+        return $this->__request(__FUNCTION__,$id, $data);
+    }
+
+    /**
+     * @param int $id
+     * @return mixed
+     */
+    public function delWebsiteColumn(int $id)
+    {
         return $this->__request(__FUNCTION__,$id);
     }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -35,4 +35,35 @@ interface WebsiteServiceInterface
      */
     public function getWebsiteInfo(int $id);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteColumn(array $data);
+
+    /**
+     * @param string $keyword
+     * @param int $page
+     * @param int $pageSize
+     */
+    public function getWebsiteColumnList(string $keyword,int $page,int $pageSize);
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function createWebsiteColumn(array $data);
+
+    /**
+     * @param int $id
+     * @param array $data
+     * @return array
+     */
+    public function updateWebsiteColumn(int $id,array $data);
+
+    /**
+     * @param int $id
+     * @return array
+     */
+    public function delWebsiteColumn(int $id);
 }

app/Middleware/CorsMiddleware.php

@@ -0,0 +1,25 @@
+<?php
+namespace App\Tools;
+use App\Constants\ErrorCode;
+class PublicData
+{
+    public static  function buildMenuTree($menuItems, $parentId = 0) {
+        $tree = [];
+        foreach ($menuItems as $item) {
+            if ($item['pid'] == $parentId) {
+                // 找到子菜单
+                $children = self::buildMenuTree($menuItems, $item['id']);
+                // 如果子菜单存在，则添加到当前菜单的children中
+                if ($children) {
+                    $item['children'] = $children;
+                }
+                // 将当前菜单添加到树中
+                $tree[] = $item;
+            }
+        }
+        return $tree;
+    }
+
+
+
+}

config/autoload/dependencies.php

@@ -12,6 +12,6 @@ declare(strict_types=1);
 return [
 //    App\JsonRpc\UserServiceInterface::class => App\JsonRpc\UserService::class,
 //    App\JsonRpc\AdServiceInterface::class => App\JsonRpc\AdService::class,
-    App\JsonRpc\WebsiteServiceInterface::class => App\JsonRpc\WebsiteService::class,
+//    App\JsonRpc\WebsiteServiceInterface::class => App\JsonRpc\WebsiteService::class,
 ];
 

config/autoload/services.php

@@ -38,6 +38,15 @@ return [
                 ['host' => '192.168.31.193', 'port' => 9502],
             ],
         ],
+        [
+            //公共方法
+            'name' => 'PublicRpcService',
+            'service' => \App\JsonRpc\PublicRpcServiceInterface::class,
+            // 直接对指定的节点进行消费，通过下面的 nodes 参数来配置服务提供者的节点信息
+            'nodes' => [
+                ['host' => '192.168.31.193', 'port' => 9502],
+            ],
+        ],
     ],
 ];
 

runtime/container/proxy/App_Controller_AbstractController.proxy.php

@@ -39,8 +39,8 @@ abstract class AbstractController
         // 第一个参数对应日志的 name, 第二个参数对应 config/autoload/logger.php 内的 key
         $this->logger = $loggerFactory->get('admin_consumer:', 'default');
         $headers = $this->request->getHeaders();
-        var_dump($headers);
-        if ($headers && isset($headers['token']) && isset($headers['token'][0])) {
+        var_dump($headers['token'][0] != 'null');
+        if ($headers && isset($headers['token']) && $headers['token'][0] != 'null' && isset($headers['token'][0])) {
             $userInfo = $this->jwt->getClaimsByToken($headers['token'][0]);
             $this->UserId = $userInfo['uid'];
         }

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -4,6 +4,7 @@ declare (strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\AuthorityServiceInterface;
+use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
@@ -63,14 +64,22 @@ class AuthorityController extends AbstractController
      * 添加菜单
      * @return array|void
      */
-    public function addMent()
+    public function addMenu()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['pid' => 'required', 'label' => 'required', 'url' => 'required'], ['pid.required' => '父级id不能为空', 'label.required' => '菜单名称不能为空', 'url.required' => '路由地址不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['label' => 'required', 'url' => 'required'], ['label.required' => '菜单名称不能为空', 'url.required' => '路由地址不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        if (isset($requireData['pid']) && is_array($requireData['pid'])) {
+            $requireData['pid_arr'] = json_encode($requireData['pid']);
+            $requireData['pid'] = end($requireData['pid']);
+        } else {
+            $id = [0];
+            $requireData['pid_arr'] = json_encode($id);
+            $requireData['pid'] = end($id);
+        }
         $result = $this->authorityServiceClient->addMenu($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -78,7 +87,7 @@ class AuthorityController extends AbstractController
      * 修改菜单
      * @return array|void
      */
-    public function updateMent()
+    public function updateMenu()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'pid' => 'required', 'label' => 'required', 'url' => 'required'], ['id.required' => 'id不能为空', 'pid.required' => '父级id不能为空', 'label.required' => '菜单名称不能为空', 'url.required' => '路由地址不能为空']);
@@ -86,7 +95,25 @@ class AuthorityController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        if (isset($requireData['pid']) && is_array($requireData['pid'])) {
+            $requireData['pid_arr'] = json_encode($requireData['pid']);
+            $requireData['pid'] = end($requireData['pid']);
+        } else {
+            $id = [0];
+            $requireData['pid_arr'] = json_encode($id);
+            $requireData['pid'] = end($id);
+        }
         $result = $this->authorityServiceClient->updateMenu($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 菜单递归查询处理
+     * @return void
+     */
+    public function getRecursionMenu()
+    {
+        $result = $this->authorityServiceClient->getRecursionMenu([]);
+        $rep = PublicData::buildMenuTree($result['data']);
+        return $rep ? Result::success($rep) : Result::error("查询失败");
+    }
 }

runtime/container/proxy/App_Controller_IndexController.proxy.php

@@ -0,0 +1,42 @@
+<?php
+
+declare (strict_types=1);
+namespace App\Controller;
+
+use App\JsonRpc\PublicRpcServiceInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
+/**
+ * Class PublicController
+ * @package App\Controller
+ */
+#[AutoController]
+class PublicController extends AbstractController
+{
+    use \Hyperf\Di\Aop\ProxyTrait;
+    use \Hyperf\Di\Aop\PropertyHandlerTrait;
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    {
+        if (method_exists(parent::class, '__construct')) {
+            parent::__construct(...func_get_args());
+        }
+        $this->__handlePropertyHandler(__CLASS__);
+    }
+    /**
+     * @var PublicRpcServiceInterface
+     */
+    #[Inject]
+    private $publicServiceClient;
+    /**
+     * 创建站点
+     * @return array
+     */
+    public function getDistrictList()
+    {
+        $pid = $this->request->input("pid", 0);
+        $data = ['pid' => $pid];
+        $result = $this->publicServiceClient->getDistrictList($data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+}

runtime/container/proxy/App_Controller_PublicRpcController.proxy.php

@@ -0,0 +1,43 @@
+<?php
+
+declare (strict_types=1);
+namespace App\Controller;
+
+use App\JsonRpc\PublicRpcServiceInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
+/**
+ * Class PublicRpcController
+ * @package App\Controller
+ */
+#[AutoController]
+class PublicRpcController extends AbstractController
+{
+    use \Hyperf\Di\Aop\ProxyTrait;
+    use \Hyperf\Di\Aop\PropertyHandlerTrait;
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    {
+        if (method_exists(parent::class, '__construct')) {
+            parent::__construct(...func_get_args());
+        }
+        $this->__handlePropertyHandler(__CLASS__);
+    }
+    /**
+     * @var PublicRpcServiceInterface
+     */
+    #[Inject]
+    private $publicRpcServiceClient;
+    /**
+     * 创建站点
+     * @return array
+     */
+    public function getDistrictList()
+    {
+        var_dump("4444444444444");
+        die;
+        $data = [];
+        $result = $this->publicRpcServiceClient->getDistrictList($data);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+}

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -4,11 +4,11 @@ declare (strict_types=1);
 namespace App\Controller;
 
 use App\JsonRpc\WebsiteServiceInterface;
+use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
-use App\Constants\ErrorCode;
-use Psr\Log\LoggerInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -25,6 +25,8 @@ class WebsiteController extends AbstractController
         }
         $this->__handlePropertyHandler(__CLASS__);
     }
+    #[Inject]
+    protected ValidatorFactoryInterface $validationFactory;
     /**
      * @var WebsiteServiceInterface
      */
@@ -34,22 +36,52 @@ class WebsiteController extends AbstractController
      * 创建站点
      * @return array
      */
-    public function createWebsite()
+    public function addWebsite()
     {
-        $data = $this->request->all();
-        $result = $this->websiteServiceClient->createWebsite($data);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['website_column_id' => 'required', 'website_name' => 'required', 'website_url' => 'required'], ['website_column_id.required' => '栏目id不能为空', 'website_name.required' => '站点名称不能为空', 'website_url.required' => '网站地址不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if (isset($requireData['website_column_id']) && is_array($requireData['website_column_id'])) {
+            $requireData['website_column_arr_id'] = json_encode($requireData['website_column_id']);
+            $requireData['website_column_id'] = end($requireData['website_column_id']);
+        } else {
+            if ($requireData['website_column_id'] == "0") {
+                $requireData['website_column_id'] = [0];
+            } else {
+                $id = [$requireData['website_column_id']];
+                $requireData['website_column_arr_id'] = json_encode($id);
+                $requireData['website_column_id'] = end($id);
+            }
+        }
+        if (isset($requireData['city_id']) && is_array($requireData['city_id'])) {
+            $requireData['city_arr_id'] = json_encode($requireData['city_id']);
+            $requireData['city_id'] = end($requireData['city_id']);
+        } else {
+            $city_id = [0];
+            $requireData['city_arr_id'] = json_encode($city_id);
+            $requireData['city_id'] = end($city_id);
+        }
+        $result = $this->websiteServiceClient->createWebsite($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 获取站点列表
      * @return void
      */
-    public function getWebsitetList()
+    public function getWebsiteList()
     {
-        $keyword = $this->request->input("keyword", '');
+        $keyword = $this->request->input("keyWord", '');
         $page = (int) $this->request->input("page", 1);
         $pageSize = (int) $this->request->input("pageSize", 10);
         $result = $this->websiteServiceClient->getWebsitetList($keyword, $page, $pageSize);
+        if ($result['data']) {
+            foreach ($result['data']['rows'] as $k => $v) {
+                $result['data']['rows'][$k]['city_arr_id'] = $v['city_arr_id'] ? json_decode($v['city_arr_id']) : '';
+            }
+        }
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -58,10 +90,33 @@ class WebsiteController extends AbstractController
      */
     public function updateWebsite()
     {
-        $id = (int) $this->request->input("id", '');
-        $req = $this->request->all();
-        unset($req['id']);
-        $result = $this->websiteServiceClient->updateWebsite($id, $req);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'website_column_id' => 'required', 'website_name' => 'required', 'website_url' => 'required'], ['id.required' => 'id不能为空', 'website_column_id.required' => '栏目id不能为空', 'website_name.required' => '站点名称不能为空', 'website_url.required' => '网站地址不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if (isset($requireData['website_column_id']) && is_array($requireData['website_column_id'])) {
+            $requireData['website_column_arr_id'] = json_encode($requireData['website_column_id']);
+            $requireData['website_column_id'] = end($requireData['website_column_id']);
+        } else {
+            if ($requireData['website_column_id'] == "0") {
+                $requireData['website_column_id'] = [0];
+            } else {
+                $id = [$requireData['website_column_id']];
+                $requireData['website_column_arr_id'] = json_encode($id);
+                $requireData['website_column_id'] = end($id);
+            }
+        }
+        if (isset($requireData['city_id']) && is_array($requireData['city_id'])) {
+            $requireData['city_arr_id'] = json_encode($requireData['city_id']);
+            $requireData['city_id'] = end($requireData['city_id']);
+        } else {
+            $city_id = [0];
+            $requireData['city_arr_id'] = json_encode($city_id);
+            $requireData['city_id'] = end($city_id);
+        }
+        $result = $this->websiteServiceClient->updateWebsite($requireData['id'], $requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -83,7 +138,86 @@ class WebsiteController extends AbstractController
         $id = (int) $this->request->input("id", '');
         $result = $this->websiteServiceClient->getWebsiteInfo($id);
         $this->logger->info('hello world', [1 => "ceshi"], ["a" => "11"]);
-        //        $this->logger->error("====@@");
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function getWebsiteColumn()
+    {
+        $pid = (int) $this->request->input("pid", 0);
+        $result = $this->websiteServiceClient->getWebsiteColumn([]);
+        $rep = PublicData::buildMenuTree($result['data']);
+        return $rep ? Result::success($rep) : Result::error("查询失败");
+    }
+    /**
+     * 获取站点列表
+     * @return void
+     */
+    public function getWebsiteColumnList()
+    {
+        $keyword = $this->request->input("keyWord", '');
+        $page = (int) $this->request->input("page", 1);
+        $pageSize = (int) $this->request->input("pageSize", 10);
+        $result = $this->websiteServiceClient->getWebsiteColumnList($keyword, $page, $pageSize);
+        if ($result['data']) {
+            foreach ($result['data']['rows'] as $k => $v) {
+                $result['data']['rows'][$k]['column_arr_id'] = $v['column_arr_id'] ? json_decode($v['column_arr_id']) : [0];
+            }
+        }
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 创建栏目
+     * @return array
+     */
+    public function addWebsiteColumn()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if (isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])) {
+            $requireData['pid'] = end($requireData['column_arr_id']);
+            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
+        } else {
+            $column_arr_id = [0];
+            $requireData['column_arr_id'] = json_encode($column_arr_id);
+            $requireData['pid'] = end($column_arr_id);
+        }
+        $result = $this->websiteServiceClient->createWebsiteColumn($requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 创建栏目
+     * @return array
+     */
+    public function updateWebsiteColumn()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if (isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])) {
+            $requireData['pid'] = end($requireData['column_arr_id']);
+            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
+        } else {
+            $column_arr_id = [0];
+            $requireData['column_arr_id'] = json_encode($column_arr_id);
+            $requireData['pid'] = end($column_arr_id);
+        }
+        $result = $this->websiteServiceClient->updateWebsiteColumn($requireData['id'], $requireData);
+        return $result ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除栏目
+     * @return array
+     */
+    public function delWebsiteColumn()
+    {
+        $id = (int) $this->request->input("id", '');
+        $result = $this->websiteServiceClient->delWebsiteColumn($id);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

runtime/container/proxy/App_JsonRpc_AdServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class AuthorityServiceInterface_d7c83bbdf31b209726780ad3a4224d55 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
+class AuthorityServiceInterface_20bb7ca5e1d7d3690366242eda0b14c9 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
 {
     /**
      * 菜单列表
@@ -49,4 +49,13 @@ class AuthorityServiceInterface_d7c83bbdf31b209726780ad3a4224d55 extends \Hyperf
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * 查询菜单
+     * @param array $data
+     * @return array
+     */
+    public function getRecursionMenu(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/container/proxy/App_JsonRpc_PublicRpcServiceInterface.rpc-client.proxy.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\JsonRpc;
+
+class PublicRpcServiceInterface_9d9b1d564aaa0a72ee71e63fec661a83 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements PublicRpcServiceInterface
+{
+    /**
+     * @param array $data
+     */
+    public function getDistrictList(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+}

runtime/container/proxy/App_JsonRpc_UserServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class UserServiceInterface_73257ec18239bcd5d672e95ad562f189 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements UserServiceInterface
+class UserServiceInterface_5d0127d5fbfc0c9c37fe2b3a33c7857d extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements UserServiceInterface
 {
     /**
      * @param array $data
@@ -62,4 +62,49 @@ class UserServiceInterface_73257ec18239bcd5d672e95ad562f189 extends \Hyperf\RpcC
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * 添加角色
+     * @param array $data
+     * @return array
+     */
+    public function addRole(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * 删除角色
+     * @param array $data
+     * @return array
+     */
+    public function delRole(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * 更新角色
+     * @param array $data
+     * @return array
+     */
+    public function updateRole(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * 角色列表
+     * @param array $data
+     * @return array
+     */
+    public function roleList(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * 角色信息
+     * @param array $data
+     * @return array
+     */
+    public function roleInfo(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_13e8e98f8ec7afd8f973c30662b13598 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_159524aa485875b0c402c7e3193d925b extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
@@ -47,4 +47,46 @@ class WebsiteServiceInterface_13e8e98f8ec7afd8f973c30662b13598 extends \Hyperf\R
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteColumn(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param string $keyword
+     * @param int $page
+     * @param int $pageSize
+     */
+    public function getWebsiteColumnList(string $keyword, int $page, int $pageSize)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function createWebsiteColumn(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param int $id
+     * @param array $data
+     * @return array
+     */
+    public function updateWebsiteColumn(int $id, array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param int $id
+     * @return array
+     */
+    public function delWebsiteColumn(int $id)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/hyperf.pid

@@ -1 +1 @@
-6475
+9962

runtime/logs/hyperf.log

@@ -27,3 +27,15 @@
 [2024-06-14 11:34:36] admin_consumer:.INFO: 验证之前 [] []
 [2024-06-14 11:34:36] admin_consumer:.INFO: 验证之前 [] []
 [2024-06-14 11:34:37] admin_consumer:.INFO: 验证用户返回值： {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://img-blog.csdnimg.cn/direct/ceac7ca44c3040c4889de24f2dae4497.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 09:05:28","mobile":"3","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":8,"updated_at":"2024-06-11 09:05:28","created_at":"2024-06-11 09:05:28"}} []
+[2024-06-17 08:53:53] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:53:53] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:53:54] admin_consumer:.INFO: 验证用户返回值： {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://img-blog.csdnimg.cn/direct/ceac7ca44c3040c4889de24f2dae4497.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 09:05:28","mobile":"3","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":8,"updated_at":"2024-06-11 09:05:28","created_at":"2024-06-11 09:05:28"}} []
+[2024-06-17 08:57:32] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:57:32] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:57:32] admin_consumer:.INFO: 验证用户返回值： {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://img-blog.csdnimg.cn/direct/ceac7ca44c3040c4889de24f2dae4497.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 09:05:28","mobile":"3","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":8,"updated_at":"2024-06-11 09:05:28","created_at":"2024-06-11 09:05:28"}} []
+[2024-06-17 08:58:55] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:58:55] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-17 08:58:55] admin_consumer:.INFO: 验证用户返回值： {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://img-blog.csdnimg.cn/direct/ceac7ca44c3040c4889de24f2dae4497.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 09:05:28","mobile":"3","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":8,"updated_at":"2024-06-11 09:05:28","created_at":"2024-06-11 09:05:28"}} []
+[2024-06-18 11:39:14] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-18 11:39:14] admin_consumer:.INFO: 验证之前 [] []
+[2024-06-18 11:39:14] admin_consumer:.INFO: 验证用户返回值： {"code":200,"message":"success","data":{"id":32,"user_name":"1","password":"71ab877bcad54b1f348d59675c7980c7","avatar":"https://img-blog.csdnimg.cn/direct/ceac7ca44c3040c4889de24f2dae4497.jpeg","last_login_ip":null,"last_login_time":"2024-06-11 09:05:28","mobile":"3","status":1,"role_id":1,"email":"5@qq.com","salt":"569295","rong_token":"","level_id":8,"updated_at":"2024-06-11 09:05:28","created_at":"2024-06-11 09:05:28"}} []

runtime/logs/hyperf1.log

@@ -12,6 +12,7 @@ return array(
     'App\\Controller\\AuthorityController' => $baseDir . '/app/Controller/AuthorityController.php',
     'App\\Controller\\IndexController' => $baseDir . '/app/Controller/IndexController.php',
     'App\\Controller\\LoginController' => $baseDir . '/app/Controller/LoginController.php',
+    'App\\Controller\\PublicController' => $baseDir . '/app/Controller/PublicController.php',
     'App\\Controller\\UserController' => $baseDir . '/app/Controller/UserController.php',
     'App\\Controller\\WebsiteController' => $baseDir . '/app/Controller/WebsiteController.php',
     'App\\Exception\\Handler\\AppExceptionHandler' => $baseDir . '/app/Exception/Handler/AppExceptionHandler.php',
@@ -20,6 +21,8 @@ return array(
     'App\\JsonRpc\\AuthorityService' => $baseDir . '/app/JsonRpc/AuthorityService.php',
     'App\\JsonRpc\\AuthorityServiceInterface' => $baseDir . '/app/JsonRpc/AuthorityServiceInterface.php',
     'App\\JsonRpc\\DistrictServiceInterface' => $baseDir . '/app/JsonRpc/DistrictServiceInterface.php',
+    'App\\JsonRpc\\PublicRpcService' => $baseDir . '/app/JsonRpc/PublicRpcService.php',
+    'App\\JsonRpc\\PublicRpcServiceInterface' => $baseDir . '/app/JsonRpc/PublicRpcServiceInterface.php',
     'App\\JsonRpc\\UserService' => $baseDir . '/app/JsonRpc/UserService.php',
     'App\\JsonRpc\\UserServiceInterface' => $baseDir . '/app/JsonRpc/UserServiceInterface.php',
     'App\\JsonRpc\\WebsiteService' => $baseDir . '/app/JsonRpc/WebsiteService.php',
@@ -29,6 +32,7 @@ return array(
     'App\\Middleware\\Auth\\FooMiddleware' => $baseDir . '/app/Middleware/Auth/FooMiddleware.php',
     'App\\Middleware\\CorsMiddleware' => $baseDir . '/app/Middleware/CorsMiddleware.php',
     'App\\Model\\Model' => $baseDir . '/app/Model/Model.php',
+    'App\\Tools\\PublicData' => $baseDir . '/app/Tools/PublicData.php',
     'App\\Tools\\Result' => $baseDir . '/app/Tools/Result.php',
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',

vendor/composer/autoload_static.php

@@ -760,6 +760,7 @@ class ComposerStaticInited6e1e4568df3e81747ba57e8b3d7786
         'App\\Controller\\AuthorityController' => __DIR__ . '/../..' . '/app/Controller/AuthorityController.php',
         'App\\Controller\\IndexController' => __DIR__ . '/../..' . '/app/Controller/IndexController.php',
         'App\\Controller\\LoginController' => __DIR__ . '/../..' . '/app/Controller/LoginController.php',
+        'App\\Controller\\PublicController' => __DIR__ . '/../..' . '/app/Controller/PublicController.php',
         'App\\Controller\\UserController' => __DIR__ . '/../..' . '/app/Controller/UserController.php',
         'App\\Controller\\WebsiteController' => __DIR__ . '/../..' . '/app/Controller/WebsiteController.php',
         'App\\Exception\\Handler\\AppExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/AppExceptionHandler.php',
@@ -768,6 +769,8 @@ class ComposerStaticInited6e1e4568df3e81747ba57e8b3d7786
         'App\\JsonRpc\\AuthorityService' => __DIR__ . '/../..' . '/app/JsonRpc/AuthorityService.php',
         'App\\JsonRpc\\AuthorityServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/AuthorityServiceInterface.php',
         'App\\JsonRpc\\DistrictServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/DistrictServiceInterface.php',
+        'App\\JsonRpc\\PublicRpcService' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcService.php',
+        'App\\JsonRpc\\PublicRpcServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcServiceInterface.php',
         'App\\JsonRpc\\UserService' => __DIR__ . '/../..' . '/app/JsonRpc/UserService.php',
         'App\\JsonRpc\\UserServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/UserServiceInterface.php',
         'App\\JsonRpc\\WebsiteService' => __DIR__ . '/../..' . '/app/JsonRpc/WebsiteService.php',
@@ -777,6 +780,7 @@ class ComposerStaticInited6e1e4568df3e81747ba57e8b3d7786
         'App\\Middleware\\Auth\\FooMiddleware' => __DIR__ . '/../..' . '/app/Middleware/Auth/FooMiddleware.php',
         'App\\Middleware\\CorsMiddleware' => __DIR__ . '/../..' . '/app/Middleware/CorsMiddleware.php',
         'App\\Model\\Model' => __DIR__ . '/../..' . '/app/Model/Model.php',
+        'App\\Tools\\PublicData' => __DIR__ . '/../..' . '/app/Tools/PublicData.php',
         'App\\Tools\\Result' => __DIR__ . '/../..' . '/app/Tools/Result.php',
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',