修改相关b端接口：添加菜单、修改菜单、采集器-添加资讯、创建网站、修改网站、获取网站列表、newsService方法补充、service中client端口号修改

app/Controller/AuthorityController.php

@@ -91,8 +91,8 @@ class AuthorityController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
-        $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
+        // $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
+        // $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
 
         $result = $this->authorityServiceClient->addMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
@@ -144,8 +144,8 @@ class AuthorityController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
-        $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
+        // $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
+        // $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
         $result = $this->authorityServiceClient->updateMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }

app/Controller/PublicController.php

@@ -1815,6 +1815,7 @@ class PublicController extends AbstractController
                 $requireData['commend_id'] = "[]";
                 $requireData['catid'] = $val;
                 $requireData['web_site_id'] = $arr_web_site_id[$key];
+                $requireData['is_collector'] = 1;
                 $result = $this->newsServiceClient->addArticle($requireData);
                 $data = [
                     'id' => $result['data']['id'],

app/Controller/WebsiteController.php

@@ -78,10 +78,11 @@ class WebsiteController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['website_url'] = json_encode($requireData['website_url']);
-        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : [0];
-        $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']) : '';
+        // $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
+        // $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : [0];
+        $website_column_arr_id = array_map('intval', $requireData['website_column_arr_id']);
+        $requireData['website_column_id'] = isset($website_column_arr_id) ? end($website_column_arr_id) : '';
+        $requireData['website_column_arr_id'] = isset($website_column_arr_id) ? json_encode($website_column_arr_id) : '';
         var_dump($requireData);
         $result = $this->websiteServiceClient->createWebsite($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -111,13 +112,13 @@ class WebsiteController extends AbstractController
             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']) : '';
-                $result['data']['rows'][$k]['website_url'] = $v['website_url'] ? json_decode($v['website_url']) : [];
-                $result['data']['rows'][$k]['website_column_arr_id'] = $v['website_column_arr_id'] ? json_decode($v['website_column_arr_id']) : [];
-            }
-        }
+        // 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']) : '';
+        //         $result['data']['rows'][$k]['website_url'] = $v['website_url'] ? json_decode($v['website_url']) : [];
+        //         $result['data']['rows'][$k]['website_column_arr_id'] = $v['website_column_arr_id'] ? json_decode($v['website_column_arr_id']) : [];
+        //     }
+        // }
 
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -149,10 +150,11 @@ class WebsiteController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['website_url'] = json_encode($requireData['website_url']);
-        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : [0];
-        $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']) : '';
+        // $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
+        // $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : [0];
+        $website_column_arr_id = array_map('intval', $requireData['website_column_arr_id']);
+        $requireData['website_column_id'] = isset($website_column_arr_id) ? end($website_column_arr_id) : '';
+        $requireData['website_column_arr_id'] = isset($website_column_arr_id) ? json_encode($website_column_arr_id) : '';
         $result = $this->websiteServiceClient->updateWebsite((int)$requireData['id'], $requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/JsonRpc/NewsServiceInterface.php

@@ -264,57 +264,57 @@ interface NewsServiceInterface
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteJobSelect(array $data);
+  // public function getWebsiteJobSelect(array $data);
 
   /**
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteTsbb(array $data);
-  public function getWebsiteTsbbList(array $data);
-  public function getWebsiteTsbbDetail(array $data);
+  // public function getWebsiteTsbb(array $data);
+  // public function getWebsiteTsbbList(array $data);
+  // public function getWebsiteTsbbDetail(array $data);
 
-  public function getWebsiteCatidshop(array $data);
+  // public function getWebsiteCatidshop(array $data);
   /**
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteLevelJob(array $data);
+  // public function getWebsiteLevelJob(array $data);
   /**
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteCompany(array $data);
+  // public function getWebsiteCompany(array $data);
+  // /**
+  //  * @param array $data
+  //  * @return mixed
+  //  */
+  // public function getWebsiteCompanyInfo(array $data);
+  // /**
+  //  * @param array $data
+  //  * @return mixed
+  //  */
+  // public function getWebsiteCompanyList(array $data);
   /**
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteCompanyInfo(array $data);
+  // public function getWebsiteProject(array $data);
+  // /**
+  //  * @param array $data
+  //  * @return mixed
+  //  */
+  // public function getWebsiteProjectInfo(array $data);
+  // /**
+  //  * @param array $data
+  //  * @return mixed
+  //  */
+  // public function getWebsiteProjectList(array $data);
   /**
    * @param array $data
    * @return mixed
    */
-  public function getWebsiteCompanyList(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getWebsiteProject(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getWebsiteProjectInfo(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getWebsiteProjectList(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getWebsiteCategoryJob(array $data);
+  // public function getWebsiteCategoryJob(array $data);
 
 
   /**

config/autoload/services.php

@@ -159,7 +159,7 @@ return [
             'service' => \App\JsonRpc\ClientServiceInterface::class,
             // 直接对指定的节点进行消费，通过下面的 nodes 参数来配置服务提供者的节点信息
             'nodes' => [
-                ['host' => '127.0.0.1', 'port' => 9102],
+                ['host' => '127.0.0.1', 'port' => 9103],
             ],
             'settings' => [
                 'open_length_check' => true,