dddmo 6 月之前
父節點
當前提交
e308954e32
共有 35 個文件被更改,包括 261 次插入2451 次删除
  1. 1 0
      .gitignore
  2. 50 16
      .watcher.php
  3. 25 0
      app/Controller/PublicController.php
  4. 13 1
      app/Controller/UserController.php
  5. 9 0
      app/Controller/WebSocketController.php
  6. 6 0
      app/JsonRpc/NewsServiceInterface.php
  7. 8 0
      app/JsonRpc/PublicRpcService.php
  8. 6 0
      app/JsonRpc/PublicRpcServiceInterface.php
  9. 80 0
      app/JsonRpc/UserService.php
  10. 17 10
      app/Middleware/CorsMiddleware.php
  11. 2 0
      config/api/public.php
  12. 3 1
      config/api/web.php
  13. 14 0
      config/api/website.php
  14. 0 1
      config/autoload/amqp.php
  15. 0 0
      runtime/container/classes.cache
  16. 0 40
      runtime/container/proxy/App_Amqp_Consumer_MqConsumer.proxy.php
  17. 0 43
      runtime/container/proxy/App_Controller_AbstractController.proxy.php
  18. 0 150
      runtime/container/proxy/App_Controller_AuthorityController.proxy.php
  19. 27 12
      runtime/container/proxy/App_Controller_NewsController.proxy.php
  20. 0 297
      runtime/container/proxy/App_Controller_PublicController.proxy.php
  21. 0 131
      runtime/container/proxy/App_Controller_WebSocketController.proxy.php
  22. 0 450
      runtime/container/proxy/App_Controller_WebsiteController.proxy.php
  23. 0 79
      runtime/container/proxy/App_JsonRpc_AdServiceInterface.rpc-client.proxy.php
  24. 0 61
      runtime/container/proxy/App_JsonRpc_AuthorityServiceInterface.rpc-client.proxy.php
  25. 0 299
      runtime/container/proxy/App_JsonRpc_ChatServiceInterface.rpc-client.proxy.php
  26. 0 35
      runtime/container/proxy/App_JsonRpc_LinkServiceInterface.rpc-client.proxy.php
  27. 0 77
      runtime/container/proxy/App_JsonRpc_NewsServiceInterface.rpc-client.proxy.php
  28. 0 131
      runtime/container/proxy/App_JsonRpc_PublicRpcServiceInterface.rpc-client.proxy.php
  29. 0 133
      runtime/container/proxy/App_JsonRpc_UserServiceInterface.rpc-client.proxy.php
  30. 0 249
      runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php
  31. 0 35
      runtime/container/proxy/App_Service_RedisInterface.proxy.php
  32. 0 97
      runtime/container/proxy/App_Service_RedisService.proxy.php
  33. 0 103
      runtime/container/proxy/App_Tools_CommonService.proxy.php
  34. 0 0
      runtime/container/scan.cache
  35. 0 0
      storage/languages/en/validation.php

+ 1 - 0
.gitignore

@@ -16,6 +16,7 @@ runtime/*
 *.ipa
 *.apk
 .env
+
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.

+ 50 - 16
.watcher.php

@@ -35,10 +35,12 @@ class NewsController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'pid'=> 'required',
+                'page'=> 'required',
+                'pageSize'=> 'required',
             ],
             [
-                'pid.required' => 'pid不能为空',
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -108,7 +110,10 @@ class NewsController extends AbstractController
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
 
-
+    /**
+     * 更新导航池
+     * @return array
+     */
     public function updateCategory()
     {
         $requireData = $this->request->all();
@@ -117,25 +122,31 @@ class NewsController extends AbstractController
             [
                 'id'=>'required',
                 'name'=> 'required',
+                'seo_title'=> 'required',
+                'seo_keywords'=> 'required',
+                'seo_description'=> 'required',
             ],
             [
-                'name.required' => '分类名称不能为空',
-                'id.required' =>'ID不能为空'
+                'id.required' =>'ID不能为空',
+                '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->updateCategory($requireData);
         return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -161,8 +172,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
-        $requireData['website_id'] = $this->websiteId;
         $result = $this->newsServiceClient->delCategory($requireData);
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -197,6 +206,31 @@ class NewsController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+    /**
+     * 获取导航池信息
+     * @return void
+     */
+    public function getCategoryInfo()
+    {
+        $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);
+        }
+        $result = $this->newsServiceClient->getCategoryInfo($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 
     /**
      * 添加分类

+ 25 - 0
app/Controller/PublicController.php

@@ -376,6 +376,31 @@ class PublicController extends AbstractController
         return $result['code']==200 ? Result::success() : Result::error("已经处理了");
     }
 
+    /**
+     * 获取职能部门
+     * @return void
+     */
+    public function getDepartment()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pid' => 'required',
+            ],
+            [
+                'pid.required' => 'id不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->publicServiceClient->getDepartment($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+
 
 
 

+ 13 - 1
app/Controller/UserController.php

@@ -31,6 +31,7 @@ class WebController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
+<<<<<<< HEAD
     protected $siteId;
     public function __construct(){
         $websiteInfo = $this->getWebsiteId();
@@ -39,16 +40,23 @@ class WebController extends AbstractController
             $this->siteId = $websiteInfo['data']['id'];
         }
     }
+=======
+
+>>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
+<<<<<<< HEAD
        var_dump("网站id:",$this->siteId);
+=======
+>>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
         $data = [
-            'website_id'=>$this->siteId
+            'website_id'=>Context::get("SiteId")
         ];
+        var_dump("网站id:",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -56,6 +64,7 @@ class WebController extends AbstractController
         return Result::success($result['data']);
     }
 
+<<<<<<< HEAD
     /**
      * @return array
      */
@@ -78,5 +87,8 @@ class WebController extends AbstractController
         }
         return Result::success($result['data']);
     }
+=======
+
+>>>>>>> dc5ca2d82095a07156ecae10ce8899519068294e
 
 }

+ 9 - 0
app/Controller/WebSocketController.php

@@ -107,4 +107,13 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getCategoryInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

+ 6 - 0
app/JsonRpc/NewsServiceInterface.php

@@ -53,4 +53,10 @@ interface NewsServiceInterface
      */
     public function getArticleInfo(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getCategoryInfo(array $data);
+
 }

+ 8 - 0
app/JsonRpc/PublicRpcService.php

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

+ 6 - 0
app/JsonRpc/PublicRpcServiceInterface.php

@@ -92,4 +92,10 @@ interface PublicRpcServiceInterface
      */
     public function checkMeasure(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getDepartment(array $data);
+
 }

+ 80 - 0
app/JsonRpc/UserService.php

@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Middleware\Auth;
+
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface as HttpResponse;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Hyperf\Context\Context;
+use App\JsonRpc\WebsiteServiceInterface;
+use Phper666\JWTAuth\JWT;
+class WebMiddleware implements MiddlewareInterface
+{
+    protected ContainerInterface $container;
+
+    protected RequestInterface $request;
+
+    protected HttpResponse $response;
+    protected JWT $JWT;
+    /**
+     * @var WebsiteServiceInterface
+     */
+    #[Inject]
+    private $websiteServiceClient;
+    public function __construct(ContainerInterface $container, HttpResponse $response, RequestInterface $request,Jwt $JWT)
+    {
+        $this->container = $container;
+        $this->response = $response;
+        $this->request = $request;
+        $this->JWT = $JWT;
+
+    }
+
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+
+        $header = $request->getHeaders();
+        try {
+            if($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
+
+                $origin = $header['origin'][0];
+                $logindevice = explode("//", $origin);
+                $data = [
+                    'website_url'=>$logindevice[1]
+                ];
+                $result = $this->websiteServiceClient->getWebsiteId($data);
+                var_dump("获取站点id:",$result);
+                Context::set("SiteId",$result['data']['id']);
+                if ($result) {
+                    return $handler->handle($request);
+                }
+            }else{
+                return $this->response->json(
+                    [
+                        'code' => -1,
+                        'data' => [],
+                        'message' => 'origin:必填',
+                    ]
+                );
+            }
+
+        }catch (\Exception $e){
+            var_dump("错误消息:",$e->getMessage(),$e->getCode());
+            return $this->response->json(
+                [
+                    'code' => $e->getCode(),
+                    'data' => [],
+                    'message' => $e->getMessage(),
+                ]
+            );
+        }
+        return false;
+    }
+}

+ 17 - 10
app/Middleware/CorsMiddleware.php

@@ -7,16 +7,23 @@ use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
 Router::addGroup(
     '/news', function () {
-    Router::get('/getCategoryList', [NewsController::class, 'getCategoryList']);
-    Router::get('/categoryList', [NewsController::class, 'categoryList']);
-    Router::post('/addCategory', [NewsController::class, 'addCategory']);
-    Router::post('/updateCategory', [NewsController::class, 'updateCategory']);
-    Router::post('/delCategory', [NewsController::class, 'delCategory']);
-    Router::get('/getArticleList', [NewsController::class, 'getArticleList']);
-    Router::post('/addArticle', [NewsController::class, 'addArticle']);
-    Router::post('/updateArticle', [NewsController::class, 'updateArticle']);
-    Router::post('/delArticle', [NewsController::class, 'delArticle']);
-    Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+        //获取导航池列表
+        Router::get('/getCategoryList', [NewsController::class, 'getCategoryList']);
+        Router::get('/categoryList', [NewsController::class, 'categoryList']);
+        //添加导航池
+        Router::post('/addCategory', [NewsController::class, 'addCategory']);
+        //更新导航池
+        Router::post('/updateCategory', [NewsController::class, 'updateCategory']);
+        //删除导航池
+        Router::post('/delCategory', [NewsController::class, 'delCategory']);
+
+        Router::get('/getArticleList', [NewsController::class, 'getArticleList']);
+        Router::post('/addArticle', [NewsController::class, 'addArticle']);
+        Router::post('/updateArticle', [NewsController::class, 'updateArticle']);
+        Router::post('/delArticle', [NewsController::class, 'delArticle']);
+        Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+        //获取导航池信息
+        Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
 
 },
     ['middleware' => [FooMiddleware::class]]

+ 2 - 0
config/api/public.php

@@ -23,6 +23,8 @@ Router::addGroup(
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
         Router::post('/downloadFile', [PublicController::class, 'downloadFile']);
         Router::post('/checkMeasure', [PublicController::class, 'checkMeasure']);
+        //获取职能部门
+        Router::get('/getDepartment', [PublicController::class, 'getDepartment']);
 
     },
     ['middleware' => [FooMiddleware::class]]

+ 3 - 1
config/api/web.php

@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 use App\Controller\WebController;
 use Hyperf\HttpServer\Router\Router;
+use App\Middleware\Auth\WebMiddleware;
 Router::addGroup(
     '/web', function () {
                 Router::get('/getWebsiteId', [WebController::class, 'getWebsiteId']);
                 Router::get('/getWebsiteCategory', [WebController::class, 'getWebsiteCategory']);
-            }
+            },
+    ['middleware' => [WebMiddleware::class]]
 );

+ 14 - 0
config/api/website.php

@@ -7,16 +7,27 @@ use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
 Router::addGroup(
     '/website', function () {
+        //添加网站
         Router::post('/addWebsite', [WebsiteController::class, 'addWebsite']);
+        //获取网站列表
         Router::get('/getWebsiteList', [WebsiteController::class, 'getWebsiteList']);
+        //更新网站
         Router::post('/updateWebsite', [WebsiteController::class, 'updateWebsite']);
+        //删除网站
         Router::post('/delWebsite', [WebsiteController::class, 'delWebsite']);
+        //获取网站信息
         Router::get('/getWebsiteInfo', [WebsiteController::class, 'getWebsiteInfo']);
+        //获取网站导航
         Router::get('/getWebsiteColumn', [WebsiteController::class, 'getWebsiteColumn']);
+        //获取网站导航列表
         Router::get('/getWebsiteColumnList', [WebsiteController::class, 'getWebsiteColumnList']);
+        //创建网站导航
         Router::post('/addWebsiteColumn', [WebsiteController::class, 'addWebsiteColumn']);
+        //更新网站导航
         Router::post('/updateWebsiteColumn', [WebsiteController::class, 'updateWebsiteColumn']);
+        //删除网站导航
         Router::post('/delWebsiteColumn', [WebsiteController::class, 'delWebsiteColumn']);
+
         Router::get('/getWebsiteRoleList', [WebsiteController::class, 'getWebsiteRoleList']);
         Router::post('/createWebsiteRole', [WebsiteController::class, 'createWebsiteRole']);
         Router::post('/delWebsiteRole', [WebsiteController::class, 'delWebsiteRole']);
@@ -32,6 +43,9 @@ Router::addGroup(
         Router::post('/addTemplate', [WebsiteController::class, 'addTemplate']); //获取分类下模板列表
         Router::post('/upTemplate', [WebsiteController::class, 'upTemplate']); //更新分类下模板列表
         Router::post('/delTemplate', [WebsiteController::class, 'delTemplate']); //删除分类下模板列表
+        //添加网站导航
+        Router::post('/addWebsiteCategory', [WebsiteController::class, 'addWebsiteCategory']);
+
 
     },
     ['middleware' => [FooMiddleware::class]]

+ 0 - 1
config/autoload/amqp.php

@@ -1 +0,0 @@
-a:9:{i:0;s:52:"DeathSatan\Hyperf\Validate\Aspect\ControllerValidate";i:1;s:35:"Hyperf\Cache\Aspect\CacheableAspect";i:2;s:36:"Hyperf\Cache\Aspect\CacheAheadAspect";i:3;s:36:"Hyperf\Cache\Aspect\CacheEvictAspect";i:4;s:34:"Hyperf\Cache\Aspect\CachePutAspect";i:5;s:35:"Hyperf\Cache\Aspect\FailCacheAspect";i:6;s:36:"Hyperf\Config\Annotation\ValueAspect";i:7;s:44:"Hyperf\DbConnection\Aspect\TransactionAspect";i:8;s:33:"Hyperf\Di\Annotation\InjectAspect";}

File diff suppressed because it is too large
+ 0 - 0
runtime/container/classes.cache


+ 0 - 40
runtime/container/proxy/App_Amqp_Consumer_MqConsumer.proxy.php

@@ -1,40 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace App\Amqp\Consumer;
-
-use Hyperf\Amqp\Result;
-use Hyperf\Amqp\Annotation\Consumer;
-use Hyperf\Amqp\Message\ConsumerMessage;
-use Hyperf\Di\Annotation\Inject;
-use PhpAmqpLib\Message\AMQPMessage;
-use App\JsonRpc\ChatServiceInterface;
-#[Consumer(exchange: 'hyperf', routingKey: 'hyperf', queue: 'hyperf', name: "MqConsumer", nums: 1)]
-class MqConsumer extends ConsumerMessage
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    /**
-     * @var ChatServiceInterface
-     */
-    #[Inject]
-    private $chatServiceClient;
-    public function consumeMessage($data, AMQPMessage $message) : Result
-    {
-        //数据存储
-        $result = $this->chatServiceClient->addTalkRecords($data);
-        var_dump("消费成功:", $result);
-        return Result::ACK;
-    }
-    //    public function isEnable(): bool
-    //    {
-    //        return false;
-    //    }
-}

+ 0 - 43
runtime/container/proxy/App_Controller_AbstractController.proxy.php

@@ -1,43 +0,0 @@
-<?php
-
-declare (strict_types=1);
-/**
- * This file is part of Hyperf.
- *
- * @link     https://www.hyperf.io
- * @document https://hyperf.wiki
- * @contact  group@hyperf.io
- * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
- */
-namespace App\Controller;
-
-use Hyperf\Di\Annotation\Inject;
-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
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected ContainerInterface $container;
-    #[Inject]
-    protected RequestInterface $request;
-    #[Inject]
-    protected ResponseInterface $response;
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-    //    public function __construct(LoggerFactory $loggerFactory)
-    //    {
-    //        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
-    //        $this->logger->info("项目启动访问一次");
-    //    }
-}

