第一期工程

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

@@ -27,8 +27,6 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
-//        $this->logger->info("验证之前");
-
         $reqData =  $this->request->all();
         $validator = $this->validationFactory->make(
             $reqData,
@@ -59,7 +57,6 @@ class LoginController extends AbstractController
         if(strtolower($code)!=$reqData['captcha']){
             return Result::error("验证码错误");
         }
-            //$reqData
         $where = [];
         if($reqData['type'] ==1){//密码登录
             $where = [
@@ -71,6 +68,7 @@ class LoginController extends AbstractController
         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']){
             return Result::error("用户名或密码错误");
@@ -78,11 +76,11 @@ class LoginController extends AbstractController
         $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']
+            'level_id' => $userInfos['data']['level_id'],
+            'type_id' => $userInfos['data']['type_id'],
         ];
         var_dump($userData);
         // 使用默认场景登录

app/Controller/NewsController.php

@@ -195,26 +195,26 @@ class NewsController extends AbstractController
     public function getArticleList()
     {
         $requireData = $this->request->all();
-        $requireData['website_id'] = $this->websiteId;
-        var_dump("资讯：",$requireData);
-        $result = $this->newsServiceClient->getArticleList($requireData);
-        //1通过，2待审核，3待发 4,拒绝 5删除
-        $statusList = [
-            '1'=>'通过',
-            '2'=>'待审核',
-            '3'=>'待发',
-            '4'=>'拒绝',
-            '5'=>'删除',
-        ];
-        if($result['data']){
-            foreach ($result['data']['rows'] as $k=>$v) {
-                $result['data']['rows'][$k]['cat_arr_id'] = $v['cat_arr_id']?json_decode($v['cat_arr_id']):[0];
-                $result['data']['rows'][$k]['tag'] = $v['tag']?json_decode($v['tag']):[];
-                $result['data']['rows'][$k]['status_name'] = $statusList[$v['status']];
-                $result['data']['rows'][$k]['level'] = (string)$v['level'];
-                $result['data']['rows'][$k]['islink'] = isset($v['islink']) && $v['islink']>0?true:false;
-            }
+        $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);
         }
+
+        $result = $this->newsServiceClient->getArticleList($requireData);
+
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
@@ -255,13 +255,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' => '作者不能为空',
             ]
         );
@@ -269,24 +269,26 @@ 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['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();
@@ -294,10 +296,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不能为空'
             ]
         );
@@ -305,18 +311,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
@@ -337,8 +363,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
-        $requireData['website_id'] = $this->websiteId;
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -365,6 +389,7 @@ class NewsController extends AbstractController
         }
 
         $result = $this->newsServiceClient->getArticleInfo($requireData);
+        $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

@@ -187,7 +187,7 @@ class PublicController extends AbstractController
                 'name.required' => '姓名不能为空',
                 'mobile.required' => '手机号码不能为空',
                 'describe.required' => '详细说明不能为空',
-                'type_level.required' => '详细说明不能为空',
+                'type_level.required' => '类型进度不能为空',
             ]
         );
         if ($validator->fails()){

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/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']);
     }
 
@@ -674,7 +693,82 @@ class WebsiteController extends AbstractController
      */
     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;
