还原上个版本

.gitignore

@@ -20,4 +20,3 @@ runtime/*
 # 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.
-runtime/container/scan.cache

app/Controller/AbstractController.php

@@ -17,9 +17,7 @@ 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
 {
@@ -31,15 +29,6 @@ abstract class AbstractController
 
     #[Inject]
     protected ResponseInterface $response;
-    
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-//    public function __construct(LoggerFactory $loggerFactory)
-//    {
-//        $this->logger =  $loggerFactory->get('admin_consumer:', 'default');
-//        $this->logger->info("项目启动访问一次");
-//    }
+
 
 }

app/Controller/AuthorityController.php

@@ -33,21 +33,9 @@ class AuthorityController extends AbstractController
      */
     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']);
+        $result = $this->authorityServiceClient->getMenuList([]);
+        $result =  PublicData:: buildMenuTree($result['data']);
+        return $result?Result::success($result):Result::error('查询失败');
     }
 
     /**
@@ -56,16 +44,31 @@ class AuthorityController extends AbstractController
      */
     public function delMenu()
     {
-        $id =  (int)$this->request->input("id",0);
-        $data = [
-            'id'=>$id,
+        $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);
+        }
+        $getData = [
+            'id'=>$requireData['id'],
             'page'=>1,
-            'pageSize'=>2
+            'pageSize'=>10
         ];
-        $result = $this->authorityServiceClient->getMenuList($data);
-        if(count($result['data']['rows'])>0){
+        $result = $this->authorityServiceClient->getMenuList($getData);
+
+        if(count($result['data'])>0){
             return Result::error("有子菜单不能删除");
         }
+        $data = ['id'=>$requireData['id']];
         return $this->authorityServiceClient->delMenu($data);
 
     }
@@ -90,17 +93,37 @@ class AuthorityController extends AbstractController
             $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['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
+        $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
+
         $result = $this->authorityServiceClient->addMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
+
+    /**
+     * 查看菜单信息
+     * @return array
+     */
+    public function getMenuInfo()
+    {
+        $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->authorityServiceClient->getMenuInfo($requireData);
+        $result['data']['pid_arr'] = isset($result['data']['pid_arr']) && $result['data']['pid_arr']?json_decode($result['data']['pid_arr']):[];
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
     /**
      * 修改菜单
      * @return array|void
@@ -112,38 +135,19 @@ class AuthorityController extends AbstractController
             $requireData,
             [
                 'id' => 'required',
-//                'pid' => 'required',
                 'label' => 'required',
-//                'url' => 'required',
-
             ],
             [
                 'id.required' => 'id不能为空',
-//                'pid.required' => '父级id不能为空',
                 'label.required' => '菜单名称不能为空',
-//                'url.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);
+        $requireData['pid'] = isset($requireData['pid_arr'])?end($requireData['pid_arr']):'';
+        $requireData['pid_arr'] = isset($requireData['pid_arr'])?json_encode($requireData['pid_arr']):'';
         $result = $this->authorityServiceClient->updateMenu($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
@@ -154,19 +158,23 @@ class AuthorityController extends AbstractController
      */
     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("查询失败");
     }
 
+    /**
+     * 查询所有的菜单
+     * @return array
+     */
+    public function getAllMenuList()
+    {
+        $result =  $this->authorityServiceClient->getAllMenuList([]);
+        $rep = PublicData::buildMenuTree($result['data']);
+        return $rep?Result::success($rep):Result::error("查询失败");
+    }
+
 }

app/Controller/LoginController.php

@@ -1,17 +1,16 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace App\Controller;
-
-use App\JsonRpc\UserServiceInterface;
-use App\Tools\CommonService;
-use App\Tools\PublicData;
-use App\Tools\Result;
-use function Hyperf\Support\env;
+use \Phper666\JWTAuth\JWT;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Annotation\AutoController;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use \Phper666\JWTAuth\JWT;
-
+use App\Tools\Result;
+use App\JsonRpc\UserServiceInterface;
+use App\Tools\CommonService;
+use function Hyperf\Support\env;
+use App\Tools\PublicData;
+use Hyperf\Context\Context;
 /**
  * @AutoController()
  */
@@ -28,62 +27,60 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
-//        $this->logger->info("验证之前");
-
-        $reqData = $this->request->all();
+        $reqData =  $this->request->all();
         $validator = $this->validationFactory->make(
             $reqData,
             [
                 'username' => 'required',
                 'password' => 'required',
-                'type' => 'required',
+                'type'     =>'required'
             ],
             [
                 'username.required' => '用户名不能为空',
                 'password.required' => '密码不能为空',
-                'type.required' => '登录方式必填',
+                'type.required'     => '登录方式必填'
             ]
         );
 
