Merge branch '20250210_lj_zhanqun'

app/Controller/ChatController.php

@@ -70,22 +70,32 @@ class ChatController extends AbstractController
             return Result::error('好友ID不存在');
         }
         $result = $this->chatServiceClient->addFriend($requireData);
-       
+
         return $result ? Result::success($result['message']) : Result::error($result['message']);
     }
 
-   
+
     /**
      * 话题分类
      * @return array
      */
     public function topicType()
     {
-        $type = array(
-            '1' => '科研',
-            '2' => '维权',
-            '3' => '讨论',
-        );
+        $requireData = ['page' => 1, 'page_size' => 100];
+        $topicArray = $this->chatServiceClient->getTopicClassList($requireData);
+        $typeArr = $topicArray['data']['data'];
+        $type = array();
+        foreach ($typeArr as   $value) {
+            // var_dump($value['id'], '=-===2222222222');
+           $type[$value['id']] = (string) $value['topicname'];
+        }
+        // var_dump($type);
+        // exit;
+        // $type = array(
+        //     '1' => '科研',
+        //     '2' => '维权',
+        //     '3' => '讨论',
+        // );
         $result = array();
         foreach ($type as $k => $v) {
             $result[] = ['value' => $k, 'label' => $v];
@@ -193,7 +203,7 @@ class ChatController extends AbstractController
     public function applyFriend()
     {
         $requireData = $this->request->all();
-        $frindid =$requireData['friend_id']??0;
+        $frindid = $requireData['friend_id'] ?? 0;
         unset($requireData['friend_id']);
         unset($requireData['apply_id']);
         // 定义验证规则
@@ -222,36 +232,36 @@ class ChatController extends AbstractController
             $redisClient = new RedisService();
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['user_id'], 'status' => 2]);
             // var_dump($myFriends, '--------------------1');
-            $redisClient->setUserFriends((string)$requireData['user_id'], $myFriends['data']);
+            $redisClient->setUserFriends((string) $requireData['user_id'], $myFriends['data']);
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $frindid, 'status' => 2]);
-             var_dump($myFriends, '-------------3-------1');
-            $redisClient->setUserFriends((string)$frindid, $myFriends['data']);
-            $result =  $redisClient->getUserFriends((string)$requireData['user_id']);
+            var_dump($myFriends, '-------------3-------1');
+            $redisClient->setUserFriends((string) $frindid, $myFriends['data']);
+            $result = $redisClient->getUserFriends((string) $requireData['user_id']);
             // var_dump($result,'redis-结果');
-            $result =  $redisClient->getUserFriends((string)$frindid);
+            $result = $redisClient->getUserFriends((string) $frindid);
             // var_dump($result,'redis-结果');
             //redis 添加好友
             $result = $realResult;
         }
-        return $result && $result['code'] != 0 ? Result::success($result['data']) :     Result::error($result['message']);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
-     /**
+    /**
      * 批量设置redis好友
      * @return array
      */
     public function setFriends()
     {
         //获取所有用户
-        $userList = $this->userServiceClient->getUserList(['page' => 1, 'pageSize' => 1000 ]);
+        $userList = $this->userServiceClient->getUserList(['page' => 1, 'pageSize' => 1000]);
         //获取id，循环写入redis
         $userList = $userList['data']['rows'];
-        var_dump($userList,'111111111111');
-        
+        var_dump($userList, '111111111111');
+
         $redisClient = new RedisService();
         foreach ($userList as $key => $value) {
-            var_dump($value,'----------------------');
+            var_dump($value, '----------------------');
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $value['id'], 'status' => 2]);
-            $redisClient->setUserFriends((string)$value['id'], $myFriends['data']);
+            $redisClient->setUserFriends((string) $value['id'], $myFriends['data']);
         }
         return Result::success();
     }
@@ -282,10 +292,10 @@ class ChatController extends AbstractController
         if ($result && $result['code'] != 0) {
             $redisClient = new RedisService();
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['user_id'], 'status' => 2]);
-            $redisClient->setUserFriends((string)$requireData['user_id'], $myFriends['data']);
+            $redisClient->setUserFriends((string) $requireData['user_id'], $myFriends['data']);
 
             $myFriends = $this->chatServiceClient->getFriendsList(['user_id' => $requireData['friend_id'], 'status' => 2]);