+        }
     }
 
     /**
@@ -683,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']);
     }
 
@@ -783,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' => '每页显示条数不能为空',
             ]
@@ -804,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']);
     }
 

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,14 @@ 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);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -59,4 +59,10 @@ interface NewsServiceInterface
      */
     public function getCategoryInfo(array $data);
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upArticleStatus(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);
     }
 
     /**

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

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/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

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

@@ -17,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

@@ -15,13 +15,21 @@ 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']);
 
     },

config/api/website.php

@@ -34,15 +34,22 @@ 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']);
         //删除网站导航
@@ -61,6 +68,8 @@ Router::addGroup(
         Router::post('/upWebsiteCategoryones', [WebsiteController::class, 'upWebsiteCategoryones']);
         //网站下的所有导航包含子导航
         Router::get('/getWebsiteAllCategory', [WebsiteController::class, 'getWebsiteAllCategory']);
+        //管理后台数据统计
+        Router::get('/getAdminIndex', [WebsiteController::class, 'getAdminIndex']);
 
 
 

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为多点登录

runtime/container/proxy/App_Controller_AdController.proxy.php

@@ -21,7 +21,7 @@ class AdController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_AuthorityController.proxy.php

@@ -40,17 +40,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('查询失败');
     }
     /**
      * 删除菜单
@@ -58,12 +50,18 @@ class AuthorityController extends AbstractController
      */
     public function delMenu()
     {
-        $id = (int) $this->request->input("id", 0);
-        $data = ['id' => $id, 'page' => 1, 'pageSize' => 2];
-        $result = $this->authorityServiceClient->getMenuList($data);
-        if (count($result['data']['rows']) > 0) {
+        $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' => 10];
+        $result = $this->authorityServiceClient->getMenuList($getData);
+        if (count($result['data']) > 0) {
             return Result::error("有子菜单不能删除");
         }
+        $data = ['id' => $requireData['id']];
         return $this->authorityServiceClient->delMenu($data);
     }
     /**
@@ -78,17 +76,27 @@ 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
@@ -96,37 +104,13 @@ class AuthorityController extends AbstractController
     public function updateMenu()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, [
-            'id' => 'required',
-            //                'pid' => 'required',
-            'label' => 'required',
-        ], [
-            'id.required' => 'id不能为空',
-            //                'pid.required' => '父级id不能为空',
-            'label.required' => '菜单名称不能为空',
-        ]);
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'label' => 'required'], ['id.required' => 'id不能为空', 'label.required' => '菜单名称不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        unset($requireData['pid_arr']);
-        var_dump("提交数据前：", $requireData);
-        if (isset($requireData['pid']) && is_array($requireData['pid'])) {
-            $requireData['pid_arr'] = json_encode($requireData['pid']);
-            $requireData['pid'] = end($requireData['pid']);
-        } else {
-            if (isset($requireData['pid']) && $requireData['pid'] > 0) {
-                //            array_push($requireData['pid'],$requireData['pid']);
-                $requireData['pid'] = [$requireData['pid']];
-                $requireData['pid_arr'] = json_encode($requireData['pid']);
-                $requireData['pid'] = end($requireData['pid']);
-            } else {
-                $id = [0];
-                $requireData['pid_arr'] = json_encode($id);
-                $requireData['pid'] = end($id);
-            }
-        }
-        var_dump("提交数据后", $requireData);
+        $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']);
     }
@@ -136,15 +120,19 @@ 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]];
+        $reqData = ['user_id' => Context::get("UserId")];
         $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("查询失败");
+    }
 }

runtime/container/proxy/App_Controller_ChatController.proxy.php

@@ -26,7 +26,7 @@ class ChatController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_IndexController.proxy.php

@@ -16,7 +16,7 @@ class IndexController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_LinkController.proxy.php

@@ -19,7 +19,7 @@ class LinkController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());

runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -20,7 +20,7 @@ class LoginController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -36,7 +36,6 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
-        //        $this->logger->info("验证之前");
         $reqData = $this->request->all();
         $validator = $this->validationFactory->make($reqData, ['username' => 'required', 'password' => 'required', 'type' => 'required'], ['username.required' => '用户名不能为空', 'password.required' => '密码不能为空', 'type.required' => '登录方式必填']);
         if ($validator->fails()) {
@@ -54,7 +53,6 @@ class LoginController extends AbstractController
         if (strtolower($code) != $reqData['captcha']) {
             return Result::error("验证码错误");
         }
-        //$reqData
         $where = [];
         if ($reqData['type'] == 1) {
             //密码登录
@@ -65,6 +63,7 @@ class LoginController extends AbstractController
         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']) {
             return Result::error("用户名或密码错误");
@@ -73,11 +72,11 @@ class LoginController extends AbstractController
             '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);
         // 使用默认场景登录

runtime/container/proxy/App_Controller_NewsController.proxy.php

@@ -133,20 +133,12 @@ class NewsController extends AbstractController
     public function getArticleList()
     {
         $requireData = $this->request->all();
-        $requireData['website_id'] = $this->websiteId;
-        var_dump("资讯：", $requireData);
-        $result = $this->newsServiceClient->getArticleList($requireData);
-        //1通过，2待审核，3待发 4,拒绝 5删除
-        $statusList = ['1' => '通过', '2' => '待审核', '3' => '待发', '4' => '拒绝', '5' => '删除'];
-        if ($result['data']) {
-            foreach ($result['data']['rows'] as $k => $v) {
-                $result['data']['rows'][$k]['cat_arr_id'] = $v['cat_arr_id'] ? json_decode($v['cat_arr_id']) : [0];
-                $result['data']['rows'][$k]['tag'] = $v['tag'] ? json_decode($v['tag']) : [];
-                $result['data']['rows'][$k]['status_name'] = $statusList[$v['status']];
-                $result['data']['rows'][$k]['level'] = (string) $v['level'];
-                $result['data']['rows'][$k]['islink'] = isset($v['islink']) && $v['islink'] > 0 ? true : false;
-            }
+        $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);
         }
+        $result = $this->newsServiceClient->getArticleList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -171,46 +163,56 @@ class NewsController extends AbstractController
     public function addArticle()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['title' => 'required', 'catid' => 'required', 'author' => 'required'], ['title.required' => '标题不能为空', 'catid.required' => '分类不能为空', 'author.required' => '作者不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['title' => 'required', 'cat_arr_id' => 'required', 'author' => 'required'], ['title.required' => '标题不能为空', 'cat_arr_id.required' => '导航池ID不能为空', 'author.required' => '作者不能为空']);
         if ($validator->fails()) {
             $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['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();
-        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'name' => 'required'], ['name.required' => '分类名称不能为空', 'id.required' => 'ID不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required', 'title' => 'required', 'cat_arr_id' => 'required', 'author' => 'required'], ['title.required' => '标题不能为空', 'cat_arr_id.required' => '导航池ID不能为空', 'author.required' => '作者不能为空', 'id.required' => 'ID不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if (isset($requireData['pid']) && is_array($requireData['pid'])) {
-            $requireData['pid_arr'] = json_encode($requireData['pid']);
-            $requireData['pid'] = end($requireData['pid']);
-        } else {
-            $id = [0];
-            $requireData['pid_arr'] = json_encode($id);
-            $requireData['pid'] = end($id);
-        }
-        $requireData['website_id'] = $this->websiteId;
+        $requireData['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
@@ -223,7 +225,6 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['website_id'] = $this->websiteId;
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -240,6 +241,7 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->newsServiceClient->getArticleInfo($requireData);
+        $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']);
     }
 }

runtime/container/proxy/App_Controller_PublicController.proxy.php

@@ -142,7 +142,7 @@ class PublicController extends AbstractController
     public function addComplaint()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['title' => 'required', 'nature' => 'required', 'nature_level' => 'required', 'type' => 'required', 'name' => 'required', 'mobile' => 'required', 'describe' => 'required', 'type_level' => 'required'], ['title.required' => '标题不能为空', 'nature.required' => '性质不能为空', 'nature_level.required' => '进度不能为空', 'type.required' => '类型不能为空', 'name.required' => '姓名不能为空', 'mobile.required' => '手机号码不能为空', 'describe.required' => '详细说明不能为空', 'type_level.required' => '详细说明不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['title' => 'required', 'nature' => 'required', 'nature_level' => 'required', 'type' => 'required', 'name' => 'required', 'mobile' => 'required', 'describe' => 'required', 'type_level' => 'required'], ['title.required' => '标题不能为空', 'nature.required' => '性质不能为空', 'nature_level.required' => '进度不能为空', 'type.required' => '类型不能为空', 'name.required' => '姓名不能为空', 'mobile.required' => '手机号码不能为空', 'describe.required' => '详细说明不能为空', 'type_level.required' => '类型进度不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -19,7 +19,7 @@ class UserController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct(\Hyperf\Logger\LoggerFactory $loggerFactory)
+    function __construct()
     {
         if (method_exists(parent::class, '__construct')) {
             parent::__construct(...func_get_args());
@@ -130,6 +130,25 @@ 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
@@ -168,12 +187,13 @@ class UserController extends AbstractController
     public function addRole()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['role_name' => 'required'], ['role_name.required' => '角色名称不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['role_name' => 'required', 'rule' => 'required', 'remark' => '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'] = 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, []);
@@ -206,13 +226,13 @@ class UserController extends AbstractController
     public function updateRole()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['role_name' => 'required', 'id' => 'required'], ['id.required' => '角色ID不能为空', 'role_name.required' => '角色名称不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['role_name' => 'required', 'rule' => 'required', 'remark' => 'required', 'id' => 'required'], ['id.required' => '角色ID不能为空', '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['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, []);

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -10,6 +10,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
@@ -19,13 +21,6 @@ class WebsiteController extends AbstractController
 {
     use \Hyperf\Di\Aop\ProxyTrait;
     use \Hyperf\Di\Aop\PropertyHandlerTrait;
-    function __construct()
-    {
-        if (method_exists(parent::class, '__construct')) {
-            parent::__construct(...func_get_args());
-        }
-        $this->__handlePropertyHandler(__CLASS__);
-    }
     #[Inject]
     protected ValidatorFactoryInterface $validationFactory;
     /**
@@ -33,6 +28,12 @@ class WebsiteController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
+    protected JWT $JWT;
+    public function __construct(Jwt $JWT)
+    {
+        $this->__handlePropertyHandler(__CLASS__);
+        $this->JWT = $JWT;
+    }
     /**
      * 创建站点
      * @return array
@@ -70,6 +71,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']) : [];
             }
         }
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -133,23 +135,29 @@ class WebsiteController extends AbstractController
             return Result::error($result['message']);
         }
     }
+    /**
+     * 添加的时候 选择上级网系
+     * @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];
@@ -158,59 +166,52 @@ class WebsiteController extends AbstractController
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 创建栏目
+     * 创建网系
      * @return array
      */
     public function addWebsiteColumn()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required'], ['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()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required', 'column_arr_id' => 'required'], ['column_name.required' => '栏目名称不能为空', 'column_arr_id.required' => '栏目ID不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['column_name' => 'required'], ['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->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']);
     }
     /**
@@ -449,7 +450,75 @@ class WebsiteController extends AbstractController
      */
     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;
