新闻

.env

@@ -28,4 +28,5 @@ WECHAT = https://api.weixin.qq.com/
 #小程序appID
 APPID = wx830ada852dd1707f
 #小程序SECRET
-APP_SECRET = 09d1ac9287cb6f3c5e81aa27a6b7138e
+APP_SECRET = 09d1ac9287cb6f3c5e81aa27a6b7138e
+#1

app/Controller/AbstractController.php

@@ -15,7 +15,9 @@ namespace App\Controller;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
-use Phper666\JWTAuth\JWT;
+
+
+use Hyperf\Logger\LoggerFactory;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
@@ -30,8 +32,14 @@ abstract class AbstractController
     #[Inject]
     protected ResponseInterface $response;
 
-    #[Inject]
-    protected JWT $jwt;
-    protected LoggerInterface $logger;
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+//    public function __construct(LoggerFactory $loggerFactory)
+//    {
+//        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
+//        $this->logger->info("项目启动访问一次");
+//    }
 
 }

app/Controller/AuthorityController.php

@@ -27,7 +27,6 @@ class AuthorityController extends AbstractController
     #[Inject]
     private $authorityServiceClient;
 
-
     /**
      * 获取菜单列表
      * @return array

app/Controller/IndexController.php

@@ -42,8 +42,6 @@ class IndexController extends AbstractController
 
     public function verifyCode()
     {
-//        $header = $this->request->getHeaders();
-//        var_dump($header);
         $comm = new CommonService();
         $ip = $comm->userIp();
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);

app/Controller/LoginController.php

@@ -27,7 +27,7 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
-        $this->logger->info("验证之前");
+//        $this->logger->info("验证之前");
 
         $reqData =  $this->request->all();
         $validator = $this->validationFactory->make(
@@ -66,12 +66,12 @@ class LoginController extends AbstractController
                 'user_name'=>$reqData['username'],
             ];
         }
-        $this->logger->info("验证之前");
+//        $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
         if($userInfos['code']==0){
             return Result::error("用户名或密码错误");
         }
-        $this->logger->info("验证用户返回值：", $userInfos);
+//        $this->logger->info("验证用户返回值：", $userInfos);
         if(md5(md5($reqData['password']).$userInfos['data']['salt']) != $userInfos['data']['password']){
             return Result::error("用户名或密码错误");
         }

app/Controller/NewsController.php

@@ -26,7 +26,7 @@ class NewsController extends AbstractController
     private $newsServiceClient;
 
     /**
-     * 分类列表
+     * 导航池列表
      * @return void
      */
     public function getCategoryList()
@@ -45,7 +45,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = $this->websiteId;
+
 
         $result = $this->newsServiceClient->getCategoryList($requireData);
         if($result['data']){
@@ -69,7 +69,7 @@ class NewsController extends AbstractController
     }
 
     /**
-     * 添加分类
+     * 添加导航
      * @return array|void
      */
     public function addCategory()
@@ -79,24 +79,31 @@ class NewsController extends AbstractController
             $requireData,
             [
                 'name'=> 'required',
+                'seo_title'=> 'required',
+                'seo_keywords'=> 'required',
+                'seo_description'=> 'required',
             ],
             [
-                'name.required' => '分类名称不能为空',
+                'name.required' => '导航池名称不能为空',
+                'seo_title.required' => 'seo标题名称不能为空',
+                'seo_keywords.required' => 'seo关键词不能为空',
+                'seo_description.required' => 'seo描述不能为空',
             ]
         );
         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);