+ 0 - 150
runtime/container/proxy/App_Controller_AuthorityController.proxy.php

@@ -1,150 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace App\Controller;
-
-use App\JsonRpc\AuthorityServiceInterface;
-use App\Tools\PublicData;
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Annotation\AutoController;
-use App\Tools\Result;
-use App\Constants\ErrorCode;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use Hyperf\Context\Context;
-/**
- * Class AuthorityController
- * @package App\Controller
- */
-//#[AutoController]
-class AuthorityController extends AbstractController
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected ValidatorFactoryInterface $validationFactory;
-    /**
-     * @var AuthorityServiceInterface
-     */
-    #[Inject]
-    private $authorityServiceClient;
-    /**
-     * 获取菜单列表
-     * @return array
-     */
-    public function getMenuList()
-    {
-        $id = (int) $this->request->input("id", 0);
-        $page = (int) $this->request->input("page", 1);
-        $pageSize = (int) $this->request->input("pageSize", 10);
-        $data = ['id' => $id, 'page' => $page, 'pageSize' => $pageSize];
-        $result = $this->authorityServiceClient->getMenuList($data);
-        if ($result['data']) {
-            foreach ($result['data']['rows'] as $k => $v) {
-                $result['data']['rows'][$k]['pid_arr'] = $v['pid_arr'] ? json_decode($v['pid_arr']) : [0];
-            }
-        }
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除菜单
-     * @return array
-     */
-    public function delMenu()
-    {
-        $id = (int) $this->request->input("id", 0);
-        $data = ['id' => $id, 'page' => 1, 'pageSize' => 2];
-        $result = $this->authorityServiceClient->getMenuList($data);
-        if (count($result['data']['rows']) > 0) {
-            return Result::error("有子菜单不能删除");
-        }
-        return $this->authorityServiceClient->delMenu($data);
-    }
-    /**
-     * 添加菜单
-     * @return array|void
-     */
-    public function addMenu()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['label' => 'required'], ['label.required' => '菜单名称不能为空']);
-        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);
-        }
-        $result = $this->authorityServiceClient->addMenu($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 修改菜单
-     * @return array|void
-     */
-    public function updateMenu()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, [
-            'id' => 'required',
-            //                'pid' => 'required',
-            'label' => 'required',
-        ], [
-            'id.required' => 'id不能为空',
-            //                'pid.required' => '父级id不能为空',
-            'label.required' => '菜单名称不能为空',
-        ]);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        unset($requireData['pid_arr']);
-        var_dump("提交数据前:", $requireData);
-        if (isset($requireData['pid']) && is_array($requireData['pid'])) {
-            $requireData['pid_arr'] = json_encode($requireData['pid']);
-            $requireData['pid'] = end($requireData['pid']);
-        } else {
-            if (isset($requireData['pid']) && $requireData['pid'] > 0) {
-                //            array_push($requireData['pid'],$requireData['pid']);
-                $requireData['pid'] = [$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);
-            }
-        }
-        var_dump("提交数据后", $requireData);
-        $result = $this->authorityServiceClient->updateMenu($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 菜单递归查询处理
-     * @return void
-     */
-    public function getRecursionMenu()
-    {
-        $header = $this->request->getHeaders();
-        if (!isset($header['origin'])) {
-            return Result::error("header请配置origin");
-        }
-        $origin = $header['origin'][0];
-        $logindevice = explode("//", $origin);
-        $reqData = ['user_id' => Context::get("UserId"), 'logindevice' => $logindevice[1]];
-        $result = $this->authorityServiceClient->getRecursionMenu($reqData);
-        $rep = PublicData::buildMenuTree($result['data']);
-        return $rep ? Result::success($rep) : Result::error("查询失败");
-    }
-}