-            $redisClient->setUserFriends((string)$requireData['friend_id'], $myFriends['data']);
+            $redisClient->setUserFriends((string) $requireData['friend_id'], $myFriends['data']);
         }
         return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -640,7 +650,7 @@ class ChatController extends AbstractController
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->joinGroup($requireData);
-        var_dump($result,'-----------1--------');
+        var_dump($result, '-----------1--------');
         return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -859,8 +869,8 @@ class ChatController extends AbstractController
         $result = $this->chatServiceClient->getTopicReply($requireData);
         return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    
-    
+
+
     /**
      * 获取 access_token
      * @return array
@@ -916,7 +926,7 @@ class ChatController extends AbstractController
             ]
         );
         if ($validator->fails()) {
-            $errorMessage =$validator->errors()->first();
+            $errorMessage = $validator->errors()->first();
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->clearRecords($requireData);
@@ -939,7 +949,7 @@ class ChatController extends AbstractController
             ]
         );
         if ($validator->fails()) {
-            $errorMessage= $validator->errors()->first();
+            $errorMessage = $validator->errors()->first();
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->clearGroupRecords($requireData);
@@ -950,7 +960,7 @@ class ChatController extends AbstractController
      * @return array
      */
     public function recallRecord()
-    { 
+    {
 
         $webSocketController = ApplicationContext::getContainer()->get(WebSocketController::class);
         $frame = new Frame();
@@ -960,10 +970,10 @@ class ChatController extends AbstractController
             'receiver_id' => 2, // 接收者 ID
             'content' => 'Hello, this is a test message!'
         ]);
-    
+
         $webSocketController->send(1, 'Hello, World!');
         return Result::success('');
-    
+
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -988,15 +998,15 @@ class ChatController extends AbstractController
             $response = $this->chatServiceClient->getRecordByContent($requireData);
             // 如果成功，返回结果
             if ($response['code'] === 0) {
-                if(!empty($response['data']['id'])){
+                if (!empty($response['data']['id'])) {
                     $records = $response['data'];
-                    foreach($records as $record){
+                    foreach ($records as $record) {
                         //判断 created_at 是否大于一分钟
                         $createdAt = strtotime($record['created_at']);
                         $currentTime = time();
                         $timeDifference = $currentTime - $createdAt;
                         if ($timeDifference > 60) {
-                             return Result::error('超过一分钟，无法撤回');
+                            return Result::error('超过一分钟，无法撤回');
                         }
                     }
                 }
@@ -1026,11 +1036,11 @@ class ChatController extends AbstractController
             ]
         );
         if ($validator->fails()) {
-            $errorMessage= $validator->errors()->first();
+            $errorMessage = $validator->errors()->first();
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->getRecord($requireData);
-            return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
      * 删除一条topicRely
@@ -1072,7 +1082,7 @@ class ChatController extends AbstractController
             ]
         );
         if ($validator->fails()) {
-            $errorMessage =$validator->errors()->first();
+            $errorMessage = $validator->errors()->first();
         }
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->chatServiceClient->delAllReply($requireData);
@@ -1132,4 +1142,77 @@ class ChatController extends AbstractController
         $result = $this->chatServiceClient->applyTopic($requireData);
         return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    public function getTopicClassList()