-        }
-        $requireData['website_id'] = $this->websiteId;
+
+        $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
+        $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
+
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):'';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+
+        $requireData['department_id'] = isset($requireData['department_arr_id'])?end($requireData['department_arr_id']):'';
+        $requireData['department_arr_id'] = isset($requireData['department_arr_id'])?json_encode($requireData['department_arr_id']):'';
+
         $result = $this->newsServiceClient->addCategory($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/PublicController.php

@@ -4,7 +4,6 @@ namespace App\Controller;
 
 use App\JsonRpc\PublicRpcServiceInterface;
 use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Tools\CommonService;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;

app/Controller/UserController.php

@@ -60,9 +60,9 @@ class UserController 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['last_login_ip'] = $loginIp;
 
-        $this->logger->info("创建用户入参：", $requireData);
+//        $this->logger->info("创建用户入参：", $requireData);
         $result =  $this->userServiceClient->createUser($requireData);
-        $this->logger->info("创建用户返回值：", $result);
+//        $this->logger->info("创建用户返回值：", $result);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -102,7 +102,7 @@ class UserController extends AbstractController
         $requireData['last_login_ip'] = $loginIp;
 
         $result =  $this->userServiceClient->updateUser($requireData);
-        $this->logger->info("修改用户返回值：", $result);
+//        $this->logger->info("修改用户返回值：", $result);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -113,7 +113,7 @@ class UserController extends AbstractController
     public function getUserInfo()
     {
 
-        $result =  $this->userServiceClient->getUserInfo((int)$this->UserId);
+        $result =  $this->userServiceClient->getUserInfo((int)Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }

app/Controller/WebsiteController.php

@@ -35,12 +35,12 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'website_column_id' => 'required',
+                'website_column_arr_id' => 'required',
                 'website_name' => 'required',
                 'website_url' => 'required',
             ],
             [
-                'website_column_id.required' => '栏目id不能为空',
+                'website_column_id.required' => '上级网系id不能为空',
                 'website_name.required' => '站点名称不能为空',
                 'website_url.required' => '网站地址不能为空',
             ]
@@ -49,25 +49,12 @@ class WebsiteController extends AbstractController
             $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);
-        }
+        $requireData['website_url'] = json_encode($requireData['website_url']);
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):'';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+        $requireData['website_column_id'] = isset($requireData['website_column_arr_id'])?end($requireData['website_column_arr_id']):'';
+        $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id'])?json_encode($requireData['website_column_arr_id']):'';
+        var_dump($requireData);
         $result = $this->websiteServiceClient->createWebsite($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -78,11 +65,24 @@ class WebsiteController extends AbstractController
      */
     public function getWebsiteList()
     {
-        $keyword = $this->request->input("keyWord",'');
-        $page = (int)$this->request->input("page",1);
-        $pageSize = (int)$this->request->input("pageSize",10);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'required',
+                'pageSize' => 'required',
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
 
-        $result = $this->websiteServiceClient->getWebsitetList($keyword,$page,$pageSize);
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsitetList($requireData);
         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']):'';
@@ -103,13 +103,13 @@ class WebsiteController extends AbstractController
             $requireData,
             [
                 'id' => 'required',
-                'website_column_id' => 'required',
+                'website_column_arr_id' => 'required',
                 'website_name' => 'required',
                 'website_url' => 'required',
             ],
             [
                 'id.required' => 'id不能为空',
-                'website_column_id.required' => '栏目id不能为空',
+                'website_column_id.required' => '网系id不能为空',
                 'website_name.required' => '站点名称不能为空',
                 'website_url.required' => '网站地址不能为空',
             ]
@@ -118,25 +118,12 @@ class WebsiteController extends AbstractController
             $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);
+        $requireData['website_url'] = json_encode($requireData['website_url']);
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):'';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+        $requireData['website_column_id'] = isset($requireData['website_column_arr_id'])?end($requireData['website_column_arr_id']):'';
+        $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id'])?json_encode($requireData['website_column_arr_id']):'';
+        $result = $this->websiteServiceClient->updateWebsite((int)$requireData['id'],$requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -171,11 +158,31 @@ class WebsiteController extends AbstractController
      */
     public function getWebsiteInfo()
     {
-        $id = (int)$this->request->input("id",'');
+        $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);
+        }
+        $id = (int)$requireData['id'];
         $result = $this->websiteServiceClient->getWebsiteInfo($id);
+        if($result['code']==200){
+            $result['data']['website_url'] = isset($result['data']['website_url']) && $result['data']['website_url']?json_decode($result['data']['website_url']):'';
+            $result['data']['website_column_arr_id'] = isset($result['data']['website_column_arr_id']) && $result['data']['website_column_arr_id']?json_decode($result['data']['website_column_arr_id']):'';
+            $result['data']['city_arr_id'] = isset($result['data']['city_arr_id']) && $result['data']['city_arr_id']?json_decode($result['data']['city_arr_id']):'';
+            return Result::success($result['data']);
+        }else{
+            return Result::error($result['message']);
+        }
 
-        $this->logger->info('hello world',[1=>"ceshi"],["a"=>"11"]);
-        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     public function getWebsiteColumn()

app/JsonRpc/WebsiteService.php

@@ -24,9 +24,9 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param int $pageSize
      * @return mixed
      */