+        }
     }
     /**
      * 获取模板皮肤分类
@@ -457,7 +526,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']);
     }
     /**
@@ -515,13 +585,27 @@ class WebsiteController extends AbstractController
     public function getTemplate()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['template_class_id' => 'required', 'page' => 'required', 'pageSize' => 'required'], ['template_class_id.required' => '类型template_class_id不能为空', 'page.required' => 'page不能为空', 'pageSize.required' => '每页显示条数不能为空']);
+        $validator = $this->validationFactory->make($requireData, [
+            //                'template_class_id' => 'required',
+            'page' => 'required',
+            'pageSize' => 'required',
+        ], [
+            //                'template_class_id.required' => '类型template_class_id不能为空',
+            'page.required' => 'page不能为空',
+            'pageSize.required' => '每页显示条数不能为空',
+        ]);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $data = ['template_class_id' => $requireData['template_class_id'], 'page' => $requireData['page'], 'pageSize' => $requireData['pageSize']];
         $result = $this->websiteServiceClient->getTemplate($data);
+        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']);
     }
     /**

runtime/container/proxy/App_JsonRpc_AuthorityServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class AuthorityServiceInterface_d76232b31bbd469dfad8aee1d7fa38f3 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
+class AuthorityServiceInterface_938f151b2d38b882e7131c7b756b34e5 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements AuthorityServiceInterface
 {
     /**
      * 菜单列表
@@ -58,4 +58,12 @@ class AuthorityServiceInterface_d76232b31bbd469dfad8aee1d7fa38f3 extends \Hyperf
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getAllMenuList(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/container/proxy/App_JsonRpc_NewsServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class NewsServiceInterface_fe8076e91062043f9fd83c0f915a1823 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements NewsServiceInterface
+class NewsServiceInterface_1dc952f30391d3623e254f507249f1da extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements NewsServiceInterface
 {
     /**
      * @param array $data
@@ -82,4 +82,12 @@ class NewsServiceInterface_fe8076e91062043f9fd83c0f915a1823 extends \Hyperf\RpcC
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upArticleStatus(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_ee9c6099677ea6996883dbd88c44255a extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_a6099ced51bfe0de46ae02499a201262 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
@@ -60,7 +60,7 @@ class WebsiteServiceInterface_ee9c6099677ea6996883dbd88c44255a extends \Hyperf\R
      * @param int $page
      * @param int $pageSize
      */
-    public function getWebsiteColumnList(string $keyword, int $page, int $pageSize)
+    public function getWebsiteColumnList(array $data)
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }