Merge branch '20250522_diywebfr'

app/Controller/WebsiteController.php

@@ -14,6 +14,7 @@ use Hyperf\Context\Context;
 use Phper666\JWTAuth\JWT;
 use DateTime;
 use App\JsonRpc\UserServiceInterface;
+use PhpParser\Node\Stmt\Return_;
 
 /**
  * Class WebsiteController
@@ -2322,4 +2323,109 @@ class WebsiteController extends AbstractController
     }
     // --底部基础信息-----------fr----------------------end
 
-}
+
+
+    // --自助建站-----------20250522fr----------------------start
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function getStaticResourceList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' =>'required|integer',
+                'pageSize' =>'required|integer'
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须是整数',
+                'pageSize.required' => '每页显示数量不能为空',
+                'pageSize.integer' => '每页显示数量必须是整数'
+            ]
+
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // return $requireData;
+        $result = $this->websiteServiceClient->getStaticResourceList($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function addStaticResource()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required|numeric',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.numeric' => '网站id必须是数字类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->addStaticResource($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function delStaticResource()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delStaticResource($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取所有的静态资源
+     * @return array
+     */
+    public function getStaticResourceInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required|integer'
+            ],
+            [
+                'id.required' => '网站id不能为空',
+                'id.integer' => '网站id必须是整数类型'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getStaticResourceInfo($requireData);
+        Return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    // --自助建站-----------20250522fr----------------------end
+}

app/JsonRpc/WebsiteService.php

@@ -707,5 +707,36 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data); 
     }
-   
+   /*
+    * @param array $data
+    * @return mixed
+    */
+    public function getStaticResourceList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addStaticResource(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delStaticResource(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getStaticResourceInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -463,5 +463,24 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteRoute(array $data);
-    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getStaticResourceList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delStaticResource(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getStaticResourceInfo(array $data);
 }

app/Middleware/Auth/FooMiddleware.php

@@ -119,7 +119,7 @@ class FooMiddleware implements MiddlewareInterface
 
                     }
                 }
-//                var_dump("中间件：",$ver);
+               var_dump("中间件：",$ver);
                 Context::set("UserId",$ver['uid']);
                 Context::set("TypeId",$ver['type_id']);
                 if ($ver) {

config/api/website.php

@@ -124,6 +124,16 @@ Router::addGroup(
         Router::post('/getWebsiteTemplateclassintel', [WebsiteController::class, 'getWebsiteTemplateclassintel']);
         //获取网站选择的模板下的板块
         Router::post('/getWebsiteSectorList', [WebsiteController::class, 'getWebsiteSectorList']);
+
+
+        // 获取所有的静态资源
+        Router::get('/getStaticResourceList', [WebsiteController::class, 'getStaticResourceList']);
+        // 添加静态资源
+        Router::post('/addStaticResource', [WebsiteController::class, 'addStaticResource']);
+        // 删除静态资源
+        Router::post('/delStaticResource', [WebsiteController::class, 'delStaticResource']);
+        // 查看静态资源
+        Router::get('/getStaticResourceInfo', [WebsiteController::class, 'getStaticResourceInfo']);
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start