-        if ($validator->fails()) {
+        if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $comm = new CommonService();
         $ip = $comm->userIp();
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);
-        $code = $redis->get('code' . $ip);
-        if (empty($code)) {
+        $code = $redis->get('code'.$ip);
+        if(empty($code)){
             return Result::error("验证码已过期");
         }
-        var_dump("验证码：", $code);
-        if (strtolower($code) != $reqData['captcha']) {
+        var_dump("验证码：",$code);
+        if(strtolower($code)!=$reqData['captcha']){
             return Result::error("验证码错误");
         }
-        //$reqData
         $where = [];
-        if ($reqData['type'] == 1) { //密码登录
+        if($reqData['type'] ==1){//密码登录
             $where = [
-                'user_name' => $reqData['username'],
+                'user_name'=>$reqData['username'],
             ];
         }
 //        $this->logger->info("验证之前");
         $userInfos = $this->userServiceClient->verifyUserInfo($where);
-        if ($userInfos['code'] == 0) {
+        if($userInfos['code']==0){
             return Result::error("用户名或密码错误");
         }
+        var_dump("用户信息：",$userInfos);
 //        $this->logger->info("验证用户返回值：", $userInfos);
-        if (md5(md5($reqData['password']) . $userInfos['data']['salt']) != $userInfos['data']['password']) {
+        if(md5(md5($reqData['password']).$userInfos['data']['salt']) != $userInfos['data']['password']){
             return Result::error("用户名或密码错误");
         }
         $userData = [
             'uid' => $userInfos['data']['id'], // 如果使用单点登录，必须存在配置文件中的sso_key的值，一般设置为用户的id
             'user_name' => $userInfos['data']['user_name'],
-            'role_id' => $userInfos['data']['role_id'],
             'mobile' => $userInfos['data']['mobile'],
             'email' => $userInfos['data']['email'],
             'rong_token' => $userInfos['data']['rong_token'],
             'level_id' => $userInfos['data']['level_id'],
+            'type_id' => $userInfos['data']['type_id'],
         ];
         var_dump($userData);
         // 使用默认场景登录
@@ -101,24 +98,24 @@ class LoginController extends AbstractController
     public function checkVerifyCode(Jwt $jwt)
     {
         //其它信息暂时不管 先以openid
-        $reqData = $this->request->all();
+        $reqData =  $this->request->all();
         $validator = $this->validationFactory->make(
             $reqData,
             [
-                'token' => 'required',
+                'token' => 'required'
             ],
             [
-                'token.required' => 'token不能为空',
+                'token.required' => 'token不能为空'
             ]
         );
-        if ($validator->fails()) {
+        if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $userInfo = $jwt->getClaimsByToken($reqData['token']);
-        if ($userInfo) {
-            return Result::success(['token' => $reqData['token']]);
-        } else {
+        if($userInfo){
+            return Result::success(['token'=>$reqData['token']]);
+        }else{
             return Result::error("token无效");
         }
     }
@@ -129,40 +126,40 @@ class LoginController extends AbstractController
     public function registerOrLogin(Jwt $jwt)
     {
         //获取access_token
-        $reqData = $this->request->all();
+        $reqData =  $this->request->all();
         $validator = $this->validationFactory->make(
             $reqData,
             [
-                'code' => 'required',
+                'code' => 'required'
             ],
             [
-                'code.required' => 'code不能为空',
+                'code.required' => 'code不能为空'
             ]
         );
 
-        if ($validator->fails()) {
+        if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
 
-        $url = env("WECHAT") . "cgi-bin/token?appid=" . env("APPID") . "&secret=" . env("APP_SECRET") . "&grant_type=client_credential";
-        $result = PublicData::http_get($url);
-        $accessTokenData = json_decode($result, true);
+        $url = env("WECHAT")."cgi-bin/token?appid=".env("APPID")."&secret=".env("APP_SECRET")."&grant_type=client_credential";
+        $result =  PublicData::http_get($url);
+        $accessTokenData = json_decode($result,true);
         //获取openid
-        $url = env("WECHAT") . "sns/jscode2session?appid=" . env("APPID") . "&secret=" . env("APP_SECRET") . "&js_code=" . $reqData['loginCode'] . "&grant_type=authorization_code";
-        $result = PublicData::http_get($url);
-        $openInfoData = json_decode($result, true);
-        if (isset($openInfoData['errcode']) && in_array($openInfoData['errcode'], [40163, 40029])) {
-            return Result::error($openInfoData['errmsg']);
+        $url = env("WECHAT")."sns/jscode2session?appid=".env("APPID")."&secret=".env("APP_SECRET")."&js_code=".$reqData['loginCode']."&grant_type=authorization_code";
+        $result =  PublicData::http_get($url);
+        $openInfoData = json_decode($result,true);
+        if(isset($openInfoData['errcode']) && in_array($openInfoData['errcode'],[40163,40029])){
+            return  Result::error($openInfoData['errmsg']);
         }
         $data = [
             'code' => $reqData['code'],
-            'openid' => $openInfoData['openid'],
+            'openid'=>$openInfoData['openid']
         ];
         // 将数组转换为JSON字符串
         $jsonData = json_encode($data);
         // 初始化cURL会话
-        $ch = curl_init(env("WECHAT") . "wxa/business/getuserphonenumber?access_token=" . $accessTokenData['access_token']);
+        $ch = curl_init(env("WECHAT")."wxa/business/getuserphonenumber?access_token=".$accessTokenData['access_token']);
 
         // 设置cURL选项 Todo 这里有一万个wc 封装成post方法就报错，后期再研究
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -170,50 +167,50 @@ class LoginController extends AbstractController
         curl_setopt($ch, CURLOPT_POSTFIELDS, $jsonData);
         curl_setopt($ch, CURLOPT_HTTPHEADER, [
             'Content-Type: application/json',
-            'Content-Length: ' . strlen($jsonData),
+            'Content-Length: ' . strlen($jsonData)
         ]);
         // 执行cURL会话
         $response = curl_exec($ch);
         // 检查是否有错误发生
-        if (curl_errno($ch)) {
-            return Result::error("获取手机号失败");
+        if(curl_errno($ch)){
+            return  Result::error("获取手机号失败");
         }
         // 关闭cURL会话
         curl_close($ch);
-        $response = json_decode($response, true);
-        if ($response['errcode'] == '40029') {
-            return Result::error($openInfoData['errmsg']);
+        $response = json_decode($response,true);
+        if($response['errcode']=='40029'){
+            return  Result::error($openInfoData['errmsg']);
         }
-        // 打印响应内容
-        var_dump($openInfoData, $response);
+       // 打印响应内容
+        var_dump($openInfoData,$response);
         //根据openid 获取token
 
         $checkUserInfo = $this->userServiceClient->verifyUserInfo([
-            'user_name' => $response['phone_info']['purePhoneNumber'],
+            'user_name'=>$response['phone_info']['purePhoneNumber']
         ]);
-        if ($checkUserInfo['code'] == 0) {
+        if($checkUserInfo['code']==0){
             $salt = rand(1, 999999);
             $createUserData = [
-                'user_name' => $response['phone_info']['purePhoneNumber'],
+                'user_name'=>$response['phone_info']['purePhoneNumber'],
                 'salt' => $salt,
-                'password' => $openInfoData['openid'],
+                'password'=>$openInfoData['openid']
             ];
-            $checkUserInfo = $this->userServiceClient->createUser($createUserData);
+            $checkUserInfo =  $this->userServiceClient->createUser($createUserData);
         }
         //根据openid和手机号判断是否注册，未注册直接注册
         $wechatReqData = [
-            'openid' => $openInfoData['openid'],
-            'purePhoneNumber' => $response['phone_info']['purePhoneNumber'],
+            'openid'=>$openInfoData['openid'],
+            'purePhoneNumber'=>$response['phone_info']['purePhoneNumber']
         ];
         $wechatInfo = $this->userServiceClient->getWechatInfo($wechatReqData);
-        if ($wechatInfo['code'] == 0) {
+        if($wechatInfo['code']==0){
             $wechatData = [
-                'openid' => $openInfoData['openid'],
-                'phoneNumber' => $response['phone_info']['phoneNumber'],
-                'purePhoneNumber' => $response['phone_info']['purePhoneNumber'],
-                'countryCode' => $response['phone_info']['countryCode'],
-                'watermark' => json_encode($response['phone_info']['watermark']),
-                'user_id' => $checkUserInfo['data']['id'],
+                'openid'=>$openInfoData['openid'],
+                'phoneNumber'=>$response['phone_info']['phoneNumber'],
+                'purePhoneNumber'=>$response['phone_info']['purePhoneNumber'],
+                'countryCode'=>$response['phone_info']['countryCode'],
+                'watermark'=>json_encode($response['phone_info']['watermark']),
+                'user_id'=>$checkUserInfo['data']['id']
             ];
             $this->userServiceClient->addWechatInfo($wechatData);
         }
@@ -243,8 +240,8 @@ class LoginController extends AbstractController
         $h = $this->request->getHeaders();
 //        var_dump($this->request->getHeaders());
 //        $a= 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjMyLCJ1c2VyX25hbWUiOiIxIiwicm9sZV9pZCI6MSwibW9iaWxlIjoiMTU4MDEyNDU3NTUiLCJlbWFpbCI6IjVAcXEuY29tIiwicm9uZ190b2tlbiI6IiIsImxldmVsX2lkIjo4LCJqd3Rfc2NlbmUiOiJkZWZhdWx0IiwianRpIjoiZGVmYXVsdF82Njc1MjJkZDQ3YWYxMi41MTE5MjI5MiIsImlhdCI6MTcxODk1MjY2OSwibmJmIjoxNzE4OTUyNjY5LCJleHAiOjE3MjE1NDQ2Njl9.e0JW8fgNrwBdFgmQ8GNtES2ME1SbcbIih5MsQWzT6sk';
-        $arr = $jwt->getClaimsByToken($h['token'][0]);
-        var_dump($h['token'][0], "+++++++++++", $arr, "===####");
+        $arr =  $jwt->getClaimsByToken($h['token'][0]);
+        var_dump($h['token'][0],"+++++++++++",$arr,"===####");
         return $this->response->json(['code' => 0, 'msg' => 'success', 'data' => ['a' => 1]]);
     }
-}
+}

app/Controller/NewsController.php

@@ -58,14 +58,27 @@ class NewsController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 分类列表
+     * 站点下的导航池
      * @return void
      */
     public function categoryList()
     {
-        $requireData['website_id'] = $this->websiteId;
+        $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);
+        }
+        $requireData['website_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->categoryList($requireData);
-        var_dump($result);
         $rep = PublicData::buildMenuTree($result['data']);
         return $result ? Result::success($rep) : Result::error($result['message']);
     }
@@ -183,7 +196,25 @@ class NewsController extends AbstractController
     public function getArticleList()
     {
         $requireData = $this->request->all();
-        $requireData['website_id'] = $this->websiteId;
+
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page'=> 'required',
+                'pageSize'=> 'required',
+
+            ],
+            [
+                'page.required' => 'id不能为空',
+                'pageSize.required' => 'id不能为空',
+
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] = Context::get("SiteId");
         var_dump("资讯：",$requireData);
         $result = $this->newsServiceClient->getArticleList($requireData);
         //1通过，2待审核，3待发 4,拒绝 5删除
@@ -202,7 +233,11 @@ class NewsController extends AbstractController
                 $result['data']['rows'][$k]['level'] = (string)$v['level'];
                 $result['data']['rows'][$k]['islink'] = isset($v['islink']) && $v['islink']>0?true:false;
             }
+
         }
+
+        $result = $this->newsServiceClient->getArticleList($requireData);
+
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -243,13 +278,13 @@ class NewsController extends AbstractController
             $requireData,
             [
                 'title'=> 'required',
-                'catid'=> 'required',
+                'cat_arr_id'=> 'required',
                 'author'=> 'required',
 
             ],
             [
                 'title.required' => '标题不能为空',
-                'catid.required' => '分类不能为空',
+                'cat_arr_id.required' => '导航池ID不能为空',
                 'author.required' => '作者不能为空',
             ]
         );
@@ -257,24 +292,27 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['catid']) && is_array($requireData['catid'])){
-            $requireData['cat_arr_id'] = json_encode($requireData['catid']);
-            $requireData['catid'] = end($requireData['catid']);
-        }else{
-            $id = [0];
-            $requireData['cat_arr_id'] = json_encode($id);
-            $requireData['catid'] = end($id);
-        }
+        $requireData['catid'] = isset($requireData['cat_arr_id'])?end($requireData['cat_arr_id']):'';
+        $requireData['cat_arr_id'] = isset($requireData['cat_arr_id'])?json_encode($requireData['cat_arr_id']):'';
+
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
         $requireData['admin_user_id'] =Context::get("UserId");
+        $requireData['level'] = isset($requireData['level']) &&  $requireData['level']?$requireData['level']:0;
+        $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits']?$requireData['hits']:0;
+        $requireData['is_original'] = isset($requireData['is_original']) &&  $requireData['is_original']?$requireData['is_original']:0;
+        $requireData['status'] = isset($requireData['status']) &&  $requireData['status']?$requireData['status']:0;
+//        var_dump("入参：",$requireData);
         $result = $this->newsServiceClient->addArticle($requireData);
 
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
-
+    /**
+     * 更新资讯
+     * @return array
+     */
     public function updateArticle()
     {
         $requireData = $this->request->all();
@@ -282,10 +320,14 @@ class NewsController extends AbstractController
             $requireData,
             [
                 'id'=>'required',
-                'name'=> 'required',
+                'title'=> 'required',
+                'cat_arr_id'=> 'required',
+                'author'=> 'required',
             ],
             [
-                'name.required' => '分类名称不能为空',
+                'title.required' => '标题不能为空',
+                'cat_arr_id.required' => '导航池ID不能为空',
+                'author.required' => '作者不能为空',
                 'id.required' =>'ID不能为空'
             ]
         );
@@ -293,18 +335,38 @@ class NewsController extends AbstractController
             $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['catid'] = isset($requireData['cat_arr_id'])?end($requireData['cat_arr_id']):'';
+        $requireData['cat_arr_id'] = isset($requireData['cat_arr_id'])?json_encode($requireData['cat_arr_id']):'';
+
         $result = $this->newsServiceClient->updateArticle($requireData);
         return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
     }
+
+    /**
+     * 更新资讯状态
+     * @return array
+     */
+    public function upArticleStatus()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'status'=> 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'status.required' => '状态不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->newsServiceClient->upArticleStatus($requireData);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
+    }
     /**
      * 删除分类
      * @return array
@@ -326,7 +388,8 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['website_id'] = Context::get("SiteId");
+
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -353,7 +416,7 @@ class NewsController extends AbstractController
         }
 
         $result = $this->newsServiceClient->getArticleInfo($requireData);
-        var_dump($result);
+        $result['data']['cat_arr_id'] =  $result['data']['cat_arr_id']?json_decode($result['data']['cat_arr_id']):[];
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 

app/Controller/PublicController.php

@@ -188,7 +188,7 @@ class PublicController extends AbstractController
                 'name.required' => '姓名不能为空',
                 'mobile.required' => '手机号码不能为空',
                 'describe.required' => '详细说明不能为空',
-                'type_level.required' => '详细说明不能为空',
+                'type_level.required' => '类型进度不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -579,8 +579,10 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        echo 123;
         $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->upZhinengbumen($requireData);
+        $result = $this->publicServiceClient->modZhinengbumen($requireData);
+        echo 4;
         return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
     }
 }

app/Controller/UserController.php

@@ -162,6 +162,33 @@ class UserController extends AbstractController
         return Result::success($result['data']);
     }
 
+    /**
+     * 查看角色信息
+     * @return array
+     */
+    public function roleInfo()
+    {
+        $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->userServiceClient->roleInfo($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }
+        $result['data']['rule'] = isset($result['data']['rule'])?json_decode($result['data']['rule']):[];
+        return Result::success($result['data']);
+    }
     /**
      * 验证用户是否存在
      * @return void
@@ -204,17 +231,22 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'role_name' => 'required'
+                'role_name' => 'required',
+                'rule' => 'required',
+                'remark' => 'required',
             ],
             [
-                'role_name.required' => '角色名称不能为空'
+                'role_name.required' => '角色名称不能为空',
+                'rule.required' => '权限不能为空',
+                'remark.required' => '职能描述不能为空',
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
+        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule']?json_encode($requireData['rule']):[];
         $result =  $this->userServiceClient->addRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -261,19 +293,23 @@ class UserController extends AbstractController
             $requireData,
             [
                 'role_name' => 'required',
+                'rule' => 'required',
+                'remark' => 'required',
                 'id' => 'required'
             ],
             [
                 'id.required' => '角色ID不能为空',
-                'role_name.required' => '角色名称不能为空'
+                'role_name.required' => '角色名称不能为空',
+                'rule.required' => '权限不能为空',
+                'remark.required' => '职能描述不能为空',
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
-        $requireData['rule'] = $requireData['rule']?json_encode($requireData['rule']):[];
+        $requireData['user_id'] = Context::get("UserId");
+        $requireData['rule'] = isset($requireData['rule']) && $requireData['rule']?json_encode($requireData['rule']):[];
         $result =  $this->userServiceClient->updateRole($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);

app/Controller/WebController.php

@@ -1,16 +1,15 @@
 <?php
-declare(strict_types=1);
+declare (strict_types = 1);
 namespace App\Controller;
 
+use App\Constants\ErrorCode;
 use App\JsonRpc\NewsServiceInterface;
 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 App\Constants\ErrorCode;
 use Hyperf\Context\Context;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+
 /**
  * Class WebController
  * @package App\Controller
@@ -19,7 +18,7 @@ class WebController extends AbstractController
 {
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
-
+    private $publicServiceClient;
     /**
      * @var NewsServiceInterface
      */
@@ -31,25 +30,25 @@ class WebController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
- 
+
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
- 
+
+        $requireData = $this->request->all();
         $data = [
-            'website_id'=>Context::get("SiteId")
+            'website_id' => Context::get("SiteId"),
+            'pageSize' => $requireData['pageSize'],
         ];
-        var_dump("网站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,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
 
- 
-
-}
+}

app/Controller/WebsiteController.php

@@ -9,6 +9,8 @@ use Hyperf\HttpServer\Annotation\AutoController;
 use App\Tools\Result;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Context\Context;
+use Phper666\JWTAuth\JWT;
+use DateTime;
 /**
  * Class WebsiteController
  * @package App\Controller
@@ -25,6 +27,11 @@ class WebsiteController extends AbstractController
     #[Inject]
     private $websiteServiceClient;
 
+    protected JWT $JWT;
+    public function __construct(Jwt $JWT)
+    {
+        $this->JWT = $JWT;
+    }
     /**
      * 创建站点
      * @return array
@@ -86,6 +93,7 @@ class WebsiteController extends AbstractController
         if($result['data']){
             foreach ($result['data']['rows'] as $k=>$v) {
                 $result['data']['rows'][$k]['city_arr_id'] = $v['city_arr_id']?json_decode($v['city_arr_id']):'';
+                $result['data']['rows'][$k]['website_url'] = $v['website_url']?json_decode($v['website_url']):[];
             }
         }
 
@@ -185,25 +193,40 @@ class WebsiteController extends AbstractController
 
     }
 
+    /**
+     * 添加的时候 选择上级网系
+     * @return array
+     */
     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);
+        $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->getWebsiteColumnList($requireData);
         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];
