111

app/Controller/LoginController.php

@@ -475,6 +475,17 @@ class LoginController extends AbstractController
                 'token.required' => 'token不能为空',
             ]
         );
+
+        // 用im_post 申请退出
+        $imPostUrl = env("IM_POST_URL");
+        $option = [
+            'authorization' =>   'Bearer ' . $reqData['token'],
+        ];
+        $result = PublicData::im_post($imPostUrl . 'auth/logout', ['token' => $reqData['token']], $option);
+        var_dump("IM退出返回值：", $result);
+        var_dump("url:", $imPostUrl . 'auth/logout');
+
+
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
@@ -626,11 +637,9 @@ class LoginController extends AbstractController
 
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);
         $ticket = md5($reqData['admintoken']);
-
         $res = $redis->del('ticket:' . $ticket);
         var_dump("删除redis:", $res);
         var_dump("获取redis:", $redis->get('ticket:' . $ticket));
-
         // 获取所有 Cookie
         $cookies = $this->request->getCookieParams();
         var_dump("获取cookie:", $cookies);
@@ -648,7 +657,6 @@ class LoginController extends AbstractController
         } catch (\Exception $e) {
             var_dump("返回错误信息：", $e->getMessage());
         }
-
         $backurl = $this->fun_http($reqData['backurl']);
         var_dump("返回地址：", $backurl);
         return $this->response->redirect($backurl, 302);

app/JsonRpc/PublicRpcService.php