+    {
+        $requireData = $this->request->all();
+        $result = $this->chatServiceClient->getTopicClassList($requireData);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function getTopicClassInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => 'TopicID不能为空',
+            ]
+        )
+        ;
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->chatServiceClient->getTopicClassInfo($requireData);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function addTopicClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'topicname' => 'required',
+            ],
+            [
+                'topicname.required' => '名称不能为空',
+            ]
+        )
+        ;
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->chatServiceClient->addTopicClass($requireData);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function updateTopicClass()
+    {
+        $requireData = $this->request->all();
+        $result = $this->chatServiceClient->updateTopicClass($requireData);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function deleteTopicClass()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => 'TopicID不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->chatServiceClient->deleteTopicClass($requireData);
+        return $result && $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/NewsController.php

@@ -9,6 +9,8 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
+use App\JsonRpc\UserServiceInterface;
+use App\JsonRpc\WebsiteServiceInterface;
 /**
  * Class NewsController
  * @package App\Controller
@@ -25,6 +27,18 @@ class NewsController extends AbstractController
     #[Inject]
     private $newsServiceClient;
 
+    /**
+     * @var UserServiceInterface
+     */
+    #[Inject]
+    private $userServiceClient;
+    /**
+     * @var WebsiteServiceInterface
+     */
+    #[Inject]
+    private $WebsiteServiceClient;
+
+
     /**
      * 导航池列表
      * @return void
@@ -47,8 +61,12 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
-
+         //获取用户信息
+        //  $user_id = Context::get("UserId");
+        //  $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+        //  var_dump("用户信息：",$userInfo);
+        //  $sszq = $userInfo['data']['sszq'];
+        //  $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
         $result = $this->newsServiceClient->getCategoryList($requireData);
         if($result['data']){
             foreach ($result['data']['rows'] as $k=>$v) {
@@ -80,8 +98,19 @@ class NewsController extends AbstractController
         }
 
         $requireData['website_id'] = Context::get("SiteId");
-
-        $result = $this->newsServiceClient->categoryList($requireData);
+         //获取用户信息
+         $user_id = Context::get("UserId");
+         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+         var_dump("用户信息：",$userInfo);
+         $sszq = $userInfo['data']['sszq'];
+         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
+         //管理员看所有
+         if($type_id == 10000){
+             $result = $this->newsServiceClient->categoryList($requireData);
+        } else {
+            $requireData['sszq'] = $sszq;
+            $result = $this->newsServiceClient->myCategoryList($requireData);
+        }
 //        $rep = PublicData::buildMenuTree($result['data']);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -218,6 +247,21 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['website_id'] = Context::get("SiteId");
+        //获取用户信息
+        $user_id = Context::get("UserId");
+        $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+        var_dump("用户信息：",$userInfo);
+        $sszq = $userInfo['data']['sszq'];
+        //获取websiteid
+        // $groupInfo = $this->WebsiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
+        // var_dump("groupInfo:",$groupInfo);
+        // $sszqstr = implode(',',json_decode($groupInfo['data']['web_ids']));
+
+        $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
+        $requireData['type_id'] = $type_id;
+        $requireData['user_id'] = $user_id;
+
+
         var_dump("资讯：",$requireData);
         $result = $this->newsServiceClient->getArticleList($requireData);
         //1通过，2待审核，3待发 4,拒绝 5删除
@@ -238,7 +282,7 @@ class NewsController extends AbstractController
                 $result['data']['rows'][$k]['islink'] = isset($v['islink']) && $v['islink']>0?true:false;
             }
         }
-        $result = $this->newsServiceClient->getArticleList($requireData);
+        // $result = $this->newsServiceClient->getArticleList($requireData);
 
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -275,6 +319,9 @@ class NewsController extends AbstractController
      */
     public function addArticle()
     {
+        // $a = ['asdlk1', '2342345234', [1, '222222222222']];
+        // var_dump(json_encode($a));
+        // return '222';
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
@@ -420,6 +467,9 @@ class NewsController extends AbstractController
         }
 
         $result = $this->newsServiceClient->getArticleInfo($requireData);
+        if($result['code']==0){
+             return Result::error($result['message']);
+        }
         $result['data']['cat_arr_id'] =  $result['data']['cat_arr_id']?json_decode($result['data']['cat_arr_id']):[];
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -449,4 +499,104 @@ class NewsController extends AbstractController
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+     //20250226  产品列表
+     public function getGoodList(){
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'page'=> 'integer|required',
+                 'page_size'=> 'integer|required',
+             ],
+             [
+                 'page.integer' => 'page必须是整型',
+                 'page_size.integer' => 'page_size必须是整型',
+                 'page.required' => 'page不能为空',
+                 'page_size.required' => 'page_size不能为空',
+                
+             ]
+         );
+         if ($validator->fails()) {
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result = $this->newsServiceClient->getGoodList($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+     }
+     public function getGoodInfo(){
+         $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);
+         }
+         $result = $this->newsServiceClient->getGoodInfo($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+         }
+     public function updateGood(){
+         $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);
+         }
+         $result = $this->newsServiceClient->updateGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']
+         );
+         }
+     public function addGood(){
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'name'=> 'required',
+                 'price'=> 'required',
+             ],
+             [
+                 'name.required' => '产品名称不能为空',
+                 'price.required' => '产品价格不能为空',
+             ]
+         );
+         if ($validator->fails()) {
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result = $this->newsServiceClient->addGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+         }
+     public function delGood(){
+         $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);
+         }
+         $result = $this->newsServiceClient->delGood($requireData);
+         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+     }
+
+      //20250226  产品列表
 }

app/Controller/WebsiteController.php

