提测版本

app/Controller/AbstractController.php

@@ -17,7 +17,9 @@ use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 
 
+use Hyperf\Logger\LoggerFactory;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 abstract class AbstractController
 {
@@ -29,6 +31,15 @@ abstract class AbstractController
 
     #[Inject]
     protected ResponseInterface $response;
-
+    
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+//    public function __construct(LoggerFactory $loggerFactory)
+//    {
+//        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
+//        $this->logger->info("项目启动访问一次");
+//    }
 
 }

app/Controller/NewsController.php

@@ -78,7 +78,6 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
 //        $requireData['website_id'] = Context::get("SiteId");
-
         $result = $this->newsServiceClient->categoryList($requireData);
         $rep = PublicData::buildMenuTree($result['data']);
         return $result ? Result::success($rep) : Result::error($result['message']);
@@ -277,6 +276,7 @@ class NewsController extends AbstractController
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
         $requireData['admin_user_id'] =Context::get("UserId");
+        
         $requireData['level'] = isset($requireData['level']) &&  $requireData['level']?$requireData['level']:0;
         $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits']?$requireData['hits']:0;
         $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original']?$requireData['is_original']:0;
@@ -365,7 +365,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/OrderController.php

@@ -26,31 +26,35 @@ class OrderController extends AbstractController
      */
     #[Inject]
     private $orderServiceClient;
+    public function index(RequestInterface $request, ResponseInterface $response)
+    {
+        return $response->raw('Hello Hyperf!');
+    }
+
     /***
      * 状态说明
      */
-    public function getStatus()
+    public function getStauts()
     {
         $data['order'] = [
-            1 => '已通过',
-            2 => '已驳回',
-            3 => '已撤回',
-            4 => '已修改',
-            5 => '已过期',
+            1 => '通过',
+            2 => '驳回',
+            3 => '撤回',
+            4 => '修改',
+            5 => '过期',
             6 => '待审核',
-            7 => '已结束'
+            7 => '结束',
         ];
         $data['order_ad'] = [
             1 => '待投放',
-            2 => '已驳回',
-            3 => '已撤回',
-            4 => '已修改',
-            5 => '已过期',
+            2 => '驳回',
+            3 => '撤回',
+            4 => '修改',
+            5 => '过期',
             6 => '待审核',
-            7 => '已结束',
-            8 => '投放中'
+            7 => '结束',
+            8 => '投放中',
         ];
-
         return Result::success($data);
 
     }
@@ -322,7 +326,7 @@ class OrderController extends AbstractController
     /**
      * 删除订单
      */
-    public function delOrderAdmin()
+    public function delOrderAD()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -333,7 +337,12 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => '订单id不能为空',
+                'id.required' => 'id不能为空',
+
+                'order_id' => 'required',
+            ],
+            [
+                'name.required' => '订单id不能为空',
 
             ]
         );
@@ -342,7 +351,7 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $result = $this->orderServiceClient->delOrderAdmin($requireData);
+        $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     //审核订单状态
@@ -434,10 +443,7 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->endOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    /**
-     * 用户删除自己已失效的订单
-     */
-    public function delOrderAD()
+    public function delOrderAdmin()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -447,7 +453,7 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => '订单id不能为空',
+                'id.required' => 'id不能为空',
 
             ]
         );
@@ -455,7 +461,7 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->orderServiceClient->delOrderAD($requireData);
+        $result = $this->orderServiceClient->delOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

app/Controller/PublicController.php

@@ -617,10 +617,8 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        echo 123;
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->modZhinengbumen($requireData);
-        echo 4;
+        $result = $this->publicServiceClient->upZhinengbumen($requireData);
         return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
     }
 }

app/Controller/WebController.php

@@ -1,15 +1,16 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace App\Controller;
 
-use App\Constants\ErrorCode;
 use App\JsonRpc\NewsServiceInterface;
 use App\JsonRpc\WebsiteServiceInterface;
-use App\Tools\Result;
-use Hyperf\Context\Context;
+use App\Tools\PublicData;
 use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Annotation\AutoController;
+use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-
+use App\Constants\ErrorCode;
+use Hyperf\Context\Context;
 /**
  * Class WebController
  * @package App\Controller
@@ -18,7 +19,7 @@ class WebController extends AbstractController
 {
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-    private $publicServiceClient;
+
     /**
      * @var NewsServiceInterface
      */