@@ -212,7 +235,7 @@ class WebsiteController extends AbstractController
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
     /**
-     * 创建栏目
+     * 创建网系
      * @return array
      */
     public function addWebsiteColumn()
@@ -222,32 +245,24 @@ class WebsiteController extends AbstractController
             $requireData,
             [
                 'column_name' => 'required',
-                'column_arr_id' => 'required'
             ],
             [
-                'column_name.required' => '栏目名称不能为空',
-                'column_arr_id.required' => '栏目ID不能为空'
+                'column_name.required' => '网系名称不能为空',
             ]
         );
         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);
-        }
+        $requireData['pid'] = isset($requireData['column_arr_id'])?end($requireData['column_arr_id']):'';
+        $requireData['column_arr_id'] = isset($requireData['column_arr_id'])?json_encode($requireData['column_arr_id']):'';
         $result = $this->websiteServiceClient->createWebsiteColumn($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
-     * 创建栏目
+     * 更新网系
      * @return array
      */
     public function updateWebsiteColumn()
@@ -257,38 +272,42 @@ class WebsiteController extends AbstractController
             $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);
-        }
+        $requireData['pid'] = isset($requireData['column_arr_id'])?end($requireData['column_arr_id']):'';
+        $requireData['column_arr_id'] = isset($requireData['column_arr_id'])?json_encode($requireData['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);
+        $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->websiteServiceClient->delWebsiteColumn(intval($requireData['id']));
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -397,7 +416,6 @@ class WebsiteController extends AbstractController
     public function createWebsiteRoleUser()
     {
         $requireData = $this->request->all();
-
         $validator = $this->validationFactory->make(
             $requireData,
             [
@@ -442,16 +460,315 @@ class WebsiteController extends AbstractController
      */
     public function addWebsiteCategory()
     {
-        return [];
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'category_arr_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'category_arr_id.required' => '网站导航ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->addWebsiteCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 删除网站导航
+     * @return void
+     */
+    public function delWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'category_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'category_id.required' => '网站导航ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delWebsiteCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 获取网站导航
+     * @return void
+     */
+    public function getAdminWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getAdminWebsiteCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 更新网站导航
+     * @return void
+     */
+    public function upWebsiteCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upWebsiteCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 获取网站与导航
+     * @return array
+     */
+    public function getWebsiteCategoryList()
+    {
+        $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->getWebsiteCategoryList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 删除网站下面的所有导航
+     * @return void
+     */
+    public function delWebsiteAllCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required'
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->delWebsiteAllCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 查看指定的导航
+     * @return array
+     */
+    public function getWebsiteCategoryOnes()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'category_id' => 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'category_id.required' => '网站导航ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteCategoryOnes($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 更新指定的某一个导航
+     * @return array
+     */
+    public function upWebsiteCategoryones()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required',
+                'category_id'=> 'required',
+                'alias'=> 'required',
+                'seo_title'=> 'required',
+                'seo_keywords'=> 'required',
+                'seo_description'=> 'required',
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+                'category_id.required' => '导航ID不能为空',
+                'alias.required' => '名称不能为空',
+                'seo_title.required' => 'seo标题不能为空',
+                'seo_keywords.required' => '关键词不能为空',
+                'seo_description.required' => '网站描述不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upWebsiteCategoryones($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 站下的所有导航包含子导航
+     * @return array
+     */
+    public function getWebsiteAllCategory()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required'
+            ],
+            [
+                'website_id.required' => '网站ID不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->getWebsiteAllCategory($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
     /**
      * 管理后台首页统计
      * @return array
      */
     public function getAdminIndex()
     {
-        return [];
+//        $token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJwaHBlcjY2Ni9qd3QiLCJ1aWQiOjMyLCJ1c2VyX25hbWUiOiIxIiwibW9iaWxlIjoiMTU4MDEyNDU3NTUiLCJlbWFpbCI6IjVAcXEuY29tIiwicm9uZ190b2tlbiI6IiIsImxldmVsX2lkIjoxLCJ0eXBlX2lkIjoxLCJqd3Rfc2NlbmUiOiJkZWZhdWx0IiwianRpIjoiZGVmYXVsdF82NzFiNDc3MDcwODI2OC4wOTk4ODA3NyIsImlhdCI6MTcyOTg0MTAwOCwibmJmIjoxNzI5ODQxMDA4LCJleHAiOjE3Mjk4NDQwMDh9.4X-Q-vwPxddX75q6CKtOXqWgtnFAikRwX308T0iDxYE";
+//        $time =  $this->JWT->getTokenDynamicCacheTime($token);
+//        var_dump("有效时间：",$time);
+
+        $typeId = intval(Context::get("TypeId"));
+        var_dump("用户类型：",$typeId);
+        switch ($typeId){
+            case 1:
+                $dates = [];
+                $startDate = (new DateTime())->modify('-29 day'); // 从 29 天前开始（因为我们要 30 天，包括今天的前一天）
+                for ($i = 0; $i < 30; $i++) {
+                    $dates[] = $startDate->format('Y-m-d');
+                    $startDate->modify('+1 day'); // 每天递增一天
+                }
+                $result = $this->websiteServiceClient->getAdminIndex(['type_id'=>$typeId]);
+                $list = [];
+                if($result['data']){
+
+                    $list = PublicData::arrayColumnAsKey($result['data'],'date');
+                    var_dump($list);
+                }
+                $newResult = [];
+                if($dates){
+                    foreach ($dates as $key=>$val){
+                        $newResult[$key]['date'] = $val;
+                        $newResult[$key]['total_count'] = $list[$val]['total_count']??0;
+                    }
+                }
+                //投诉举报列表
+                $res['letterOfComplaintList'] = $newResult;
+                return $result['code']==200?Result::success($res):Result::error($result['message']);
+                break;
+            case 10000:
+
+                $result = $this->websiteServiceClient->getAdminIndex(['type_id'=>$typeId]);
+                if($result){
+                    $dates = [];
+                    $startDate = (new DateTime())->modify('-29 day'); // 从 29 天前开始（因为我们要 30 天，包括今天的前一天）
+                    for ($i = 0; $i < 30; $i++) {
+                        $dates[] = $startDate->format('Y-m-d');
+                        $startDate->modify('+1 day'); // 每天递增一天
+                    }
+                    $list = [];
+                    if($result['data']['monthArticle']){
+                        $list = PublicData::arrayColumnAsKey($result['data']['monthArticle'],'date');
+                    }
+                    $newResult = [];
+                    if($dates){
+                        foreach ($dates as $key=>$val){
+                            $newResult[$key]['date'] = $val;
+                            $newResult[$key]['total_count'] = $list[$val]['total_count']??0;
+                        }
+                    }
+                    //1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员
+                    $userType=[
+                        '1'=>'个人会员',
+                        '2'=>'政务会员',
+                        '3'=>'企业会员',
+                        '4'=>'调研员',
+                        '10000'=>'管理员',
+                    ];
+                    if($result['data']['userType']){
+                        foreach ($result['data']['userType'] as $k=>$v){
+                            $result['data']['userType'][$k]['typeName'] = $userType[$v['type_id']];
+                        }
+                    }
+                    $result['data']['monthArticle'] = $newResult;
+                    return Result::success($result['data']);
+
+                }else{
+                    return Result::error($result['message']);
+                }
+
+                return Result::success($result);
+                break;
+        }
     }
 
     /**
@@ -460,7 +777,8 @@ class WebsiteController extends AbstractController
      */
     public function getTemplateClass()
     {
-        $result = $this->websiteServiceClient->getTemplateClass([]);
+        $requireData = $this->request->all();
+        $result = $this->websiteServiceClient->getTemplateClass($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -560,13 +878,13 @@ class WebsiteController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'template_class_id' => 'required',
+//                'template_class_id' => 'required',
                 'page' => 'required',
                 'pageSize' => 'required',
 
             ],
             [
-                'template_class_id.required' => '类型template_class_id不能为空',
+//                'template_class_id.required' => '类型template_class_id不能为空',
                 'page.required' => 'page不能为空',
                 'pageSize.required' => '每页显示条数不能为空',
             ]
@@ -581,6 +899,12 @@ class WebsiteController extends AbstractController
             'pageSize' =>  $requireData['pageSize'],
         ];
         $result = $this->websiteServiceClient->getTemplate($data);
+        var_dump("模板列表：",$result['data']['rows']);
+        if($result['data']['rows']){
+            foreach ($result['data']['rows'] as $key=>$val){
+                $result['data']['rows'][$key]['template_img'] = json_decode($val['template_img'],true);
+            }
+        }
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -684,6 +1008,17 @@ class WebsiteController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 搜索网站
+     * @return array
+     */
+    public function websiteList()
+    {
+        $requireData = $this->request->all();
+        $result = $this->websiteServiceClient->websiteList($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
 
 
 }

app/JsonRpc/AuthorityService.php

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

app/JsonRpc/AuthorityServiceInterface.php

@@ -44,4 +44,10 @@ interface AuthorityServiceInterface
      * @return array
      */
     public function getRecursionMenu(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAllMenuList(array $data);
 }

app/JsonRpc/NewsService.php

@@ -116,4 +116,32 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * 更新资讯状态
+     * @param array $data
+     * @return mixed
+     */
+    public function upArticleStatus(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+     /*
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticlett(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteModelArticles(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    
+
 }

app/JsonRpc/NewsServiceInterface.php

@@ -58,5 +58,21 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getCategoryInfo(array $data);
+    /**
+     * @param array $data
+     *
+     */
+    public function getWebsiteArticlett(array $data);
+
+    /**
+     * @param array $data
+     */
+    public function getWebsiteModelArticles(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upArticleStatus(array $data);
 
 }

app/JsonRpc/PublicRpcService.php

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

app/JsonRpc/PublicRpcServiceInterface.php

@@ -128,5 +128,11 @@ interface PublicRpcServiceInterface
      * @return mixed
      */
     public function delZhinengbumen(array $data);
+    
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function modZhinengbumen(array $data);
 
 }

app/JsonRpc/WebsiteService.php

@@ -82,9 +82,10 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      * @param int $pageSize
      * @return mixed
      */
-    public function getWebsiteColumnList(string $keyword, int $page, int $pageSize)
+    public function getWebsiteColumnList(array $data)
     {
-        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
+//        return $this->__request(__FUNCTION__, compact('keyword','page','pageSize'));
+        return $this->__request(__FUNCTION__, $data);
     }
 
     /**
@@ -208,6 +209,55 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getWebsiteAdvertisement(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+     /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function selectWebsiteDepartment(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArea(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteModelCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteLinks(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+
+
+
+
+
+
 
     /**
      * @param array $data
@@ -289,4 +339,95 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function websiteList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWebsiteAllCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCategoryOnes(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteCategoryones(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAllCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAdminWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteCategory(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCategoryList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -46,7 +46,7 @@ interface WebsiteServiceInterface
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteColumnList(string $keyword,int $page,int $pageSize);
+    public function getWebsiteColumnList(array $data);
 
     /**
      * @param array $data
@@ -130,6 +130,55 @@ interface WebsiteServiceInterface
      *
      */
     public function getWebsiteCategory(array $data);
+     
+
+
+
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteAdvertisement(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteDepartment(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteArea(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function getWebsiteModelCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     *
+     */
+    public function selectWebsiteLinks(array $data);
+
+
+
+
+
+
+
+
+
+
+
+
 
     /**
      * @param array $data
@@ -184,4 +233,64 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function delTemplate(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function websiteList(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWebsiteCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAdminWebsiteCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCategoryList(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delWebsiteAllCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteCategoryOnes(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteCategoryones(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAllCategory(array $data);
 }

app/Middleware/Auth/FooMiddleware.php

@@ -36,14 +36,22 @@ class FooMiddleware implements MiddlewareInterface
     {
 
         $header = $request->getHeaders();
-//        if($this->request->getUri()->getPath()=="/api/login" || $this->request->getUri()->getPath()=="/verifyCode" || $this->request->getUri()->getPath()=="/index"){
-//            return $handler->handle($request);
-//        }
         try {
             if($header &&  isset($header['token']) && $header['token'][0]!='null' && isset($header['token'][0])){
                 $ver = $this->JWT->getClaimsByToken($header['token'][0]);
+                $tokenTime =  $this->JWT->getTokenDynamicCacheTime($header['token'][0]);
+                if($tokenTime==0){
+                   return $this->response->json(
+                       [
+                           'code' => -1,
+                           'data' => [],
+                           'message' => 'token无效,请重新登录',
+                       ]
+                   );
+                }
 //                var_dump("中间件：",$ver);
                 Context::set("UserId",$ver['uid']);
+                Context::set("TypeId",$ver['type_id']);
                 if ($ver) {
                     return $handler->handle($request);
                 }

app/Middleware/Auth/WebMiddleware.php

@@ -43,13 +43,21 @@ class WebMiddleware implements MiddlewareInterface
         $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);
+                if(!isset($result['data']['id']) || !$result['data']['id']){
+                    return $this->response->json(
+                        [
+                            'code' => -1,
+                            'data' => [],
+                            'message' => '网站不存在',
+                        ]
+                    );
+                }
                 var_dump("获取站点id：",$result);
                 Context::set("SiteId",$result['data']['id']);
                 if ($result) {
@@ -71,7 +79,7 @@ class WebMiddleware implements MiddlewareInterface
                 [
                     'code' => $e->getCode(),
                     'data' => [],
-                    'message' => $e->getMessage(),
+                    'message' => '网址必填：'.$e->getMessage(),
                 ]
             );
         }

app/Tools/CommonService.php

@@ -16,17 +16,6 @@ class CommonService
     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('文件名后缀不允许');
         }

app/Tools/PublicData.php

@@ -28,6 +28,25 @@ class PublicData
         return $tree;
     }
 
+    /**
+     * 把数组里面的某一个字段作为key
+     * @param $array
+     * @param $column
+     * @return array
+     */
+    public static  function arrayColumnAsKey($array, $column) {
+        $result = [];
+        foreach ($array as $item) {
+            if (isset($item[$column])) {
+                $result[$item[$column]] = $item;
+            } else {
+                // 如果字段不存在，你可以选择跳过、使用默认值或抛出异常
+                // 这里我们选择跳过
+                continue;
+            }
+        }
+        return $result;
+    }
     /**
      * 计算两个时间差的天数
      * @param $sTime

composer.json

@@ -33,6 +33,7 @@
         "hyperf/logger": "^3.1",
         "hyperf/memory": "~3.1.0",
         "hyperf/nacos": "^3.1",
+        "hyperf/paginator": "^3.1",
         "hyperf/process": "~3.1.0",
         "hyperf/redis": "~3.1.0",
         "hyperf/rpc-client": "^3.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e71f383836139c57d31eb8084467a897",
+    "content-hash": "d5f7fd6fcee090d2a5947dfb2b5bd447",
     "packages": [
         {
             "name": "carbonphp/carbon-doctrine-types",
@@ -3501,6 +3501,74 @@
             ],
             "time": "2024-03-23T11:28:51+00:00"
         },
+        {
+            "name": "hyperf/paginator",
+            "version": "v3.1.42",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hyperf/paginator.git",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hyperf/paginator/zipball/b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "reference": "b637a3deeee69f4a3e5a6d62ab8214244b98412a",
+                "shasum": ""
+            },
+            "require": {
+                "hyperf/contract": "~3.1.0",
+                "hyperf/support": "~3.1.0",
+                "hyperf/utils": "~3.1.0",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "hyperf/event": "Reqiured to use PageResolverListener.",
+                "hyperf/framework": "Reqiured to use PageResolverListener.",
+                "hyperf/http-server": "Reqiured to use PageResolverListener."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                },
+                "hyperf": {
+                    "config": "Hyperf\\Paginator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hyperf\\Paginator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A paginator component for hyperf.",
+            "homepage": "https://hyperf.io",
+            "keywords": [
+                "hyperf",
+                "paginator",
+                "php"
+            ],
+            "support": {
+                "docs": "https://hyperf.wiki",
+                "issues": "https://github.com/hyperf/hyperf/issues",
+                "pull-request": "https://github.com/hyperf/hyperf/pulls",
+                "source": "https://github.com/hyperf/hyperf"
+            },
+            "funding": [
+                {
+                    "url": "https://hyperf.wiki/#/zh-cn/donate",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://opencollective.com/hyperf",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-09-25T02:54:12+00:00"
+        },
         {
             "name": "hyperf/pipeline",
             "version": "v3.1.15",

config/api/authority.php

@@ -7,11 +7,20 @@ use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
 Router::addGroup(
     '/authority', function () {
+        //获取菜单列表
         Router::get('/getMenuList', [AuthorityController::class, 'getMenuList']);
+        //删除菜单
         Router::post('/delMenu', [AuthorityController::class, 'delMenu']);
+        //添加菜单
         Router::post('/addMenu', [AuthorityController::class, 'addMenu']);
+        //获取菜单信息
+        Router::get('/getMenuInfo', [AuthorityController::class, 'getMenuInfo']);
+        //更新菜单
         Router::post('/updateMenu', [AuthorityController::class, 'updateMenu']);
+        //用户拥有的菜单
         Router::get('/getRecursionMenu', [AuthorityController::class, 'getRecursionMenu']);
+        //获取所有菜单列表
+        Router::get('/getAllMenuList', [AuthorityController::class, 'getAllMenuList']);
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/news.php

@@ -9,6 +9,7 @@ Router::addGroup(
     '/news', function () {
         //获取导航池列表
         Router::get('/getCategoryList', [NewsController::class, 'getCategoryList']);
+        //导航池 筛选 搜索
         Router::get('/categoryList', [NewsController::class, 'categoryList']);
         //添加导航池
         Router::post('/addCategory', [NewsController::class, 'addCategory']);
@@ -16,11 +17,17 @@ Router::addGroup(
         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::post('/upArticleStatus', [NewsController::class, 'upArticleStatus']);
+        //查看资讯
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);

config/api/public.php

@@ -16,13 +16,23 @@ Router::addGroup(
         Router::post('/delUserLevel', [PublicController::class, 'delUserLevel']);
         Router::post('/updateUserLevel', [PublicController::class, 'updateUserLevel']);
         Router::get('/getCityList', [PublicController::class, 'getCityList']);
+        //添加投诉举报
         Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
-        Router::post('/upComplaint', [PublicController::class, 'upComplaint']);
+
+        //修改投诉举报
+        Router::addRoute(['GET', 'POST'], '/upComplaint', [PublicController::class, 'upComplaint']);
+        //投诉举报列表
         Router::addRoute(['GET', 'POST'], '/getComplaint', [PublicController::class, 'getComplaint']);
+        //查看投诉举报信息
         Router::addRoute(['GET', 'POST'], '/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+        //删除投诉举报信息
+
         Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
+        //获取类型
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
+        //下载文件
         Router::post('/downloadFile', [PublicController::class, 'downloadFile']);
+        //检测是否已经被审核
         Router::post('/checkMeasure', [PublicController::class, 'checkMeasure']);
         //获取职能部门
         Router::get('/getDepartment', [PublicController::class, 'getDepartment']);

config/api/user.php

@@ -13,9 +13,15 @@ Router::addGroup(
         Router::get('/getUserList', [UserController::class, 'getUserList']);
         Router::post('/delUser', [UserController::class, 'delUser']);
         Router::post('/verifyUserInfo', [UserController::class, 'verifyUserInfo']);
+        //角色列表
         Router::get('/roleList', [UserController::class, 'roleList']);
+        //查看角色
+        Router::get('/roleInfo', [UserController::class, 'roleInfo']);
+        //添加角色
         Router::post('/addRole', [UserController::class, 'addRole']);
+        //删除角色
         Router::post('/delRole', [UserController::class, 'delRole']);
+        //更新角色
         Router::post('/updateRole', [UserController::class, 'updateRole']);
         Router::post('/changePassword', [UserController::class, 'changePassword']);
     },

config/api/web.php

@@ -7,8 +7,19 @@ 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']);
+                Router::get('/getWebsiteDistrit', [WebController::class, 'getWebsiteDistrit']);
+                Router::get('/getWebsiteAdvertisement', [WebController::class, 'getWebsiteAdvertisement']);
+                Router::get('/selectWebsiteDepartment', [WebController::class, 'selectWebsiteDepartment']);
+                Router::get('/selectWebsiteArea', [WebController::class, 'selectWebsiteArea']);
+
+                Router::get('/getWebsiteArticlett', [WebController::class, 'getWebsiteArticlett']);
+                Router::get('/getWebsiteModelArticles', [WebController::class, 'getWebsiteModelArticles']);
+                Router::get('/getWebsiteModelCategory', [WebController::class, 'getWebsiteModelCategory']);
+                Router::get('/getWebsiteArticlesList', [WebController::class, 'getWebsiteArticlesList']);
+                Router::get('/selectWebsiteArticleInfo', [WebController::class, 'selectWebsiteArticleInfo']);
+                Router::get('/selectWebsiteLinks', [WebController::class, 'selectWebsiteLinks']);
             },
     ['middleware' => [WebMiddleware::class]]
 );

config/api/website.php

@@ -17,15 +17,15 @@ Router::addGroup(
         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']);
@@ -34,17 +34,47 @@ Router::addGroup(
         Router::get('/getWebsiteRoleUserList', [WebsiteController::class, 'getWebsiteRoleUserList']);
         Router::post('/createWebsiteRoleUser', [WebsiteController::class, 'createWebsiteRoleUser']);
         Router::post('/delWebsiteRoleUser', [WebsiteController::class, 'delWebsiteRoleUser']);
-
-        Router::get('/getTemplateClass', [WebsiteController::class, 'getTemplateClass']); //获取模板分类
-        Router::post('/addTemplateClass', [WebsiteController::class, 'addTemplateClass']); //添加模板分类
-        Router::post('/upTemplateClass', [WebsiteController::class, 'upTemplateClass']); //更新模板分类
-        Router::post('/delTemplateClass', [WebsiteController::class, 'delTemplateClass']); //删除模板分类
-        Router::get('/getTemplate', [WebsiteController::class, 'getTemplate']); //获取分类下模板列表
-        Router::post('/addTemplate', [WebsiteController::class, 'addTemplate']); //获取分类下模板列表
-        Router::post('/upTemplate', [WebsiteController::class, 'upTemplate']); //更新分类下模板列表
-        Router::post('/delTemplate', [WebsiteController::class, 'delTemplate']); //删除分类下模板列表
+        //获取模板分类
+        Router::get('/getTemplateClass', [WebsiteController::class, 'getTemplateClass']);
+        //添加模板分类
+        Router::post('/addTemplateClass', [WebsiteController::class, 'addTemplateClass']);
+        //更新模板分类
+        Router::post('/upTemplateClass', [WebsiteController::class, 'upTemplateClass']);
+        //删除模板分类
+        Router::post('/delTemplateClass', [WebsiteController::class, 'delTemplateClass']);
+        //获取分类下模板列表
+        Router::get('/getTemplate', [WebsiteController::class, 'getTemplate']);
+        //获取分类下模板列表
+        Router::post('/addTemplate', [WebsiteController::class, 'addTemplate']);
+        //更新分类下模板列表
+        Router::post('/upTemplate', [WebsiteController::class, 'upTemplate']);
+        //删除分类下模板列表
+        Router::post('/delTemplate', [WebsiteController::class, 'delTemplate']);
         //添加网站导航
         Router::post('/addWebsiteCategory', [WebsiteController::class, 'addWebsiteCategory']);
+        //删除网站导航
+        Router::post('/delWebsiteCategory', [WebsiteController::class, 'delWebsiteCategory']);
+        //获取网站导航
+        Router::get('/getAdminWebsiteCategory', [WebsiteController::class, 'getAdminWebsiteCategory']);
+        //更新网站导航
+        Router::post('/upWebsiteCategory', [WebsiteController::class, 'upWebsiteCategory']);
+        //网站导航
+        Router::get('/getWebsiteCategoryList', [WebsiteController::class, 'getWebsiteCategoryList']);
+        //删除网站所有的导航
+        Router::post('/delWebsiteAllCategory', [WebsiteController::class, 'delWebsiteAllCategory']);
+        //查看指定的导航
+        Router::get('/getWebsiteCategoryOnes', [WebsiteController::class, 'getWebsiteCategoryOnes']);
+        //更新指定的某一个导航
+        Router::post('/upWebsiteCategoryones', [WebsiteController::class, 'upWebsiteCategoryones']);
+        //网站下的所有导航包含子导航
+        Router::get('/getWebsiteAllCategory', [WebsiteController::class, 'getWebsiteAllCategory']);
+        //管理后台数据统计
+        Router::get('/getAdminIndex', [WebsiteController::class, 'getAdminIndex']);
+
+
+
+        //搜索网站列表
+        Router::get('/websiteList', [WebsiteController::class, 'websiteList']);
 
 
     },

config/autoload/jwt.php

@@ -47,7 +47,7 @@ return [
 //        'passphrase' => env('JWT_PASSPHRASE'),
     ],
 
-    'ttl' => env('JWT_TTL', 86400*30), // token过期时间，单位为秒
+    'ttl' => env('JWT_TTL', 300), // token过期时间，单位为秒
 
     /**
      * 支持的对称算法：HS256、HS384、HS512
@@ -84,7 +84,9 @@ return [
      * 什么叫根数据，这个配置的一维数组，除了scene都叫根配置
      */
     'scene' => [
-        'default' => [],
+        'default' => [
+            'ttl' => 86400,
+        ],
         'application' => [
             'secret' => 'application', // 非对称加密使用字符串,请使用自己加密的字符串
             'login_type' => 'sso', //  登录方式，sso为单点登录，mpop为多点登录

config/autoload/services.php

@@ -17,7 +17,7 @@ return [
             'service' => \App\JsonRpc\AuthorityServiceInterface::class,
             // 直接对指定的节点进行消费，通过下面的 nodes 参数来配置服务提供者的节点信息
             'nodes' => [
-                ['host' => '127.0.0.1', 'port' => 9504],
+                ['host' => '127.0.0.1', 'port' =>9504],
             ],
         ],
         [
@@ -74,14 +74,7 @@ return [
                 ['host' => '127.0.0.1', 'port' => 9507],
             ],
         ],
-        [
-            //广告订单服务
-            'name' => 'OrderService',
-            'service' => \App\JsonRpc\OrderServiceInterface::class,
-            // 直接对指定的节点进行消费，通过下面的 nodes 参数来配置服务提供者的节点信息
-            'nodes' => [
-                ['host' => '127.0.0.1', 'port' => 9510],
-            ],
-        ],
     ],
 ];
+
+

config/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 /**
  * This file is part of Hyperf.
  *
@@ -15,6 +15,7 @@ Router::addRoute(['GET', 'POST', 'HEAD'], '/index', 'App\Controller\IndexControl
 Router::addRoute(['GET', 'POST', 'HEAD'], '/download', 'App\Controller\IndexController@download');
 Router::get('/api/getData', 'App\Controller\LoginController@getData');
 
+
 Router::get('/favicon.ico', function () {
     return '';
 });
@@ -23,15 +24,14 @@ Router::addServer('ws', function () {
     Router::get('/', 'App\Controller\WebSocketController');
 });
 
-require __DIR__ . '/api/user.php';
-require __DIR__ . '/api/public.php';
-require __DIR__ . '/api/ad.php';
-require __DIR__ . '/api/complaint.php';
-require __DIR__ . '/api/authority.php';
-require __DIR__ . '/api/chat.php';
-require __DIR__ . '/api/link.php';
-require __DIR__ . '/api/login.php';
-require __DIR__ . '/api/news.php';
-require __DIR__ . '/api/website.php';
-require __DIR__ . '/api/web.php';
-require __DIR__ . '/api/order.php';
+require __DIR__.'/api/user.php';
+require __DIR__.'/api/public.php';
+require __DIR__.'/api/ad.php';
+require __DIR__.'/api/complaint.php';
+require __DIR__.'/api/authority.php';
+require __DIR__.'/api/chat.php';
+require __DIR__.'/api/link.php';
+require __DIR__.'/api/login.php';
+require __DIR__.'/api/news.php';
+require __DIR__.'/api/website.php';
+require __DIR__.'/api/web.php';