1

.gitignore

@@ -3,14 +3,14 @@ bin-debug/
 bin-release/
 [Oo]bj/
 [Bb]in/
-
+.env/
 # Other files and folders
 .settings/
 public
 vendor
 runtime
 runtime/*
-# Executables
+
 *.swf
 *.air
 *.ipa

app/Controller/AdController.php

@@ -29,6 +29,10 @@ class AdController extends AbstractController
     #[Inject]
     private  $adServiceClient;
 
+    /**
+     * 创建广告-todo
+     * @return array
+     */
     public function createAd()
     {
         $requireData = $this->request->all();
@@ -80,11 +84,30 @@ class AdController extends AbstractController
         return Result::success($result['data']);
     }
 
+    /**
+     * 获取广告列表
+     * @return array
+     */
     public function getAdList()
     {
-
         $requireData = $this->request->all();
-
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pid'=> 'required',
+                'page' => 'required',
+                'pageSize' => 'required',
+            ],
+            [
+                'pid.required' => '广告位id不能为空',
+                'page.required' => '页码数不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $nowTime = date("Y-m-d H:i:s");
         $result = $this->adServiceClient->getAdList($requireData);
         if($result['data']){
@@ -93,7 +116,7 @@ class AdController extends AbstractController
             foreach ($result['data']['rows'] as $k=>$v) {
                 $result['data']['rows'][$k]['type_name'] = $typeList[$v['typeid']];
                 $result['data']['rows'][$k]['status_name'] = $statusName[$v['status']];
-                $result['data']['rows'][$k]['day'] = PublicData::residueDay(date("Y-m-d H:i:s"),$v['totime']);
+                $result['data']['rows'][$k]['day'] = PublicData::residueDay(date("Y-m-d H:i:s"),$v['totime'])>0?PublicData::residueDay(date("Y-m-d H:i:s"),$v['totime']):0;
                 if($nowTime<$v['fromtime']){
                     $result['data']['rows'][$k]['runing_name'] = '未开始';
                 }else if($nowTime>$v['totime']){
@@ -159,7 +182,21 @@ class AdController extends AbstractController
     {
 
         $requireData = $this->request->all();
-        var_dump($requireData);
+        $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->adServiceClient->getAdPlaceList($requireData);
         if($result['data']){
             $typeList = ['1'=>'文字','2'=>'图文'];
@@ -172,20 +209,32 @@ class AdController extends AbstractController
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 创建广告位
+     * @return array
+     */
     public function createAdPlace()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'name' => 'required',
-                'website_id' => 'required',
-                'price' => 'required',
+                'name' => 'required', //广告位名称
+                'website_id' => 'required',//关联的网站id
+                'price' => 'required',//价格
+                'thumb'=>'required', //广告示意图
+                'typeid'=>'required', //广告类型
+                'ad_size_id'=>'required', //广告位大小
+                'status'=>'required', //状态
             ],
             [
                 'name.required' => '名称不能为空',
                 'website_id.required' => '站点不能为空',
                 'price.required' => '价格不能为空',
+                'thumb.required'=>'广告示意图必传', //广告示意图
+                'typeid.required'=>'广告类型必选', //广告类型
+                'ad_size_id.required'=>'广告大小必选', //广告位大小
+                'status.required'=>'广告状态必选', //状态
             ]
         );
         if ($validator->fails()){
@@ -203,15 +252,23 @@ class AdController extends AbstractController
             $requireData,
             [
                 'id' => 'required',
-                'name' => 'required',
-                'website_id' => 'required',
-                'price' => 'required',
+                'name' => 'required', //广告位名称
+                'website_id' => 'required',//关联的网站id
+                'price' => 'required',//价格
+                'thumb'=>'required', //广告示意图
+                'typeid'=>'required', //广告类型
+                'ad_size_id'=>'required', //广告位大小
+                'status'=>'required', //状态
             ],
             [
                 'id.required' => 'id不能为空',
                 'name.required' => '名称不能为空',
                 'website_id.required' => '站点不能为空',
                 'price.required' => '价格不能为空',
+                'thumb.required'=>'广告示意图必传', //广告示意图
+                'typeid.required'=>'广告类型必选', //广告类型
+                'ad_size_id.required'=>'广告大小必选', //广告位大小
+                'status.required'=>'广告状态必选', //状态
             ]
         );
         if ($validator->fails()){
@@ -222,6 +279,10 @@ class AdController extends AbstractController
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 删除广告位
+     * @return array
+     */
     public function delAdPlace()
     {
         $requireData = $this->request->all();
@@ -238,9 +299,31 @@ class AdController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
         $result = $this->adServiceClient->delAdPlace($requireData);
-        var_dump($result);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+    /**
+     * 获取广告位详情
+     * @return array
+     */
+    public function getAdPlaceInfo()
+    {
+        $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->adServiceClient->getAdPlaceInfo(intval($requireData['id']));
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 }

app/Controller/ChatController.php

@@ -82,7 +82,7 @@ class ChatController extends AbstractController
     public function topicType()
     {
         $type = array(
-            '1' => '课题',
+            '1' => '科研',
             '2' => '维权',
             '3' => '讨论',
         );

app/Controller/LinkController.php

@@ -35,13 +35,22 @@ class LinkController extends AbstractController
     public function getLinkList()
     {
         $requireData = $this->request->all();
-        $result = $this->linkServiceClient->getLinkList($requireData);
-        if($result['data']){
-            $statusList = ['1'=>"通过",'2'=>"待审"];
-            foreach ($result['data']['rows'] as $k=>$v) {
-                $result['data']['rows'][$k]['status_name'] =$statusList[$v['status']];
-            }
+        $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->linkServiceClient->getLinkList($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -56,9 +65,17 @@ class LinkController extends AbstractController
             $requireData,
             [
                 'title' => 'required',
+                'website_id' => 'required',
+                'sort' => 'required',
+                'url' => 'required',
+                'type' => 'required',
             ],
             [
                 'title.required' => '名称不能为空',
+                'website_id.required' => '网站id不能为空',
+                'sort.required' => '排序不能为空',
+                'url.required' => '跳转地址不能为空',
+                'type.required' => '类型不能为空',
             ]
         );
         if ($validator->fails()){
@@ -81,21 +98,26 @@ class LinkController extends AbstractController
             [
                 'id' => 'required',
                 'title' => 'required',
+                'website_id' => 'required',
+                'sort' => 'required',
                 'url' => 'required',
+                'type' => 'required',
             ],
             [
                 'id.required' => 'id不能为空',
                 'title.required' => '名称不能为空',
-                'url.required' => 'url不能为空',
+                'website_id.required' => '网站id不能为空',
+                'sort.required' => '排序不能为空',
+                'url.required' => '跳转地址不能为空',
+                'type.required' => '类型不能为空',
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData = $this->request->all();
         $result = $this->linkServiceClient->updateLink($requireData);
-        return $result?Result::success($result['data']):Result::error($result['message']);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
@@ -105,9 +127,47 @@ class LinkController extends AbstractController
     public function delLink()
     {
         $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->linkServiceClient->delLink($requireData);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 获取友情链接详情
+     * @return array
+     */
+    public function getLinkInfo()
+    {
+        $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->linkServiceClient->getLinkInfo($requireData);
+        return $result?Result::success($result['data']):Result::error($result['message']);
+    }
+
+
 
 }

app/Controller/LoginController.php

@@ -28,6 +28,7 @@ class LoginController extends AbstractController
     private $userServiceClient;
     public function login(Jwt $jwt)
     {
+        var_dump("我要登陆了");
 //        $this->logger->info("验证之前");
 
         $reqData = $this->request->all();

app/JsonRpc/AdService.php

@@ -97,4 +97,15 @@ class AdService extends AbstractServiceClient implements AdServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getAdPlaceInfo(int $id)
+    {
+        return $this->__request(__FUNCTION__, compact('id'));
+    }
+
+
 }

app/JsonRpc/AdServiceInterface.php

@@ -56,4 +56,11 @@ interface AdServiceInterface
      * @return mixed
      */
     public function delAdPlace(array $data);
+
+    /**
+     * 获取广告位详情
+     * @param int $id
+     * @return mixed
+     */
+    public function getAdPlaceInfo(int $id);
 }

app/JsonRpc/LinkService.php

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

app/JsonRpc/LinkServiceInterface.php

@@ -23,6 +23,10 @@ interface LinkServiceInterface
      */
     public function delLink(array $data);
 
-
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getLinkInfo(array $data);
 
 }

app/Tools/PublicData.php

@@ -6,6 +6,7 @@ use Hyperf\Context\ApplicationContext;
 class PublicData
 {
     /**
+     * ceshi-todo
      * 递归查询
      * @param $menuItems
      * @param $parentId

config/api/ad.php

@@ -8,13 +8,20 @@ use App\Middleware\Auth\FooMiddleware;
 Router::addGroup(
     '/ad', function () {
         Router::post('/createAd', [AdController::class, 'createAd']);
+        //添加广告位
         Router::post('/createAdPlace', [AdController::class, 'createAdPlace']);
         Router::get('/getAdInfo', [AdController::class, 'getAdInfo']);
+        //获取广告位详情
+        Router::get('/getAdPlaceInfo', [AdController::class, 'getAdPlaceInfo']);
+        //获取广告列表
         Router::get('/getAdList', [AdController::class, 'getAdList']);
         Router::post('/updateAd', [AdController::class, 'updateAd']);
         Router::post('/delAd', [AdController::class, 'delAd']);
+        //广告位列表
         Router::get('/getAdPlaceList', [AdController::class, 'getAdPlaceList']);
+        //修改广告位
         Router::post('/updateAdPlace', [AdController::class, 'updateAdPlace']);
+        //删除广告位
         Router::post('/delAdPlace', [AdController::class, 'delAdPlace']);
     },
     ['middleware' => [FooMiddleware::class]]

config/api/link.php

@@ -7,10 +7,16 @@ use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
 Router::addGroup(
     '/link', function () {
+        //获取友情链接 列表
         Router::get('/getLinkList', [LinkController::class, 'getLinkList']);
+        //创建友情链接
         Router::post('/createLink', [LinkController::class, 'createLink']);
+        //更新友情链接
         Router::post('/updateLink', [LinkController::class, 'updateLink']);
+        //删除友情链接
         Router::post('/delLink', [LinkController::class, 'delLink']);
+        //获取友情链接
+        Router::get('/getLinkInfo', [LinkController::class, 'getLinkInfo']);
     },
     ['middleware' => [FooMiddleware::class]]
 );

config/api/user.php

@@ -32,6 +32,7 @@ Router::addGroup(
         Router::post('/upUserStatus', [UserController::class, 'upUserStatus']);
         //重置密码
         Router::post('/resetPassword', [UserController::class, 'resetPassword']);
+        Router::post('/getToken', [UserController::class, 'getToken']);
         //修改用户头像和昵称
         Router::post('/updateUserAvatarNickname', [UserController::class, 'updateUserAvatarNickname']);