@@ -30,430 +31,25 @@ class WebController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
-
+ 
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
-
-        $requireData = $this->request->all();
+ 
         $data = [
-            'website_id' => Context::get("SiteId"),
-            'pageSize' => $requireData['pageSize'],
-        ];
-        // var_dump("网站id：",Context::get("SiteId"));
-        $result = $this->websiteServiceClient->getWebsiteCategory($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'], 0, []);
-        }
-        return Result::success($result['data']);
-    }
-
-
-    /**
-     * 获取各省名称
-     */
-    public function getWebsiteDistrit()
-    {
-        $data= [
-            'pid' => 0,
             'website_id'=>Context::get("SiteId")
         ];
-        $result=$this->PublicController->getDistrictList($data);
-        
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // var_dump($result['data']);
-        return Result::success($result['data']);
-        
-    }
-
-     /**
-     * 获取广告1
-     * @return array
-     */
-    public function getWebsiteAdvertisement()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'adPlace' => 'required'
-            ],
-            [
-                'adPlace.required' => '广告位置编号不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'ad_placeid'=>$requireData['adPlace']
-        ]; 
-        
-        $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
-
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-
-    /**
-     * 搜索并获取职能部门
-     */
-    public function selectWebsiteDepartment(){
-        $requireData = $this->request->all();
-        $data = [
-            
-            'website_id'=>Context::get("SiteId")
-        ]; 
-       
-        if(!empty($requireData)){
-            $data = [
-                'keyword'=>$requireData['keyword'],
-                'website_id'=>Context::get("SiteId")
-            ]; 
-        }
-   
-        $result = $this->websiteServiceClient->selectWebsiteDepartment($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-
-    /**
-     *各省市查询 
-     */
-    public function selectWebsiteArea()
-    {
-        $requireData = $this->request->all();
-       
-        $data=[];
-        if(!empty($requireData)){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'province' => 'required'
-                ],
-                [
-                    'province.required' => '请先选择省份'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data=[
-                'province' => $requireData['province']
-            ];
-            if(isset($requireData['city'])){
-                
-                $data=[
-                    'city' => $requireData['city'],
-                    'province' => $requireData['province']
-                    
-                ];
-                
-                if(isset($requireData['region'])){
-                    $data=[
-                        'province' => $requireData['province'],
-                        'city' => $requireData['city'],
-                        'region' => $requireData['region']
-                    ];
-                }
-            }
-        }
-        $result = $this->websiteServiceClient->selectWebsiteArea($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    
-    /**
-     * 获取新闻
-     */
-    public function getWebsiteArticlett()
-    {
-       
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'level' => 'required',
-                'pageSize' => 'required',
-            ],
-            [
-                'level.required' => '新闻类型不能为空',
-                'pageSize.required' => '显示条数不能为空',
-
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
-            $data =[
-            'website_id'=>Context::get("SiteId"),
-            'level'=>$requireData['level'],
-            'pageSize'=>$requireData['pageSize'],
-            'placeid' => $requireData['placeid']
-            ];
-            
-        }else{
-            $data = [
-                'website_id'=>Context::get("SiteId"),
-                'level'=>$requireData['level'],
-                'pageSize'=>$requireData['pageSize']
-            ]; 
-        }
-        $result = $this->newsServiceClient->getWebsiteArticlett($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-        
-    }
-
-     /**
-     * 获取模块新闻
-     */
-    public function getWebsiteModelArticles()
-    {
-        $requireData = $this->request->all();     
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'catid' => 'required',
-                'level' => 'required',
-                'pagesize' => 'required'
-            ],
-            [
-                'catid.required' => '栏目id不能为空',
-                'level.required' => '新闻类型不能为空',
-                'pagesize.required' => '新闻条数不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-
-        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
-            $data =[
-                'website_id'=>Context::get("SiteId"),
-                'catid' => $requireData['catid'],
-                'level' => $requireData['level'],
-                'pagesize' => $requireData['pagesize'],
-                'placeid' => $requireData['placeid']
-            ];
-        }else{
-            $data = [
-                'website_id'=>Context::get("SiteId"),
-                'catid' => $requireData['catid'],
-                'level' => $requireData['level'],
-                'pagesize' => $requireData['pagesize']
-            ];   
-        }      
-        $result = $this->newsServiceClient->getWebsiteModelArticles($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-
-    /**
-     * 获取模块栏目
-     */
-    public function getWebsiteModelCategory()
-    {
-        $requireData = $this->request->all();     
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'placeid' => 'required',
-                'pid' => 'required',
-                'num' => 'required'
-            ],
-            [
-                'placeid.required' => '栏目位置不能为空',
-                'pid' => '栏目类型不能为空',
-                'num' => '父级栏目数量'
-            ]
-        );
-        
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'placeid' => $requireData['placeid'],
-            'pid' => $requireData['pid'],
-            'num' => $requireData['num']
-        ];    
-        $result=$this->websiteServiceClient->getWebsiteModelCategory($data);
-        
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // var_dump($result['data']);
-        return Result::success($result['data']);
-        
-    }
-
-     /**
-     * 获取友情链接
-     * @return array
-     */
-    public function selectWebsiteLinks()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'type' => 'required',
-                'num' => 'required'
-            ],
-            [
-                'type.required' => '友情链接类型不能为空',
-                'num.required' => '友情链接数量不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'type'=>$requireData['type'],
-            'num' =>$requireData['num']
-        ];
-        $result = $this->websiteServiceClient->selectWebsiteLinks($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-
-    /**
-     * 获取文章列表
-     */
-    public function getWebsiteArticlesList()
-    {
-       
-        $requireData = $this->request->all();
-        if(isset($requireData['catid'])){
-            $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'catid' => 'required'
-            ],
-            [
-                'catid.required' => '栏目id不能为空'
-
-            ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-        }elseif(isset($requireData['keyword'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'keyword' => 'required'
-                ],
-                [
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['keyword'] =  $requireData['keyword']; 
-        }else{
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'catid' => 'required',
-                    'keyword' => 'required'
-                ],
-                [
-                    'catid.required' => '栏目id不能为空',
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-            $data['keyword'] =  $requireData['keyword']; 
-        }
-        $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page' => 'required',
-                    'pageSize' => 'required'
-                ],
-                [
-                    'page.required' => '分页不能为空',
-                    'pageSize.required' => '显示条数不能为空'
-    
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['website_id'] = Context::get("SiteId");
-            $data['pageSize'] = $requireData['pageSize']; 
-            $data['page'] = $requireData['page']; 
-        $result = $this->newsServiceClient->getArticleList($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // $result = $data; 
-        return Result::success($result['data']);
-        
-    }
-    
-     /**
-     * 获取文章详情
-     */
-    public function selectWebsiteArticleInfo()
-    {
-       
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'articleid' => 'required'
-            ],
-            [
-                'articleid.required' => '新闻id不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'id'=>$requireData['articleid'],
-        ]; 
-        $result = $this->newsServiceClient->getArticleInfo($data);
-        // var_dump($result);
+        var_dump("网站id：",Context::get("SiteId"));
+        $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
-        
     }
 
+ 
 
-}
+}

app/JsonRpc/NewsService.php

@@ -126,22 +126,4 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /*
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteArticlett(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteModelArticles(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    
-
 }

app/JsonRpc/NewsServiceInterface.php

@@ -58,16 +58,6 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getCategoryInfo(array $data);
-    /**
-     * @param array $data
-     *
-     */
-    public function getWebsiteArticlett(array $data);
-
-    /**
-     * @param array $data
-     */
-    public function getWebsiteModelArticles(array $data);
 
     /**
      * @param array $data

app/JsonRpc/PublicRpcService.php

@@ -211,12 +211,4 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function modZhinengbumen(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -128,11 +128,5 @@ interface PublicRpcServiceInterface
      * @return mixed
      */
     public function delZhinengbumen(array $data);
-    
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function modZhinengbumen(array $data);
 
 }

app/JsonRpc/UserService.php

@@ -149,7 +149,6 @@ class UserService extends AbstractServiceClient implements UserServiceInterface
     public function changePassword(array $data){
         return $this->__request(__FUNCTION__, $data);
     }
-
     /**
      * @param array $data
      * @return array|mixed

app/JsonRpc/WebsiteService.php

@@ -206,59 +206,10 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @return array|mixed
      */
     public function getWebsiteCategory(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function getWebsiteAdvertisement(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
 
-     /**
-     * @param array $data
-     * @return array|mixed
-     */
-    public function selectWebsiteDepartment(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function selectWebsiteArea(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteModelCategory(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function selectWebsiteLinks(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-
-
-
-
-
-
-
     /**
      * @param array $data
      * @return array|mixed
@@ -430,7 +381,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-
     /**
      * @param array $data
      * @return mixed
@@ -448,5 +398,4 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -130,55 +130,6 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteCategory(array $data);
-     
-
-
-
-
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getWebsiteAdvertisement(array $data);
-
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function selectWebsiteDepartment(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function selectWebsiteArea(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getWebsiteModelCategory(array $data);
-
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function selectWebsiteLinks(array $data);
-
-
-
-
-
-
-
-
-
-
-
-
 
     /**
      * @param array $data