Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/PublicController.php

@@ -1610,7 +1610,7 @@ class PublicController extends AbstractController
             [
                 'page' => 'required|integer|min:1',
                 'page_size' => 'required|integer|min:1',
-                ''
+                'website_id' =>'required',
             ],
             [
                 'page.required' => 'page 不能为空',
@@ -1619,12 +1619,14 @@ class PublicController extends AbstractController
                 'page_size.required' => 'page_size 不能为空',
                 'page_size.integer' => 'page_size 必须是整数',
                 'page_size.min' => 'page_size 必须大于等于 1',
+                'website_id.required' => '网站id 不能为空',
             ]
         );
          if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        // return Result::success($requireData);
         $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->getWebsiteTemplateList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -1655,5 +1657,31 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->chooseWebsiteTemplate($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 自助建站-5.保存到草稿箱
+     * @return array
+     */
+    public function saveWebsiteTemplate()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required',
+                'template_data' =>'required',
+            ],
+            [
+                'website_id.required' => '网站名称不能为空',
+                'template_data.required' => '网站名称不能为空',
+            ]
+        );
+         if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+         }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->saveWebsiteTemplate($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/Controller/WebsiteController.php

@@ -77,7 +77,7 @@ class WebsiteController extends AbstractController
         $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']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -146,7 +146,7 @@ class WebsiteController extends AbstractController
         $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']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
     /**
@@ -2375,7 +2375,7 @@ class WebsiteController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
     /**
-     * 获取所有的静态资源
+     * 添加静态资源
      * @return array
      */
     public function addStaticResource()
@@ -2400,7 +2400,7 @@ class WebsiteController extends AbstractController
         Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取所有的静态资源
+     * 删除静态资源
      * @return array
      */
     public function delStaticResource()
@@ -2711,5 +2711,51 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->cloneWebsite($requireData);
         Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 获取网站名称简称
+     * @return array
+     */
+    public function getWebsiteAdkey(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_name' =>'required',
+            ],
+            [
+                'website_name.required' => '网站名称不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteAdkey($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /**
+     * 静态资源-修改图片别名
+     * @return array
+     */
+    public function upStaticResource(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+                'img_alias' =>'required',
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'img_alias.required' => '网站名称简称不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upStaticResource($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }
 

app/JsonRpc/PublicRpcService.php

@@ -382,4 +382,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function saveWebsiteTemplate(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -204,5 +204,7 @@ interface PublicRpcServiceInterface
     public function addWebPageType(array $data);
     // 4.选择皮肤
     public function chooseWebsiteTemplate(array $data);
+    // 5.保存到草稿箱
+    public function saveWebsiteTemplate(array $data);
 
 }

app/JsonRpc/WebsiteService.php

@@ -813,6 +813,17 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
-    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAdkey(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upStaticResource(array $data)
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -506,6 +506,15 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return mixed
      */
+    public function getWebsiteAdkey(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upStaticResource(array $data);    /**
+     * @param array $data
+     * @return mixed
+     */
     public function cloneWebsite(array $data);
 
 

config/api/public.php

@@ -55,14 +55,16 @@ Router::addGroup(
         //删除风格
         Router::post('/delTemplateClass', [PublicController::class, 'delTemplateClass']);
 
+        // 皮肤
         //获取风格名称
         Router::post('/getTemplateClass', [PublicController::class, 'getTemplateClass']);
-        //获取风格列表
+        //获取皮肤列表
         Router::post('/getTemplateList', [PublicController::class, 'getTemplateList']);
         Router::post('/addTemplate', [PublicController::class, 'addTemplate']);
         Router::post('/getTemplateInfo', [PublicController::class, 'getTemplateInfo']);
         Router::post('/delTemplate', [PublicController::class, 'delTemplate']);
         Router::post('/updateTemplate', [PublicController::class, 'updateTemplate']);
+
         //获取板块
         Router::post('/addSector', [PublicController::class, 'addSector']);
         Router::post('/getSectorList', [PublicController::class, 'getSectorList']);
@@ -95,6 +97,8 @@ Router::addGroup(
         Router::post('/getWebsiteTemplateList', [PublicController::class, 'getWebsiteTemplateList']);
         // 自助建站-4.选择皮肤
         Router::post('/chooseWebsiteTemplate', [PublicController::class, 'chooseWebsiteTemplate']);
+        // 自助建站-5.保存到草稿箱
+        Router::post('/saveWebsiteTemplate', [PublicController::class, 'saveWebsiteTemplate']);
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/website.php

@@ -125,6 +125,8 @@ Router::addGroup(
         Router::post('/addStaticResource', [WebsiteController::class, 'addStaticResource']);
         // 删除静态资源
         Router::post('/delStaticResource', [WebsiteController::class, 'delStaticResource']);
+        // 修改静态资源
+        Router::post('/upStaticResource', [WebsiteController::class, 'upStaticResource']);
 
         // 获取尺寸列表
         Router::get('/getSizeList', [WebsiteController::class, 'getSizeList']);
@@ -136,6 +138,8 @@ Router::addGroup(
         Router::post('/upSize', [WebsiteController::class, 'upSize']);
         // 获取尺寸详情
         Router::get('/getSizeInfo', [WebsiteController::class, 'getSizeInfo']);
+        // 获取网站名称简称
+        Router::get('/getWebsiteAdkey', [WebsiteController::class, 'getWebsiteAdkey']);
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start