-    public function getWebsitetList(string $keyword, int $page, int $pageSize)
+    public function getWebsitetList(array $data)
     {
-        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
+        return $this->__request(__FUNCTION__, $data);
     }
 
     /**

app/JsonRpc/WebsiteServiceInterface.php

@@ -7,7 +7,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsitetList(string $keyword,int $page,int $pageSize);
+    public function getWebsitetList(array $data);
 
     /**
      * @param array $data

config/api/public.php

@@ -17,8 +17,8 @@ Router::addGroup(
         Router::get('/getCityList', [PublicController::class, 'getCityList']);
         Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
         Router::post('/upComplaint', [PublicController::class, 'upComplaint']);
-        Router::post('/getComplaint', [PublicController::class, 'getComplaint']);
-        Router::post('/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+        Router::addRoute(['GET', 'POST'],'/getComplaint', [PublicController::class, 'getComplaint']);
+        Router::addRoute(['GET', 'POST'],'/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
         Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
         Router::post('/downloadFile', [PublicController::class, 'downloadFile']);

config/autoload/dependencies.php

@@ -10,9 +10,6 @@ declare(strict_types=1);
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
 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\NewsServiceInterface::class => App\JsonRpc\NewsService::class,
+
 ];
 

runtime/container/proxy/App_Controller_AbstractController.proxy.php

@@ -14,11 +14,9 @@ namespace App\Controller;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
-use Phper666\JWTAuth\JWT;
-use Psr\Container\ContainerInterface;
 use Hyperf\Logger\LoggerFactory;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
-use http\Client\Request;
 abstract class AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
@@ -33,7 +31,13 @@ abstract class AbstractController
     protected RequestInterface $request;
     #[Inject]
     protected ResponseInterface $response;
-    #[Inject]
-    protected JWT $jwt;
-    protected LoggerInterface $logger;
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+    //    public function __construct(LoggerFactory $loggerFactory)
+    //    {
+    //        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
+    //        $this->logger->info("项目启动访问一次");
+    //    }
 }

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -21,7 +21,7 @@ class AdController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_ChatController.proxy.php

@@ -26,7 +26,7 @@ class ChatController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_IndexController.proxy.php

@@ -36,8 +36,6 @@ class IndexController extends AbstractController
     }
     public function verifyCode()
     {
-        //        $header = $this->request->getHeaders();
-        //        var_dump($header);
         $comm = new CommonService();
         $ip = $comm->userIp();
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);

runtime/container/proxy/App_Controller_LinkController.proxy.php

@@ -19,7 +19,7 @@ class LinkController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -20,7 +20,7 @@ class LoginController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -36,7 +36,7 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
-        $this->logger->info("验证之前");
+        //        $this->logger->info("验证之前");
         $reqData = $this->request->all();
         $validator = $this->validationFactory->make($reqData, ['username' => 'required', 'password' => 'required', 'type' => 'required'], ['username.required' => '用户名不能为空', 'password.required' => '密码不能为空', 'type.required' => '登录方式必填']);
         if ($validator->fails()) {
@@ -60,12 +60,12 @@ class LoginController extends AbstractController
             //密码登录
             $where = ['user_name' => $reqData['username']];
         }
-        $this->logger->info("验证之前");
+        //        $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
         if ($userInfos['code'] == 0) {
             return Result::error("用户名或密码错误");
         }
-        $this->logger->info("验证用户返回值：", $userInfos);
+        //        $this->logger->info("验证用户返回值：", $userInfos);
         if (md5(md5($reqData['password']) . $userInfos['data']['salt']) != $userInfos['data']['password']) {
             return Result::error("用户名或密码错误");
         }

runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -34,7 +34,7 @@ class NewsController extends AbstractController
     #[Inject]
     private $newsServiceClient;
     /**
-     * 分类列表
+     * 导航池列表
      * @return void
      */
     public function getCategoryList()
@@ -45,7 +45,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = $this->websiteId;
         $result = $this->newsServiceClient->getCategoryList($requireData);
         if ($result['data']) {
             foreach ($result['data']['rows'] as $k => $v) {
@@ -67,26 +66,23 @@ class NewsController extends AbstractController
         return $result ? Result::success($rep) : Result::error($result['message']);
     }
     /**
-     * 添加分类
+     * 添加导航
      * @return array|void
      */
     public function addCategory()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['name' => 'required'], ['name.required' => '分类名称不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['name' => 'required', 'seo_title' => 'required', 'seo_keywords' => 'required', 'seo_description' => 'required'], ['name.required' => '导航池名称不能为空', 'seo_title.required' => 'seo标题名称不能为空', 'seo_keywords.required' => 'seo关键词不能为空', 'seo_description.required' => 'seo描述不能为空']);
         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);
-        }
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['pid'] = isset($requireData['pid_arr']) ? end($requireData['pid_arr']) : '';
+        $requireData['pid_arr'] = isset($requireData['pid_arr']) ? json_encode($requireData['pid_arr']) : '';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : '';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['department_id'] = isset($requireData['department_arr_id']) ? end($requireData['department_arr_id']) : '';
+        $requireData['department_arr_id'] = isset($requireData['department_arr_id']) ? json_encode($requireData['department_arr_id']) : '';
         $result = $this->newsServiceClient->addCategory($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }

runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -5,7 +5,6 @@ namespace App\Controller;
 
 use App\JsonRpc\PublicRpcServiceInterface;
 use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use App\Tools\CommonService;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -19,7 +19,7 @@ class UserController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
+    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -56,9 +56,9 @@ class UserController extends AbstractController
         $requireData['salt'] = $salt;
         $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['last_login_ip'] = $loginIp;
-        $this->logger->info("创建用户入参：", $requireData);
+        //        $this->logger->info("创建用户入参：", $requireData);
         $result = $this->userServiceClient->createUser($requireData);
-        $this->logger->info("创建用户返回值：", $result);
+        //        $this->logger->info("创建用户返回值：", $result);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -83,7 +83,7 @@ class UserController 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['last_login_ip'] = $loginIp;
         $result = $this->userServiceClient->updateUser($requireData);
-        $this->logger->info("修改用户返回值：", $result);
+        //        $this->logger->info("修改用户返回值：", $result);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -92,7 +92,7 @@ class UserController extends AbstractController
      */
     public function getUserInfo()
     {
-        $result = $this->userServiceClient->getUserInfo((int) $this->UserId);
+        $result = $this->userServiceClient->getUserInfo((int) Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
         }

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -40,31 +40,17 @@ class WebsiteController extends AbstractController
     public function addWebsite()
     {
         $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' => '网站地址不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['website_column_arr_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);
-        }
+        $requireData['website_url'] = json_encode($requireData['website_url']);
+        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : '';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['website_column_id'] = isset($requireData['website_column_arr_id']) ? end($requireData['website_column_arr_id']) : '';
+        $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id']) ? json_encode($requireData['website_column_arr_id']) : '';
+        var_dump($requireData);
         $result = $this->websiteServiceClient->createWebsite($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -74,10 +60,13 @@ class WebsiteController extends AbstractController
      */
     public function getWebsiteList()
     {
-        $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);
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['page' => 'required', 'pageSize' => 'required'], ['page.required' => '页码不能为空', 'pageSize.required' => '每页显示条数不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsitetList($requireData);
         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']) : '';
@@ -92,32 +81,17 @@ class WebsiteController extends AbstractController
     public function updateWebsite()
     {
         $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' => '网站地址不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'website_column_arr_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);
+        $requireData['website_url'] = json_encode($requireData['website_url']);
+        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : '';
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['website_column_id'] = isset($requireData['website_column_arr_id']) ? end($requireData['website_column_arr_id']) : '';
+        $requireData['website_column_arr_id'] = isset($requireData['website_column_arr_id']) ? json_encode($requireData['website_column_arr_id']) : '';
+        $result = $this->websiteServiceClient->updateWebsite((int) $requireData['id'], $requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -142,10 +116,22 @@ class WebsiteController extends AbstractController
      */
     public function getWebsiteInfo()
     {
-        $id = (int) $this->request->input("id", '');
+        $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);
+        }
+        $id = (int) $requireData['id'];
         $result = $this->websiteServiceClient->getWebsiteInfo($id);
-        $this->logger->info('hello world', [1 => "ceshi"], ["a" => "11"]);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+        if ($result['code'] == 200) {
+            $result['data']['website_url'] = isset($result['data']['website_url']) && $result['data']['website_url'] ? json_decode($result['data']['website_url']) : '';
+            $result['data']['website_column_arr_id'] = isset($result['data']['website_column_arr_id']) && $result['data']['website_column_arr_id'] ? json_decode($result['data']['website_column_arr_id']) : '';
+            $result['data']['city_arr_id'] = isset($result['data']['city_arr_id']) && $result['data']['city_arr_id'] ? json_decode($result['data']['city_arr_id']) : '';
+            return Result::success($result['data']);
+        } else {
+            return Result::error($result['message']);
+        }
     }
     public function getWebsiteColumn()
     {

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

@@ -2,14 +2,14 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_a0bdfd8ddd0c6c6ee2e2216564b4c6ef extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_8096e1813991fe20e792f85ade62ceb3 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsitetList(string $keyword, int $page, int $pageSize)
+    public function getWebsitetList(array $data)
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }

runtime/hyperf.pid

@@ -1 +0,0 @@
-5981