+ 27 - 12
runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -40,7 +40,7 @@ class NewsController extends AbstractController
     public function getCategoryList()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['pid' => 'required'], ['pid.required' => 'pid不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['page' => 'required', 'pageSize' => 'required'], ['page.required' => '第几页不能为空', 'pageSize.required' => '每页显示条数不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
@@ -86,23 +86,24 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->addCategory($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 更新导航池
+     * @return array
+     */
     public function updateCategory()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'name' => 'required'], ['name.required' => '分类名称不能为空', 'id.required' => 'ID不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'name' => 'required', 'seo_title' => 'required', 'seo_keywords' => 'required', 'seo_description' => 'required'], ['id.required' => 'ID不能为空', '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->updateCategory($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -118,7 +119,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = $this->websiteId;
         $result = $this->newsServiceClient->delCategory($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -145,6 +145,21 @@ class NewsController extends AbstractController
         }
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 获取导航池信息
+     * @return void
+     */
+    public function getCategoryInfo()
+    {
+        $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);
+        }
+        $result = $this->newsServiceClient->getCategoryInfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
     /**
      * 添加分类
      * @return array|void

+ 0 - 297
runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -1,297 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace App\Controller;
-
-use App\JsonRpc\PublicRpcServiceInterface;
-use Hyperf\Di\Annotation\Inject;
-use App\Tools\Result;
-use App\Tools\CommonService;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use App\Tools\PublicData;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface;
-use ZipArchive;
-use function Hyperf\Support\env;
-use Hyperf\Context\Context;
-/**
- * Class PublicController
- * @package App\Controller
- */
-//#[AutoController]
-class PublicController extends AbstractController
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected ValidatorFactoryInterface $validationFactory;
-    /**
-     * @var PublicRpcServiceInterface
-     */
-    #[Inject]
-    private $publicServiceClient;
-    /**
-     * 地区
-     * @return array
-     */
-    public function getDistrictList()
-    {
-        $pid = $this->request->input("pid", 0);
-        $data = ['pid' => $pid];
-        $result = $this->publicServiceClient->getDistrictList($data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取用户等级
-     * @return array
-     */
-    public function getUserLevelList()
-    {
-        $requireData = $this->request->all();
-        $result = $this->publicServiceClient->getUserLevelList($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 上传图片
-     * @return array
-     */
-    public function uploadFile()
-    {
-        $urlN = new CommonService();
-        $file = $this->request->file('file');
-        $fileName = $this->request->input("fileName", '');
-        try {
-            if ($file == null) {
-                return Result::error("未找到上传文件");
-            }
-            $data = CommonService::uploadFile($file, ['png', 'jpg', 'png', 'jpeg', 'gif', 'xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
-            $data['imgUrl'] = $urlN->imgUrl($data['src']);
-            $data['oldFileName'] = $fileName;
-            return Result::success($data, '上传成功');
-        } catch (\Exception $e) {
-            return Result::error($e->getMessage());
-        }
-    }
-    /**
-     * 添加用户等级
-     * @return array
-     */
-    public function addUserLevel()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['name' => 'required'], ['name.required' => '等级名不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $result = $this->publicServiceClient->addUserLevel($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除用户等级
-     * @return array
-     */
-    public function delUserLevel()
-    {
-        $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);
-        }
-        $result = $this->publicServiceClient->delUserLevel($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 更新用户等级
-     * @return array
-     */
-    public function updateUserLevel()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['name' => 'required', 'id' => 'required'], ['id.required' => 'ID不能为空', 'name.required' => '名称不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $result = $this->publicServiceClient->updateUserLevel($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 城市列表
-     * @return array
-     */
-    public function getCityList()
-    {
-        $requireData = $this->request->all();
-        var_dump($requireData);
-        $result = $this->publicServiceClient->getDistrictList($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 投诉举报
-     * @return void
-     */
-    public function addComplaint()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['title' => 'required', 'nature' => 'required', 'nature_level' => 'required', 'type' => 'required', 'name' => 'required', 'mobile' => 'required', 'describe' => 'required', 'type_level' => 'required'], ['title.required' => '标题不能为空', 'nature.required' => '性质不能为空', 'nature_level.required' => '进度不能为空', 'type.required' => '类型不能为空', 'name.required' => '姓名不能为空', 'mobile.required' => '手机号码不能为空', 'describe.required' => '详细说明不能为空', 'type_level.required' => '详细说明不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData = $this->request->all();
-        $requireData['user_id'] = Context::get("UserId");
-        if ($requireData['id']) {
-            $result = $this->publicServiceClient->userUpLetterOfComplaint($requireData);
-        } else {
-            $result = $this->publicServiceClient->addLetterOfComplaint($requireData);
-        }
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 更新投诉举报信息
-     * @return array
-     */
-    public function upComplaint()
-    {
-        $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);
-        }
-        var_dump($requireData);
-        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
-            $requireData['admin_id'] = Context::get("UserId");
-        }
-        $result = $this->publicServiceClient->upLetterOfComplaint($requireData);
-        return $result ? Result::success([]) : Result::error($result['message']);
-    }
-    /**
-     * 获取投诉列表
-     * @return array
-     */
-    public function getComplaint()
-    {
-        $requireData = $this->request->all();
-        $requireData['user_id'] = Context::get("UserId");
-        var_dump("用户id:", Context::get("UserId"));
-        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
-            unset($requireData['user_id']);
-        }
-        $result = $this->publicServiceClient->getLetterOfComplaint($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取投诉举报信息
-     * @return array
-     */
-    public function getLetterOfComplaintInfo()
-    {
-        $requireData = $this->request->all();
-        $requireData['user_id'] = Context::get("UserId");
-        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
-            unset($requireData['user_id']);
-        }
-        $result = $this->publicServiceClient->getLetterOfComplaintInfo($requireData);
-        if ($result) {
-            $result['data']['judgment'] = $result['data']['judgment'] ? json_decode($result['data']['judgment']) : '';
-            $result['data']['audio_and_video'] = $result['data']['audio_and_video'] ? json_decode($result['data']['audio_and_video']) : '';
-            $result['data']['contract'] = $result['data']['contract'] ? json_decode($result['data']['contract']) : '';
-            $result['data']['qualifications'] = $result['data']['qualifications'] ? json_decode($result['data']['qualifications']) : '';
-        }
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除投诉举报信息
-     * @return array
-     */
-    public function delLetterOfComplaint()
-    {
-        $requireData = $this->request->all();
-        $requireData['user_id'] = Context::get("UserId");
-        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
-            unset($requireData['user_id']);
-        }
-        $result = $this->publicServiceClient->delLetterOfComplaint($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取投诉分类信息
-     * @return array
-     */
-    public function getLetterType()
-    {
-        $requireData = $this->request->all();
-        $result = $this->publicServiceClient->getLetterType($requireData);
-        $rep = PublicData::buildMenuTree($result['data']);
-        return $rep ? Result::success($rep) : Result::error("查询失败");
-    }
-    public function downloadFile(RequestInterface $request, ResponseInterface $response)
-    {
-        //验证是否有传参数
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['files' => 'required'], ['files.required' => '文件不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['fileName'] = $requireData['fileName'] ?? '政讯通';
-        //打包文件
-        $zip = new ZipArchive();
-        $fileType = 'zip';
-        $date = date('Ymd');
-        $filePath = $fileType . DIRECTORY_SEPARATOR . $date;
-        $allDir = 'public' . DIRECTORY_SEPARATOR . $filePath;
-        if (!is_dir($allDir)) {
-            if (!mkdir($allDir, 0755, true)) {
-                return Result::error('创建文件夹失败');
-            }
-        }
-        $fileName = $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
-        $zipFileName = $allDir . DIRECTORY_SEPARATOR . $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
-        //        $zipFileName = 'public/zip/files.zip';
-        if ($zip->open($zipFileName, ZipArchive::CREATE) === TRUE) {
-            // 将要下载的文件逐个添加到zip文件中
-            //            $string = trim($requireData['files'], "[]'"); // 去掉最外层的方括号和单引号(注意:这里假设了单引号,如果是双引号则替换为 ")
-            //            $string = str_replace("'", '', $string); // 去掉所有剩余的单引号(如果原字符串中使用的是双引号,则替换为双引号)
-            //            $filePaths = explode(',', $string);
-            foreach ($requireData['files'] as $filePathu) {
-                $attachmentItem = 'public/' . $filePathu;
-                $zip->addFile($attachmentItem, pathinfo($attachmentItem, PATHINFO_BASENAME));
-            }
-            // 关闭zip文件
-            $zip->close();
-            // 将zip文件提供给用户进行下载
-            //            readfile($zipFileName);
-            $fileUrlName = explode("public", $zipFileName);
-            return Result::success(['fileUrl' => env('HOST') . $fileUrlName[1]]);
-        } else {
-            return Result::error('无法创建zip文件');
-        }
-    }
-    /**
-     * 检测是否被处理
-     * @return array
-     */
-    public function checkMeasure()
-    {
-        $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);
-        }
-        $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->checkMeasure($requireData);
-        return $result['code'] == 200 ? Result::success() : Result::error("已经处理了");
-    }
-}

+ 0 - 131
runtime/container/proxy/App_Controller_WebSocketController.proxy.php

@@ -1,131 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace App\Controller;
-
-use App\Amqp\Producer\MqProducer;
-use Hyperf\Amqp\Producer;
-use Hyperf\Context\ApplicationContext as ContextApplicationContext;
-use Hyperf\Contract\OnCloseInterface;
-use Hyperf\Contract\OnMessageInterface;
-use Hyperf\Contract\OnOpenInterface;
-use Hyperf\Engine\WebSocket\Frame;
-use Hyperf\Engine\WebSocket\Response;
-use Hyperf\WebSocketServer\Annotation\MessageHandler;
-use Hyperf\WebSocketServer\Context\WebSocketContext;
-use Hyperf\WebSocketServer\Message\Text;
-use Hyperf\Di\Annotation\Inject;
-use Phper666\JWTAuth\JWT;
-use App\JsonRpc\ChatServiceInterface;
-use Hyperf\WebSocketServer\Constant\Opcode;
-use App\Service\RedisService;
-use App\Service\Message\ReceiveHandleService;
-use http\Client\Request;
-use App\Controller\AbstractController;
-use App\JsonRpc\UserServiceInterface;
-class WebSocketController implements OnMessageInterface, OnOpenInterface, OnCloseInterface
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected JWT $jwt;
-    /**
-     * @var ChatServiceInterface
-     */
-    #[Inject]
-    private $chatServiceClient;
-    /**
-     * @var UserServiceInterface
-     */
-    #[Inject]
-    private $userServiceClient;
-    /**
-     * @Inject
-     * @var ReceiveHandleService
-     */
-    protected $receiveHandle;
-    public function onMessage($server, $frame) : void
-    {
-        //把数据推给前端
-        $redisClient = new RedisService();
-        $userId = $redisClient->findUser((string) $frame->fd);
-        //存入队列
-        $result = json_decode($frame->data, true);
-        $result['user_id'] = $userId;
-        $userInfo = $redisClient->getUserInfo($userId);
-        if ($userInfo) {
-            $userInfoArr = json_decode($userInfo);
-            $result['user_avatar'] = $userInfoArr['avatar'];
-        } else {
-            $userInfos = $this->userServiceClient->getUserInfo((int) $userId);
-            $redisClient->setUserInfo($userId, $userInfos['data']);
-            $result['user_avatar'] = $userInfos['data']['avatar'];
-        }
-        var_dump("接收到的数据:", $result);
-        $message = new MqProducer($result);
-        $producer = ContextApplicationContext::getContainer()->get(Producer::class);
-        $producer->produce($message);
-        //推送给前台
-        //组装数据+头像
-        if ($result['talk_type'] == 1) {
-            //给自己推一条数据
-            if ($server->isEstablished($frame->fd)) {
-                $server->push($frame->fd, json_encode($result));
-            }
-            //给好友推送消息
-            $fd = $redisClient->findFd((int) $result['receiver_id']);
-            //            $result['user_id'] = $result['friend_id'];
-            if ($server->isEstablished((int) $fd)) {
-                $b = $server->push((int) $fd, json_encode($result));
-                var_dump("推送成功:", $b);
-            }
-        } else {
-            if ($result['talk_type'] == 2) {
-                //根据群找到 群用户,群发一遍消息
-                $groupUserList = $this->chatServiceClient->getAllTalkGroupMember(['group_id' => $result['receiver_id']]);
-                var_dump($groupUserList['data']);
-                if ($groupUserList['data']) {
-                    foreach ($groupUserList['data'] as $val) {
-                        $fd = $redisClient->findFd((int) $val['user_id']);
-                        if ($server->isEstablished((int) $fd)) {
-                            $server->push((int) $fd, json_encode($result));
-                        }
-                    }
-                }
-            }
-        }
-    }
-    public function onClose($server, int $fd, int $reactorId) : void
-    {
-        var_dump('closed::::::::::::::::::', $fd, "======", $reactorId, "+++++++++++");
-        //        $data = [
-        //            'fd'=>$fd
-        //        ];
-        //        $this->chatServiceClient->delChatChannel($data);
-        $redisClient = new RedisService();
-        $userId = $redisClient->findUser((string) $fd);
-        $redisClient->unbind((string) $fd, (int) $userId);
-    }
-    public function onOpen($server, $request) : void
-    {
-        $token = $request->get['token'];
-        $userInfo = $this->jwt->getClaimsByToken($token);
-        $response = (new Response($server))->init($request);
-        $fd = $response->getFd();
-        //        var_dump("管道ID:",$fd);
-        //        $data = [
-        //            'user_id'=>$userInfo['uid'],
-        //            'fd'=>$fd
-        //        ];
-        //        var_dump(SERVER_RUN_ID,"+++++++++++++");
-        //      $this->chatServiceClient->addChatChannel($data);
-        $server->bind($fd, $userInfo['uid']);
-        $redisClient = new RedisService();
-        $redisClient->bind((string) $fd, $userInfo['uid']);
-        $server->push($request->fd, json_encode(["event" => "connect", "content" => ["ping_interval" => 20, "ping_timeout" => 20 * 3, "content" => "连接成功"]]));
-    }
-}

+ 0 - 450
runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -1,450 +0,0 @@
-<?php
-
-declare (strict_types=1);
-namespace App\Controller;
-
-use App\JsonRpc\WebsiteServiceInterface;
-use App\Tools\PublicData;
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpServer\Annotation\AutoController;
-use App\Tools\Result;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use Hyperf\Context\Context;
-/**
- * Class WebsiteController
- * @package App\Controller
- */
-//#[AutoController]
-class WebsiteController extends AbstractController
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected ValidatorFactoryInterface $validationFactory;
-    /**
-     * @var WebsiteServiceInterface
-     */
-    #[Inject]
-    private $websiteServiceClient;
-    /**
-     * 创建站点
-     * @return array
-     */
-    public function addWebsite()
-    {
-        $requireData = $this->request->all();
-        $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);
-        }
-        $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']);
-    }
-    /**
-     * 获取站点列表
-     * @return void
-     */
-    public function getWebsiteList()
-    {
-        $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']) : '';
-            }
-        }
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 更新站点
-     * @return array
-     */
-    public function updateWebsite()
-    {
-        $requireData = $this->request->all();
-        $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);
-        }
-        $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']);
-    }
-    /**
-     * 删除站点
-     * @return array
-     */
-    public function delWebsite()
-    {
-        $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->delWebsite($id);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取站点信息
-     * @return array
-     */
-    public function getWebsiteInfo()
-    {
-        $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']);
-        }
-    }
-    public function getWebsiteColumn()
-    {
-        $pid = (int) $this->request->input("pid", 0);
-        $result = $this->websiteServiceClient->getWebsiteColumn([]);
-        $rep = PublicData::buildMenuTree($result['data']);
-        return $rep ? Result::success($rep) : Result::error("查询失败");
-    }
-    /**
-     * 获取站点列表
-     * @return void
-     */
-    public function getWebsiteColumnList()
-    {
-        $keyword = $this->request->input("keyWord", '');
-        $page = (int) $this->request->input("page", 1);
-        $pageSize = (int) $this->request->input("pageSize", 10);
-        $result = $this->websiteServiceClient->getWebsiteColumnList($keyword, $page, $pageSize);
-        if ($result['data']) {
-            foreach ($result['data']['rows'] as $k => $v) {
-                $result['data']['rows'][$k]['column_arr_id'] = $v['column_arr_id'] ? json_decode($v['column_arr_id']) : [0];
-            }
-        }
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 创建栏目
-     * @return array
-     */
-    public function addWebsiteColumn()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if (isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])) {
-            $requireData['pid'] = end($requireData['column_arr_id']);
-            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
-        } else {
-            $column_arr_id = [0];
-            $requireData['column_arr_id'] = json_encode($column_arr_id);
-            $requireData['pid'] = end($column_arr_id);
-        }
-        $result = $this->websiteServiceClient->createWebsiteColumn($requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 创建栏目
-     * @return array
-     */
-    public function updateWebsiteColumn()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if (isset($requireData['column_arr_id']) && is_array($requireData['column_arr_id'])) {
-            $requireData['pid'] = end($requireData['column_arr_id']);
-            $requireData['column_arr_id'] = json_encode($requireData['column_arr_id']);
-        } else {
-            $column_arr_id = [0];
-            $requireData['column_arr_id'] = json_encode($column_arr_id);
-            $requireData['pid'] = end($column_arr_id);
-        }
-        $result = $this->websiteServiceClient->updateWebsiteColumn($requireData['id'], $requireData);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除栏目
-     * @return array
-     */
-    public function delWebsiteColumn()
-    {
-        $id = (int) $this->request->input("id", '');
-        $result = $this->websiteServiceClient->delWebsiteColumn($id);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取站点角色列表
-     * @return void
-     */
-    public function getWebsiteRoleList()
-    {
-        $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);
-        }
-        $keyword = $this->request->input("keyword", '');
-        $page = (int) $this->request->input("page", 1);
-        $pageSize = (int) $this->request->input("pageSize", 10);
-        $websiteId = (int) $this->request->input("id", '');
-        $result = $this->websiteServiceClient->getWebsiteRoleList($keyword, $page, $pageSize, $websiteId);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 创建站点角色
-     * @return array
-     */
-    public function createWebsiteRole()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['type' => 'required', 'role_id' => 'required', 'website_id' => 'required'], ['type.required' => '类型不能为空', 'type_id.required' => 'ID不能为空', 'website_id.required' => '站点ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['admin_user_id'] = Context::get("UserId");
-        $result = $this->websiteServiceClient->createWebsiteRole($requireData);
-        return $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除站点角色
-     * @return array
-     */
-    public function delWebsiteRole()
-    {
-        $id = (int) $this->request->input("id", '');
-        $result = $this->websiteServiceClient->delWebsiteRole($id);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取站点角色用户列表
-     * @return void
-     */
-    public function getWebsiteRoleUserList()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['website_id' => 'required', 'role_id' => 'required'], ['website_id.required' => '站点ID不能为空', 'role_id.required' => '角色ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $keyword = $this->request->input("keyword", '');
-        $page = (int) $this->request->input("page", 1);
-        $pageSize = (int) $this->request->input("pageSize", 10);
-        $roleId = (int) $this->request->input("role_id", '');
-        $websiteId = (int) $this->request->input("website_id", '');
-        $result = $this->websiteServiceClient->getWebsiteRoleUserList($keyword, $page, $pageSize, $websiteId, $roleId);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 创建站点角色用户
-     * @return array
-     */
-    public function createWebsiteRoleUser()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['type' => 'required', 'role_id' => 'required', 'website_id' => 'required', 'user_id' => 'required'], ['type.required' => '类型不能为空', 'website_id.required' => '站点ID不能为空', 'role_id.required' => '角色ID不能为空', 'user_id.required' => '用户ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['admin_user_id'] = Context::get("UserId");
-        $requireData['role_id'] = (int) $requireData['role_id'];
-        $requireData['type'] = (int) $requireData['type'];
-        $requireData['website_id'] = (int) $requireData['website_id'];
-        $requireData['user_id'] = (int) $requireData['user_id'];
-        $result = $this->websiteServiceClient->createWebsiteRoleUser($requireData);
-        return $result['code'] != 0 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除站点角色用户
-     * @return array
-     */
-    public function delWebsiteRoleUser()
-    {
-        $id = (int) $this->request->input("id", '');
-        $result = $this->websiteServiceClient->delWebsiteRoleUser($id);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 网站栏目映射
-     * @return void
-     */
-    public function addWebsiteCategory()
-    {
-        return [];
-    }
-    /**
-     * 管理后台首页统计
-     * @return array
-     */
-    public function getAdminIndex()
-    {
-        return [];
-    }
-    /**
-     * 获取模板皮肤分类
-     * @return void
-     */
-    public function getTemplateClass()
-    {
-        $result = $this->websiteServiceClient->getTemplateClass([]);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 添加模板分类
-     * @return void
-     */
-    public function addTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['name' => 'required'], ['name.required' => '模板类型不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['name' => $requireData['name'], 'sort' => $requireData['sort'] ?? 0];
-        $result = $this->websiteServiceClient->addTemplateClass($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 更新模板分类
-     * @return array
-     */
-    public function upTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['name' => 'required', 'id' => 'required'], ['name.required' => '模板类型不能为空', 'name.id' => '模板类型ID不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['id' => $requireData['id'], 'name' => $requireData['name'], 'sort' => $requireData['sort'] ?? 0];
-        $result = $this->websiteServiceClient->upTemplateClass($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除模板分类
-     * @return array
-     */
-    public function delTemplateClass()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['name.required' => '类型id不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['id' => $requireData['id']];
-        $result = $this->websiteServiceClient->delTemplateClass($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 获取分类下的模板
-     * @return array
-     */
-    public function getTemplate()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['template_class_id' => 'required', 'page' => 'required', 'pageSize' => 'required'], ['template_class_id.required' => '类型template_class_id不能为空', 'page.required' => 'page不能为空', 'pageSize.required' => '每页显示条数不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['template_class_id' => $requireData['template_class_id'], 'page' => $requireData['page'], 'pageSize' => $requireData['pageSize']];
-        $result = $this->websiteServiceClient->getTemplate($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 创建皮肤模板
-     * @return array
-     */
-    public function addTemplate()
-    {
-        $requireData = $this->request->all();
-        //        var_dump("FCK:",$requireData);
-        $validator = $this->validationFactory->make($requireData, ['template_name' => 'required', 'template_class_id' => 'required', 'template_img' => 'required'], ['template_name.required' => '模板名称不能为空', 'template_class_id.required' => '模板类型id不能为空', 'template_img.required' => '模板图片不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        //        var_dump($requireData);
-        $data = ['template_name' => $requireData['template_name'], 'template_class_id' => $requireData['template_class_id'], 'template_img' => $requireData['template_img']];
-        $result = $this->websiteServiceClient->addTemplate($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 更新模板
-     * @return array
-     */
-    public function upTemplate()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['template_name' => 'required', 'template_class_id' => 'required', 'template_img' => 'required', 'id' => 'required'], ['template_name.required' => '模板名称不能为空', 'template_class_id.required' => '模板类型id不能为空', 'template_img.required' => '模板图片不能为空', 'id.required' => '模板id不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['id' => $requireData['id'], 'template_name' => $requireData['template_name'], 'template_img' => $requireData['template_img'], 'template_class_id' => $requireData['template_class_id']];
-        $result = $this->websiteServiceClient->upTemplate($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 删除模板
-     * @return array
-     */
-    public function delTemplate()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['name.required' => '模板id不能为空']);
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = ['id' => $requireData['id']];
-        $result = $this->websiteServiceClient->delTemplate($data);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-}

+ 0 - 79
runtime/container/proxy/App_JsonRpc_AdServiceInterface.rpc-client.proxy.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class AdServiceInterface_3ac41e1a91edce2a03e766c3d95a7c11 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AdServiceInterface
-{
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function createAd(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function getAdInfo(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getAdList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function updateAd(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delAd(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getAdPlaceList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function createAdPlace(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function updateAdPlace(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delAdPlace(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 61
runtime/container/proxy/App_JsonRpc_AuthorityServiceInterface.rpc-client.proxy.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class AuthorityServiceInterface_d76232b31bbd469dfad8aee1d7fa38f3 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
-{
-    /**
-     * 菜单列表
-     * @param array $data
-     * @return array
-     */
-    public function getMenuList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 获取菜单信息
-     * @param array $data
-     * @return array
-     */
-    public function getMenuInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新菜单
-     * @param array $data
-     * @return array
-     */
-    public function updateMenu(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除惨淡
-     * @param array $data
-     * @return array
-     */
-    public function delMenu(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 创建菜单
-     * @param array $data
-     * @return array
-     */
-    public function addMenu(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 查询菜单
-     * @param array $data
-     * @return array
-     */
-    public function getRecursionMenu(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 299
runtime/container/proxy/App_JsonRpc_ChatServiceInterface.rpc-client.proxy.php

@@ -1,299 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class ChatServiceInterface_0cd93fa44e0f203faeac10c82cbfb519 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements ChatServiceInterface
-{
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getChatChannelList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delChatChannel(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addChatChannel(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 添加申请
-     * @param array $data
-     * @return array
-     */
-    public function addContactApply(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新申请
-     * @param array $data
-     * @return array
-     */
-    public function updateContactApply(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 好友申请列表
-     * @param array $data
-     * @return array
-     */
-    public function getContactApplyList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 好有查询
-     * @param array $data
-     * @return array
-     */
-    public function getContactList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 添加好友
-     * @param array $data
-     * @return array
-     */
-    public function addContact(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新好友
-     * @param array $data
-     * @return array
-     */
-    public function updateContact(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除好友
-     * @param array $data
-     * @return array
-     */
-    public function delContact(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 会话列表
-     * @param array $data
-     * @return array
-     */
-    public function getTalkSessionList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 添加会话
-     * @param array $data
-     * @return array
-     */
-    public function addTalkSession(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新会话
-     * @param array $data
-     * @return array
-     */
-    public function updateTalkSession(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除会话
-     * @param array $data
-     * @return array
-     */
-    public function delTalkSession(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 聊天内容
-     * @param array $data
-     * @return array
-     */
-    public function getTalkRecordsList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 添加聊天内容
-     * @param array $data
-     * @return array
-     */
-    public function addTalkRecords(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新聊天内容
-     * @param array $data
-     * @return array
-     */
-    public function updateTalkRecords(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除聊天内容
-     * @param array $data
-     * @return array
-     */
-    public function delTalkRecords(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 聊天内容-附件列表
-     * @param array $data
-     * @return array
-     */
-    public function getTalkRecordsFileList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 聊天内容-添加附件
-     * @param array $data
-     * @return array
-     */
-    public function addTalkRecordsFile(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 聊天内容 - 更新附件
-     * @param array $data
-     * @return array
-     */
-    public function updateTalkRecordsFile(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 聊天内容 - 删除附件
-     * @param array $data
-     * @return array
-     */
-    public function delTalkRecordsFile(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 群列表
-     * @param array $data
-     * @return array
-     */
-    public function getTalkGroupList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 创建群
-     * @param array $data
-     * @return array
-     */
-    public function addTalkGroup(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 更新群
-     * @param array $data
-     * @return array
-     */
-    public function updateTalkGroup(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 删除群
-     * @param array $data
-     * @return array
-     */
-    public function delTalkGroup(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 群用户列表
-     * @param array $data
-     * @return array
-     */
-    public function getTalkGroupMember(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 全部群用户列表
-     * @param array $data
-     * @return array
-     */
-    public function getAllTalkGroupMember(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 创建群用户
-     * @param array $data
-     * @return array
-     */
-    public function addTalkGroupMember(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 更新群用户
-     * @param array $data
-     * @return array
-     */
-    public function updateTalkGroupMember(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 群组 - 删除群用户
-     * @param array $data
-     * @return array
-     */
-    public function delTalkGroupMember(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addTalkSessionAssociation(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function updateTalkSessionAssociation(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 35
runtime/container/proxy/App_JsonRpc_LinkServiceInterface.rpc-client.proxy.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class LinkServiceInterface_d8f22ae5023232e70650b2dfcba3359c extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements LinkServiceInterface
-{
-    /**
-     * @param array $data
-     */
-    public function getLinkList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function createLink(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function updateLink(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function delLink(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 77
runtime/container/proxy/App_JsonRpc_NewsServiceInterface.rpc-client.proxy.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class NewsServiceInterface_16444e0d1c15722b21fce1ca12e7a3fa extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements NewsServiceInterface
-{
-    /**
-     * @param array $data
-     */
-    public function getCategoryList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function categoryList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function addCategory(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function delCategory(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function updateCategory(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function getArticleList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function addArticle(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function delArticle(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function updateArticle(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function getArticleInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 131
runtime/container/proxy/App_JsonRpc_PublicRpcServiceInterface.rpc-client.proxy.php

@@ -1,131 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class PublicRpcServiceInterface_b23b259d2bf153dc659dd410db44ac2a extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements PublicRpcServiceInterface
-{
-    /**
-     * @param array $data
-     */
-    public function getDistrictList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function getUserLevelList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function addUserLevel(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function delUserLevel(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function updateUserLevel(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getLetterOfComplaint(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addLetterOfComplaint(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upLetterOfComplaint(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 用户端更新投诉举报信息
-     * @param array $data
-     * @return mixed
-     */
-    public function userUpLetterOfComplaint(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getLetterOfComplaintInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delLetterOfComplaint(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getLetterType(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upLetterType(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addLetterType(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delLetterType(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function checkMeasure(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 133
runtime/container/proxy/App_JsonRpc_UserServiceInterface.rpc-client.proxy.php

@@ -1,133 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class UserServiceInterface_c87d81348545884dd699f8f3dd42aaf4 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements UserServiceInterface
-{
-    /**
-     * @param array $data
-     */
-    public function createUser(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     */
-    public function getUserInfo(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     */
-    public function getUserList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function verifyUserInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @remark 创建登录日志信息
-     * @param array $data
-     * @return array
-     */
-    public function createUserLogin(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新用户信息
-     * @param array $data
-     * @return array
-     */
-    public function updateUser(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新用户
-     * @param array $data
-     * @return array
-     */
-    public function updateUserInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除用户
-     * @param int $id
-     * @return array
-     */
-    public function delUser(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 添加角色
-     * @param array $data
-     * @return array
-     */
-    public function addRole(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 删除角色
-     * @param array $data
-     * @return array
-     */
-    public function delRole(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 更新角色
-     * @param array $data
-     * @return array
-     */
-    public function updateRole(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 角色列表
-     * @param array $data
-     * @return array
-     */
-    public function roleList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 角色信息
-     * @param array $data
-     * @return array
-     */
-    public function roleInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWechatInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addWechatInfo(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 249
runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -1,249 +0,0 @@
-<?php
-
-namespace App\JsonRpc;
-
-class WebsiteServiceInterface_8096e1813991fe20e792f85ade62ceb3 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
-{
-    /**
-     * @param string $keyword
-     * @param int $page
-     * @param int $pageSize
-     */
-    public function getWebsitetList(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function createWebsite(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @param array $data
-     * @return array
-     */
-    public function updateWebsite(int $id, array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function delWebsite(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * 查询网站信息
-     * @param int $id
-     * @return array
-     */
-    public function getWebsiteInfo(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteColumn(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param string $keyword
-     * @param int $page
-     * @param int $pageSize
-     */
-    public function getWebsiteColumnList(string $keyword, int $page, int $pageSize)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function createWebsiteColumn(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @param array $data
-     * @return array
-     */
-    public function updateWebsiteColumn(int $id, array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function delWebsiteColumn(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param string $keyword
-     * @param int $page
-     * @param int $pageSize
-     */
-    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize, int $websiteId)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function createWebsiteRole(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @param array $data
-     * @return array
-     */
-    public function updateWebsiteRole(int $id, array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function delWebsiteRole(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param string $keyword
-     * @param int $page
-     * @param int $pageSize
-     */
-    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize, int $websiteId, int $roleId)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function createWebsiteRoleUser(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @param array $data
-     * @return array
-     */
-    public function updateWebsiteRoleUser(int $id, array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param int $id
-     * @return array
-     */
-    public function delWebsiteRoleUser(int $id)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteId(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     *
-     */
-    public function getWebsiteCategory(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getAdminIndex(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getTemplateClass(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addTemplateClass(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upTemplateClass(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delTemplateClass(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getTemplate(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addTemplate(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function upTemplate(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function delTemplate(array $data)
-    {
-        return $this->client->__call(__FUNCTION__, func_get_args());
-    }
-}

+ 0 - 35
runtime/container/proxy/App_Service_RedisInterface.proxy.php

@@ -1,35 +0,0 @@
-<?php
-
-declare (strict_types=1);
-/**
- * This file is part of Hyperf.
- *
- * @link     https://www.hyperf.io
- * @document https://hyperf.wiki
- * @contact  group@hyperf.io
- * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
- */
-namespace App\Service;
-
-use Hyperf\Di\Annotation\Inject;
-use Psr\Container\ContainerInterface;
-abstract class RedisInterface
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    protected $redis;
-    #[Inject]
-    protected ContainerInterface $container;
-    public function __construct()
-    {
-        $this->__handlePropertyHandler(__CLASS__);
-        /**
-         * 生成图片验证码
-         * @return string
-         * @throws \Psr\Container\ContainerExceptionInterface
-         * @throws \Psr\Container\NotFoundExceptionInterface
-         * @throws \RedisException
-         */
-        $this->redis = $this->container->get(\Hyperf\Redis\Redis::class);
-    }
-}

+ 0 - 97
runtime/container/proxy/App_Service_RedisService.proxy.php

@@ -1,97 +0,0 @@
-<?php
-
-namespace App\Service;
-
-use App\Cache\SocketFdBindUser;
-use App\Cache\SocketUserBindFds;
-/**
- * websocket关系存储
- *
- * @package App\Service
- */
-class RedisService extends RedisInterface
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    protected $prefix_fn = 'chat_fn';
-    protected $prefix_user = 'chat_user';
-    protected $prefix_user_info = 'userListInfo';
-    /**
-     * 绑定fd和用户关系
-     * @param string $fid
-     * @param int $userId
-     * @param $run_id
-     * @return void
-     * @throws \RedisException
-     */
-    public function bind(string $fid, int $userId, $run_id = SERVER_RUN_ID)
-    {
-        //站点通道+用户
-        $this->redis->hSet($run_id, $this->prefix_fn . $fid, $userId);
-        //站点用户+通道
-        $this->redis->hSet($run_id, $this->prefix_user . $userId, $fid);
-    }
-    /**
-     * 解绑通道和用户关系
-     * @param string $fid
-     * @param int $userId
-     * @param $run_id
-     * @return void
-     * @throws \RedisException
-     */
-    public function unbind(string $fid, int $userId, $run_id = SERVER_RUN_ID)
-    {
-        $this->redis->hDel($run_id, $this->prefix_fn . $fid);
-        $this->redis->hDel($run_id, $this->prefix_user . $userId);
-    }
-    /**
-     * 通过FD获取userID
-     * @param string $fid
-     * @param $run_id
-     * @return false|\Redis|string
-     * @throws \RedisException
-     */
-    public function findUser(string $fid, $run_id = SERVER_RUN_ID)
-    {
-        return $this->redis->hGet($run_id, $this->prefix_fn . $fid);
-    }
-    /**
-     * 通过UserID 获取fd
-     * @param int $userId
-     * @param $run_id
-     * @return false|\Redis|string
-     * @throws \RedisException
-     */
-    public function findFd(int $userId, $run_id = SERVER_RUN_ID)
-    {
-        return $this->redis->hGet($run_id, $this->prefix_user . $userId);
-    }
-    /**
-     * 存储用户信息
-     * @param int $userId
-     * @param array $data
-     * @return void
-     * @throws \RedisException
-     */
-    public function setUserInfo(string $userId, array $data)
-    {
-        $this->redis->hSet($this->prefix_user_info, $userId, json_encode($data));
-    }
-    /**
-     * 获取用户信息
-     * @param int $userId
-     * @return void
-     * @throws \RedisException
-     */
-    public function getUserInfo(string $userId)
-    {
-        $this->redis->hGet($this->prefix_user_info, $userId);
-    }
-}

+ 0 - 103
runtime/container/proxy/App_Tools_CommonService.proxy.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace App\Tools;
-
-use App\Constants\ErrorCode;
-use Hyperf\Di\Annotation\Inject;
-use Hyperf\HttpMessage\Upload\UploadedFile;
-use App\Tools\Result;
-use ZX\Tools\File\MimeTypes;
-use function Hyperf\Support\env;
-use Hyperf\HttpServer\Contract\RequestInterface;
-class CommonService
-{
-    use \Hyperf\Di\Aop\ProxyTrait;
-    use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        $this->__handlePropertyHandler(__CLASS__);
-    }
-    #[Inject]
-    protected RequestInterface $request;
-    public static function uploadFile(UploadedFile $uploadedFile, array $acceptExt, string $fileType = 'image')
-    {
-        $ext = $uploadedFile->getExtension();
-        //        var_dump($uploadedFile->getFilename());
-        //        var_dump($uploadedFile->getPath());
-        //        var_dump($uploadedFile->getFilename());
-        //        var_dump($uploadedFile->getExtension());
-        //        var_dump($uploadedFile->getBasename());
-        //        var_dump($uploadedFile->getPathname());
-        //        var_dump($uploadedFile->getPerms());
-        //        var_dump($uploadedFile->getRealPath());
-        //        var_dump($uploadedFile->getFileInfo());
-        //        var_dump($uploadedFile->getPathInfo());
-        //        var_dump($uploadedFile->getClientOriginalName());
-        if (!in_array($ext, $acceptExt)) {
-            return Result::error('文件名后缀不允许');
-        }
-        //图片检测安全
-        if ($fileType == 'image') {
-            $res = self::checkMimeType($uploadedFile, $ext);
-            if ($res == false) {
-                return Result::error('文件安全检测未通过');
-            }
-        }
-        $date = date('Ymd');
-        $filePath = $fileType . DIRECTORY_SEPARATOR . $date;
-        $allDir = 'public' . DIRECTORY_SEPARATOR . $filePath;
-        if (!is_dir($allDir)) {
-            if (!mkdir($allDir, 0755, true)) {
-                return Result::error('创建文件夹失败');
-            }
-        }
-        $fileName = time() . mt_rand(1, 1000000) . '.' . $ext;
-        $finalPath = BASE_PATH . DIRECTORY_SEPARATOR . $allDir . DIRECTORY_SEPARATOR . $fileName;
-        $showPath = $filePath . DIRECTORY_SEPARATOR . $fileName;
-        $uploadedFile->moveTo($finalPath);
-        return ['id' => uniqid(), 'src' => $showPath, 'fileName' => $fileName, 'fileType' => $ext];
-    }
-    //检测文件是否合法
-    public static function checkMimeType(UploadedFile $uploadedFile, string $ext = '')
-    {
-        try {
-            $filePath = $uploadedFile->getRealPath();
-            $fileMimeType = mime_content_type($filePath);
-            $mimeTypes = MimeTypes::getImage();
-            $isExist = array_key_exists($fileMimeType, $mimeTypes);
-            if (!$isExist) {
-                return Result::error('非允许mime types类型');
-            }
-            list($width, $height, $type, $attr) = getimagesize($filePath, $ext);
-            if ($width <= 0 || $height <= 0) {
-                return false;
-            } else {
-                return true;
-            }
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
-    public function imgUrl(string $str)
-    {
-        $scheme = $this->request->getUri()->getScheme() ?? 'http';
-        $host = $this->request->getUri()->getHost() ?? '127.0.0.1';
-        $port = $this->request->getUri()->getPort() ?? '';
-        $url = '';
-        if ($port == 80 || $port == 443 || empty($port)) {
-            $url = "{$scheme}://{$host}/{$str}";
-        } else {
-            $url = "{$scheme}://{$host}:{$port}/{$str}";
-        }
-        return $url;
-    }
-    /**
-     * 获取用户IP
-     * @return mixed|string
-     */
-    public function userIp()
-    {
-        $Ip = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
-        return $Ip;
-    }
-}

File diff suppressed because it is too large
+ 0 - 0
runtime/container/scan.cache


+ 0 - 0
storage/languages/en/validation.php


Some files were not shown because too many files changed in this diff