@@ -11,6 +11,7 @@ use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
 use Phper666\JWTAuth\JWT;
 use DateTime;
+use App\JsonRpc\UserServiceInterface;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -27,6 +28,14 @@ class WebsiteController extends AbstractController
     #[Inject]
     private $websiteServiceClient;
 
+
+     /**
+     * @var UserServiceInterface
+     */
+    #[Inject]
+    private $userServiceClient;
+
+    
     protected JWT $JWT;
     public function __construct(Jwt $JWT)
     {
@@ -1302,6 +1311,156 @@ class WebsiteController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
         
     }
+     //20250212  网站标识
+    public function addWebsiteGroup()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' =>'required',
+                'web_ids' =>'required',
+            ],
+            [
+                'name.required' => '网站标识名称不能为空',
+                'web_ids.required' => '网站标识不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->addWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function getWebsiteGrouplist()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required',
+                'pageSize' =>'required',
+            ],
+            [
+                'page.required' => 'page不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
 
+        $result = $this->websiteServiceClient->getWebsiteGrouplist($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function getWebsiteGroupInfo()
+    {
+        $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);
+        };
+        $result = $this->websiteServiceClient->getWebsiteGroupInfo($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    public function updateWebsiteGroup()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+                'name' => 'required',
+                'web_ids' => 'required',
+            ],
+            [
+                'id.required' => '网站标识id不能为空',
+                'name.required' => '网站标识名称不能为空',
+                'web_ids.required' => '网站标识不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+        $result = $this->websiteServiceClient->updateWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
+    public function deleteWebsiteGroup()
+    {
+        $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);
+        };
+        $result = $this->websiteServiceClient->deleteWebsiteGroup($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
+    //获取网站下导航列表
+    public function getWebsiteNavList()
+    {
+        $requireData = $this->request->all();
 
+        var_dump("获取网站下导航列表",$requireData);
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'pid' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'pid.required' => '父级id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage= $validator->errors()->first();
+            return Result::error($errorMessage);
+        };
+
+         //获取用户信息
+         $user_id = Context::get("UserId");
+         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
+         var_dump("用户信息：",$userInfo);
+         $sszq = $userInfo['data']['sszq'];
+         if($sszq == ""){
+             return Result::error("请配置用户的网站标识");
+         }
+         //获取websiteid
+         $groupInfo = $this->websiteServiceClient->getWebsiteGroupInfo(['id' => $sszq]);
+         var_dump("groupInfo:",$groupInfo);
+         if(empty($groupInfo['data'])){
+             return Result::error("没有找到该网站标识");
+         }
+         if(empty($groupInfo['data']['web_ids'])){
+            return Result::error("该网站标识没有绑定网站");
+         }
+         $sszqarr =  json_decode($groupInfo['data']['web_ids']);
+         var_dump($website_id = Context::get("SiteId")??2 ,'------------website------'); 
+        if (!in_array($website_id, $sszqarr)) {
+            return Result::error("您没有权限访问该网站");
+        }
+        $result = $this->websiteServiceClient->getWebsiteNavList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']); 
+    }
 }

app/JsonRpc/ChatService.php