@@ -284,7 +284,7 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    
+
     public function getSectorInfo(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -421,7 +421,7 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-     /**
+    /**
      * 自助建站-通栏版式管理-更新通栏版式
      */
     public function upSectorPlace(array $data): array
@@ -519,6 +519,48 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-添加样式代码
+     */
+    public function addStyleCode(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 自助建站-获取样式代码
+     */
+    public function getStyleCode(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 自助建站-添加层级
+     */
+    public function addLevel(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    public function updateLevel(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function deleteLevel(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getLevelInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getLevelList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getLevel(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * 自助建站-获取某皮肤下的通栏、组件、组件预览图
      */
@@ -589,37 +631,6 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    /**
-     * 自助建站-验证关键词填写重复问题
-     */
-    public function checkRepeatKeyword(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * 自助建站-验证临时模板
-     */
-    public function checkWebTemplate(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * 自助建站-添加样式代码
-     */
-    public function addStyleCode(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * 自助建站-获取样式代码
-     */
-    public function getStyleCode(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-
-
-
 
 
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -214,7 +214,7 @@ interface PublicRpcServiceInterface
     public function getAllSize(array $data);
 
 
-    
+
     // 通栏版式管理-获取通栏版式列表
     public function getSectorPlaceList(array $data);
     // 通栏版式管理-添加通栏版式
@@ -245,16 +245,22 @@ interface PublicRpcServiceInterface
     public function updateComponentImg(array $data);
     //自助建站-获取通栏类型
     public function getSectorType(array $data);
+    //自助建站-随机获取模板
+    public function randomWebTemplate(array $data);
+    //自助建站-获取某皮肤下的通栏、组件、组件预览图
+    public function getAllSectorComponentStyle(array $data);
+
     //自助建站-添加样式代码
     public function addStyleCode(array $data);
     //自助建站-获取样式代码
     public function getStyleCode(array $data);
 
-
-    //自助建站-随机获取模板
-    public function randomWebTemplate(array $data);
-    //自助建站-获取某皮肤下的通栏、组件、组件预览图
-    public function getAllSectorComponentStyle(array $data);
+    public function addLevel(array $data);
+    public function updateLevel(array $data);
+    public function deleteLevel(array $data);
+    public function getLevelInfo(array $data);
+    public function getLevelList(array $data);
+    public function getLevel(array $data);
     //自助建站-ai会话-获取会话列表
     public function getAiSessionList(array $data);
     //自助建站-ai会话-创建会话
@@ -273,10 +279,6 @@ interface PublicRpcServiceInterface
     public function addTemplateDraftbox(array $data);
     //自助建站-ai会话-修改模板草稿
     public function upTemplateDraftbox(array $data);
-    //自助建站-验证关键词填写重复问题
-    public function checkRepeatKeyword(array $data);
-    //自助建站-验证临时模板
-    public function checkWebTemplate(array $data);
 
 
 }

config/api/public.php

@@ -1,6 +1,7 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
+
 use App\Controller\PublicController;
 use App\Middleware\Auth\FooMiddleware;
 use Hyperf\HttpServer\Router\Router;
@@ -9,10 +10,11 @@ use App\Controller\MinioController;
 Router::addRoute(['GET', 'POST'], '/verifyCode', 'App\Controller\IndexController@verifyCode');
 
 Router::addGroup(
-    '/public', function () {
+    '/public',
+    function () {
         Router::get('/getDistrictList', [PublicController::class, 'getDistrictList']);
         Router::get('/getUserLevelList', [PublicController::class, 'getUserLevelList']);
-//        Router::post('/uploadFile', [PublicController::class, 'uploadFile']);
+        //        Router::post('/uploadFile', [PublicController::class, 'uploadFile']);
         Router::post('/addUserLevel', [PublicController::class, 'addUserLevel']);
         Router::post('/delUserLevel', [PublicController::class, 'delUserLevel']);
         Router::post('/updateUserLevel', [PublicController::class, 'updateUserLevel']);
@@ -82,7 +84,7 @@ Router::addGroup(
         Router::post('/getAllSize', [PublicController::class, 'getAllSize']);
         Router::post('/getAllSector', [PublicController::class, 'getAllSector']);
         Router::post('/getAllComponent', [PublicController::class, 'getAllComponent']);
-        
+
         //获取组件
         Router::post('/addComponent', [PublicController::class, 'addComponent']);
         Router::post('/getComponentList', [PublicController::class, 'getComponentList']);
@@ -123,7 +125,7 @@ Router::addGroup(
         // 自助建站-6.返显保存的模版
         Router::post('/getWebsiteTemplate', [PublicController::class, 'getWebsiteTemplate']);
 
-        
+
         // 企业管理
         // 获取企业列表
         Router::get('/getCompanyList', [PublicController::class, 'getCompanyList']);
@@ -148,6 +150,15 @@ Router::addGroup(
         Router::post('/randomWebTemplate', [PublicController::class, 'randomWebTemplate']);
         // 获取某皮肤下的通栏、组件、组件预览图
         Router::post('/getAllSectorComponentStyle', [PublicController::class, 'getAllSectorComponentStyle']);
+
+        //level 行政级别
+        Router::post('/addLevel', [PublicController::class, 'addLevel']);
+        Router::post('/updateLevel', [PublicController::class, 'updateLevel']);
+        Router::post('/deleteLevel', [PublicController::class, 'deleteLevel']);
+        Router::post('/getLevelInfo', [PublicController::class, 'getLevelInfo']);
+        Router::post('/getLevelList', [PublicController::class, 'getLevelList']);
+        Router::post('/getLevel', [PublicController::class, 'getLevel']); //获取children层级
+
         // 自助建站-ai会话-获取会话列表
         Router::post('/getAiSessionList', [PublicController::class, 'getAiSessionList']);
         // 自助建站-ai会话-创建会话
@@ -166,28 +177,27 @@ Router::addGroup(
         Router::post('/upTemplateDraftbox', [PublicController::class, 'upTemplateDraftbox']);
         // 自助建站-ai会话-获取模板草稿列表
         Router::post('/getTemplateDraftboxList', [PublicController::class, 'getTemplateDraftboxList']);
-        // 自助建站-验证关键词填写重复问题
-        Router::post('/checkRepeatKeyword', [PublicController::class, 'checkRepeatKeyword']);
-        // 自助建站-验证临时模板
-        Router::post('/checkWebTemplate', [PublicController::class, 'checkWebTemplate']);
     },
     ['middleware' => [FooMiddleware::class]]
 );
 
 Router::addGroup(
-    '/public', function () {
-    //添加投诉举报
-    Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
-    //修改投诉举报
-    Router::addRoute(['GET', 'POST'], '/upComplaint', [PublicController::class, 'upComplaint']);
-    //投诉举报列表
-    Router::addRoute(['GET', 'POST'], '/getComplaint', [PublicController::class, 'getComplaint']);
-    //查看投诉举报信息
-    Router::addRoute(['GET', 'POST'], '/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
-},
-    ['middleware' => [\App\Middleware\Auth\ComplaintMiddleware::class]]);
+    '/public',
+    function () {
+        //添加投诉举报
+        Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
+        //修改投诉举报
+        Router::addRoute(['GET', 'POST'], '/upComplaint', [PublicController::class, 'upComplaint']);
+        //投诉举报列表
+        Router::addRoute(['GET', 'POST'], '/getComplaint', [PublicController::class, 'getComplaint']);
+        //查看投诉举报信息
+        Router::addRoute(['GET', 'POST'], '/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+    },
+    ['middleware' => [\App\Middleware\Auth\ComplaintMiddleware::class]]
+);
 Router::addGroup(
-    '/public', function () {
+    '/public',
+    function () {
         //获取所有的职能部门
         Router::get('/getAllDepartment', [PublicController::class, 'getAllDepartment']);
         //获取类型