@@ -200,4 +200,21 @@ class ChatService extends AbstractServiceClient implements ChatServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+
+    public function getTopicClassList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addTopicClass(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateTopicClass(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function deleteTopicClass(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getTopicClassInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/ChatServiceInterface.php

@@ -50,4 +50,10 @@ interface ChatServiceInterface
     public function getTopicsListAdmin(array $data);
     public function applyTopic(array $data);
 
+    public function getTopicClassList(array $data);
+    public function addTopicClass(array $data);
+    public function updateTopicClass(array $data);
+    public function deleteTopicClass(array $data);
+    public function getTopicClassInfo(array $data);
+
 }

app/JsonRpc/NewsService.php

@@ -26,7 +26,15 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
+    
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function myCategoryList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return array
@@ -143,6 +151,27 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
         return $this->__request(__FUNCTION__, $data);
     }
 
+     //20250226  产品列表
+    public function getGoodList(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getGoodInfo(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateGood(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
+  
+    
+     //20250226  产品列表
+    
+
     /**
      * @param array $data
      * @return array|mixed

app/JsonRpc/NewsServiceInterface.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\JsonRpc;
+
 interface NewsServiceInterface
 {
 
@@ -8,6 +9,11 @@ interface NewsServiceInterface
      * @param array $data
      */
     public function getCategoryList(array $data);
+
+    /**
+     * @param array $data
+     */
+    public function myCategoryList(array $data);
     /**
      * @param array $data
      */
@@ -30,7 +36,7 @@ interface NewsServiceInterface
 
     /**
      * @param array $data
-    */
+     */
     public function getArticleList(array $data);
 
     /**
@@ -71,28 +77,27 @@ interface NewsServiceInterface
      */
     public function upArticleStatus(array $data);
 
-
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteArticleList(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function selectWebsiteArticleInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteSurvey(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function addWebsiteSurveyOption(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */
@@ -104,5 +109,12 @@ interface NewsServiceInterface
      */
     public function checkCategoryName(array $data);
 
+    //20250226  产品列表
+    public function getGoodList(array $data);
+    public function getGoodInfo(array $data);
+    public function addGood(array $data);
+    public function updateGood(array $data);
+    public function delGood(array $data);
+    //20250226  产品列表
 
-}
+}

app/JsonRpc/WebsiteService.php

@@ -553,4 +553,30 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
     
+
+    //20250212  网站标识
+    public function addWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteGroupList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteGroupInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function deleteWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function updateWebsiteGroup(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getWebsiteNavList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -1,5 +1,6 @@
 <?php
 namespace App\JsonRpc;
+
 interface WebsiteServiceInterface
 {
     /**
@@ -20,7 +21,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsite(int $id,array $data);
+    public function updateWebsite(int $id, array $data);
 
     /**
      * @param int $id
@@ -59,7 +60,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteColumn(int $id,array $data);
+    public function updateWebsiteColumn(int $id, array $data);
 
     /**
      * @param int $id
@@ -72,7 +73,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteRoleList(string $keyword,int $page,int $pageSize,int $websiteId);
+    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize, int $websiteId);
     /**
      * @param array $data
      * @return array
@@ -84,7 +85,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteRole(int $id,array $data);
+    public function updateWebsiteRole(int $id, array $data);
 
     /**
      * @param int $id
@@ -97,7 +98,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteRoleUserList(string $keyword,int $page,int $pageSize,int $websiteId,int $roleId);
+    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize, int $websiteId, int $roleId);
 
     /**
      * @param array $data
@@ -110,7 +111,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsiteRoleUser(int $id,array $data);
+    public function updateWebsiteRoleUser(int $id, array $data);
 
     /**
      * @param int $id
@@ -118,7 +119,6 @@ interface WebsiteServiceInterface
      */
     public function delWebsiteRoleUser(int $id);
 
-
     /**
      * @param array $data
      * @return mixed
@@ -126,7 +126,6 @@ interface WebsiteServiceInterface
 
     public function getWebsiteId(array $data);
 
-
     /**
      * @param array $data
      * @return mixed
@@ -134,7 +133,6 @@ interface WebsiteServiceInterface
      */
 
     public function getWebsiteCategory(array $data);
-     
 
     /**
      * @param array $data
@@ -176,15 +174,6 @@ interface WebsiteServiceInterface
 
     public function selectWebsiteLinks(array $data);
 
-
-
-
-
-
-
-
-
-
     /**
      * @param array $data
      * @return mixed
@@ -316,68 +305,72 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteTemplateintel(array $data);
-    /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
-   public function addWebsiteTemplateintel(array $data);
-    /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function addWebsiteTemplateintel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getAllTemplateClass(array $data);
-     /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function getWebsiteTemplateList(array $data);
-   /** 
-    * @param array $data
-    * @return mixed
-    *
-    */
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
     public function addWebsiteTemplateclassintel(array $data);
-    
 
-
-
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFootInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategory(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategoryList(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteFooterCategoryInfo(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function selectWebsiteCategory(array $data);
-     /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getWebsiteCategoryHead(array $data);
-      /**
+    /**
      * @param array $data
      * @return mixed
      */
     public function getOneWebsiteCategory(array $data);
-     
+
+    //20250212  网站标识
+    public function addWebsiteGroup(array $data);
+    public function getWebsiteGroupList(array $data);
+    public function deleteWebsiteGroup(array $data);
+    public function getWebsiteGroupInfo(array $data);
+    public function updateWebsiteGroup(array $data);
+    public function getWebsiteNavList(array $data);
 }

bin/hyperf.php

@@ -0,0 +1,31 @@
+#!/usr/bin/env php
+<?php
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+ini_set('display_errors', 'on');
+ini_set('display_startup_errors', 'on');
+ini_set('memory_limit', '1G');
+
+error_reporting(E_ALL);
+
+! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
+
+require BASE_PATH . '/vendor/autoload.php';
+
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', Hyperf\Engine\DefaultOption::hookFlags());
+
+// Self-called anonymous function that creates its own scope and keep the global namespace clean.
+(function () {
+    Hyperf\Di\ClassLoader::init();
+    /** @var Psr\Container\ContainerInterface $container */
+    $container = require BASE_PATH . '/config/container.php';
+
+    $application = $container->get(Hyperf\Contract\ApplicationInterface::class);
+    $application->run();
+})();

config/api/chat.php

@@ -54,6 +54,12 @@ Router::addGroup(
         Router::post('/getTopicsListAdmin', [ChatController::class, 'getTopicsListAdmin']);
 
         Router::post('/uploadFile', [ChatController::class, 'uploadFile']);
+
+        Router::post('/getTopicClassList', [ChatController::class, 'getTopicClassList']);
+        Router::post('/addTopicClass', [ChatController::class, 'addTopicClass']);
+        Router::post('/deleteTopicClass', [ChatController::class, 'deleteTopicClass']);
+        Router::post('/updateTopicClass', [ChatController::class, 'updateTopicClass']);
+        Router::post('/getTopicClassInfo', [ChatController::class, 'getTopicClassInfo']);
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/news.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 
 use App\Controller\NewsController;
 use Hyperf\HttpServer\Router\Router;
@@ -9,6 +9,9 @@ Router::addGroup(
     '/news', function () {
         //获取导航池列表
         Router::get('/getCategoryList', [NewsController::class, 'getCategoryList']);
+        //后台获取  我的导航池
+        Router::get('/myCategoryList', [NewsController::class, 'myCategoryList']);
+
         //导航池 筛选 搜索
         Router::get('/categoryList', [NewsController::class, 'categoryList']);
         //添加导航池
@@ -37,6 +40,13 @@ Router::addGroup(
         Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
 
 
-},
+        //20250226  产品列表
+        Router::post('/getGoodList', [NewsController::class, 'getGoodList']);
+        Router::post('/getGoodInfo', [NewsController::class, 'getGoodInfo']);
+        Router::post('/addGood', [NewsController::class, 'addGood']);
+        Router::post('/updateGood', [NewsController::class, 'updateGood']);
+        Router::post('/delGood', [NewsController::class, 'delGood']);
+        //20250226  产品列表
+    },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/website.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 
 use App\Controller\WebsiteController;
 use Hyperf\HttpServer\Router\Router;
@@ -71,8 +71,6 @@ Router::addGroup(
         //管理后台数据统计
         Router::get('/getAdminIndex', [WebsiteController::class, 'getAdminIndex']);
 
-
-
         //搜索网站列表
         Router::get('/websiteList', [WebsiteController::class, 'websiteList']);
         //检测网站名称是否存在
@@ -90,6 +88,23 @@ Router::addGroup(
         Router::post('/getWebsiteTemplateList', [WebsiteController::class, 'getWebsiteTemplateList']);
         //添加网站选择风格
         Router::post('/addWebsiteTemplateclassintel', [WebsiteController::class, 'addWebsiteTemplateclassintel']);
+        //获取网站标识列表
+        Router::get('/getWebsiteGroupList', [WebsiteController::class, 'getWebsiteGroupList']);
+
+        //20250212  网站标识
+        //添加网站标识
+        Router::post('/addWebsiteGroup', [WebsiteController::class, 'addWebsiteGroup']);
+        //删除网站标识
+        Router::post('/deleteWebsiteGroup', [WebsiteController::class, 'deleteWebsiteGroup']);
+        //修改网站标识
+        Router::post('/updateWebsiteGroup', [WebsiteController::class, 'updateWebsiteGroup']);
+        //获取网站标识信息
+        Router::post('/getWebsiteGroupInfo', [WebsiteController::class, 'getWebsiteGroupInfo']);
+        //获取网站标识下网站列表
+        Router::post('/getWebsiteGroupList', [WebsiteController::class, 'getWebsiteGroupList']);
+        //获取网站下导航列表
+        Router::post('/getWebsiteNavList', [WebsiteController::class, 'getWebsiteNavList']);
+
     },
     ['middleware' => [FooMiddleware::class]]
 );