Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/FooterController.php

@@ -289,27 +289,12 @@ class FooterController extends AbstractController
                 'pageSize.required' => '每页显示数量不能为空'
             ]
         );
-        if($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if(isset($requireData['con_title'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'con_title' =>'required'
-                ],
-                [
-                    'con_title.required' => '内容标题不能为空'
-                ]
-            );
-            if($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
+        if(isset($requireData['con_title']) && !empty($requireData['con_title'])){
             $data['con_title'] = $requireData['con_title'];
         }
-        
+        if(isset($requireData['list_title']) &&!empty($requireData['list_title'])){
+            $data['list_title'] = $requireData['list_title'];
+        }
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['page'] = $requireData['page'];
         $data['pageSize'] = $requireData['pageSize'];
@@ -319,6 +304,33 @@ class FooterController extends AbstractController
         }else{
             return Result::success($result['data']);
         }
+    }
+    /*
+     * 获取底部导航（列表）内容
+     * @return array
+     */
+    public function getOneFooterContent(){
+        $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);
+        }
+        $data['id'] = $requireData['id'];
+        $result = $this->footerServiceClient->getOneFooterContent($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
     }
      /**
      * 修改底部导航（列表）内容
@@ -403,4 +415,5 @@ class FooterController extends AbstractController
             return Result::success($result['data']);
         }
     }
+    
 }

app/Controller/LoginController.php

@@ -552,7 +552,6 @@ class LoginController extends AbstractController
      */
     public function logout(Jwt $jwt)
     {
-
         $reqData = $this->request->all();
         $validator = $this->validationFactory->make(
             $reqData,
@@ -569,31 +568,39 @@ class LoginController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+
         $redis = $this->container->get(\Hyperf\Redis\Redis::class);
         $ticket = md5($reqData['admintoken']);
 
         $res = $redis->del('ticket:' . $ticket);
         var_dump("删除redis:", $res);
         var_dump("获取redis:", $redis->get('ticket:' . $ticket));
-        $expire = time();
-        $cookieName = 'Admin-Token';
-        // 创建 Cookie 实例
-        $cookie = new Cookie($cookieName, '', $expire, '/');
-        // 清空 Cookie
-        $r = $this->response = $this->response->withCookie($cookie);
-        var_dump("清空Cookie:", $r);
+
+        // 获取所有 Cookie
+        $cookies = $this->request->getCookieParams();
+        var_dump("获取cookie:", $cookies);
+        if($cookies){
+            foreach ($cookies as $name => $value) {
+                if($name){
+                    $expire = time() - 3600; // 设置过期时间为过去的时间
+                    $cookie = new Cookie((string)$name, '', $expire, '/');
+                    $this->response = $this->response->withCookie($cookie);
+                }
+
+            }
+        }
         try {
             $jwt->logout($reqData['admintoken']);
-        }catch (\Exception $e){
-            var_dump("返回错误信息：",$e->getMessage());
-//            $backurl = $this->fun_http($reqData['backurl']);
-//            return $this->response->redirect($backurl, 302);
+        } catch (\Exception $e) {
+            var_dump("返回错误信息：", $e->getMessage());
         }
+
         $backurl = $this->fun_http($reqData['backurl']);
-        var_dump("返回地址：",$backurl);
+        var_dump("返回地址：", $backurl);
         return $this->response->redirect($backurl, 302);
     }
 
+
     /**
      * 登录回调
      * @return void

app/Controller/NewsController.php

@@ -1046,15 +1046,18 @@ class NewsController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'page' => 'integer|required',
-                'page_size' => 'integer|required',
+                'page'=> 'integer|required',
+                'page_size'=> 'integer|required',
+                'checkout' => 'integer|required',
             ],
             [
                 'page.integer' => 'page必须是整型',
                 'page_size.integer' => 'page_size必须是整型',
                 'page.required' => 'page不能为空',
                 'page_size.required' => 'page_size不能为空',
-            ]
+                'checkout.required' => 'checkout不能为空',
+                'checkout.integer' => 'checkout必须是整型',
+            ]   
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
@@ -1493,7 +1496,38 @@ class NewsController extends AbstractController
     {
         $requireData = $this->request->all();
         $result = $this->newsServiceClient->getCompanyNature($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);   
+    }
+    /*
+    *后端-招聘 职位审核
+    * @return array
+    */
+    public function checkJobRecruiting(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required',
+                'status' => 'required|integer|in:0,1,2',
+            ], 
+            [
+                'id.required' => 'id不能为空',
+                'status.required' => 'status不能为空',
+                'status.integer' => 'status必须是整数',
+                'status.in' => 'status必须是1,2,3中的一个' 
+            ]);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        if($requireData['status']=='2'){
+            if(empty($requireData['refuse_reason'])){
+                return Result::error('请填写审核不通过原因');
+            }
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->newsServiceClient->checkJobRecruiting($requireData);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
     }
     //202504084  审核状态
     public function updateGoodStatus()

app/Controller/OrderController.php

@@ -191,6 +191,7 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get("UserId");
+        $requireData['website_id'] = Context::get("SiteId")??'2';
         $result = $this->orderServiceClient->addAD($requireData);
         // return $requireData;
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);

app/Controller/PublicController.php

@@ -160,7 +160,7 @@ class PublicController extends AbstractController
     public function getCityList()
     {
         $requireData = $this->request->all();
-        var_dump($requireData);
+//        var_dump($requireData);
         $result = $this->publicServiceClient->getDistrictList($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -226,7 +226,7 @@ class PublicController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        var_dump($requireData);
+//        var_dump($requireData);
         if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
             $requireData['admin_id'] = Context::get("UserId");
         }
@@ -1106,5 +1106,109 @@ class PublicController extends AbstractController
         $result['data'] = PublicData::buildMenuTree($result['data']);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
+
+    /**
+     * 获取黑名单列表
+     * @return array
+     */
+    public function getBlackWordList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'integer|min:1',
+                'pagesize' => 'integer|min:1',
+                'search' => 'string|nullable',
+            ],
+            [
+                'page.integer' => 'page 必须是整数',
+                'page.min' => 'page 必须大于等于 1',
+                'pagesize.integer' => 'pagesize 必须是整数',
+                'pagesize.min' => 'pagesize 必须大于等于 1',
+                'search.string' => 'search 必须是字符串',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->getBlackWordList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 添加黑名单
+     * @return array
+     */
+    public function addBlackWord()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+            ],
+            [
+                'name.required' => '过滤词不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->addBlackWord($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 删除黑名单
+     * @return array
+     */
+    public function delBlackWord()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required',
+            ],
+            [
+                'name.required' => 'name不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->delBlackWord($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
+    /**
+     * 修改违禁词
+     * @return array
+     */
+    public function upBlackWord()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+                'name' => 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'name.required' => 'name不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->publicServiceClient->upBlackWord($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/JsonRpc/FooterService.php

@@ -66,6 +66,14 @@ class FooterService extends AbstractServiceClient implements FooterServiceInterf
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getOneFooterContent(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/FooterServiceInterface.php

@@ -27,6 +27,10 @@ interface FooterServiceInterface
      /**
      * @param array $data
      */
+    public function getOneFooterContent(array $data);
+     /**
+     * @param array $data
+     */
     public function addFooterContent(array $data);
      /**
      * @param array $data

app/JsonRpc/NewsService.php

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

app/JsonRpc/NewsServiceInterface.php

@@ -188,83 +188,84 @@ interface NewsServiceInterface
    */
   public function addJobRecruiting(array $data);
 
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobRecruitingArea(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getIndustry(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getPositionList(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobNature(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getExperience(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getEducation(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getSalary(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getLanguage(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getLevel(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getCompanySize(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getCompanyNature(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function upJobRecruiting(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function delJobRecruiting(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function getJobCompany(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
-  public function upJobCompany(array $data);
-  /**
-   * @param array $data
-   * @return mixed
-   */
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobRecruitingArea(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getIndustry(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getPositionList(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobNature(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getExperience(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getEducation(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSalary(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getLanguage(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getLevel(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getCompanySize(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getCompanyNature(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upJobRecruiting(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delJobRecruiting(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getJobCompany(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upJobCompany(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkJobRecruiting(array $data);
 }

app/JsonRpc/PublicRpcService.php

@@ -295,12 +295,29 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-        /**
-         * @param array $data
-         * @return array|mixed
-         */
-        public function uploadFile(array $data)
-        {
-            return $this->__request(__FUNCTION__, $data);
-        }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function uploadFile(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    public function getBlackWordList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addBlackWord(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delBlackWord(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function upBlackWord(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -156,10 +156,15 @@ interface PublicRpcServiceInterface
      */
     public function getBuckets(array $data);
 
-        /**
-         * @param array $data
-         * @return mixed
-         */
-        public function uploadFile(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function uploadFile(array $data);
+
+    public function getBlackWordList(array $data);
+    public function addBlackWord(array $data);
+    public function delBlackWord(array $data);
+    public function upBlackWord(array $data);
 
 }

app/Middleware/Auth/FooMiddleware.php

@@ -55,7 +55,7 @@ class FooMiddleware implements MiddlewareInterface
                        ]
                    );
                 }
-                if($header['userurl'] && $header['userurl'][0]){
+                if(isset($header['userurl']) && $header['userurl'] && $header['userurl'][0]){
                     $origin = $header['userurl'][0];
                     $data = [
                         'website_url'=>$origin

app/Middleware/Auth/SensitiveMiddleware.php

@@ -46,7 +46,7 @@ class SensitiveMiddleware implements MiddlewareInterface
 
         try {
             $badWords = $this->redis->sMembers('black_word');
-            $whiteWords = $this->redis->sMembers('white_word');
+//            $whiteWords = $this->redis->sMembers('white_word');
             $params = $this->request->all();
             $concatenated = "";
 
@@ -61,9 +61,9 @@ class SensitiveMiddleware implements MiddlewareInterface
             }
 
             foreach ($badWords as $badWord) {
-                if (in_array($badWord, $whiteWords)) {
-                    continue;
-                }
+//                if (in_array($badWord, $whiteWords)) {
+//                    continue;
+//                }
                 if (str_contains($concatenated, $badWord)) {
                     return $this->response->raw(json_encode([
                         'code' => 0,

composer.lock

@@ -9248,11 +9248,11 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                },
                 "hyperf": {
                     "config": "Hyperf\\Watcher\\ConfigProvider"
+                },
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -12232,12 +12232,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": ">=8.1"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

config/api/footer.php

@@ -21,6 +21,8 @@ Router::addGroup(
         Router::post('/getFooterContent', [FooterController::class, 'getFooterContent']);
         /**添加底部导航（列表）内容 */
         Router::post('/addFooterContent', [FooterController::class, 'addFooterContent']);
+        /**获取底部导航（列表）内容 */
+        Router::post('/getOneFooterContent', [FooterController::class, 'getOneFooterContent']);
         /**修改底部导航（列表）内容 */
         Router::post('/upFooterContent', [FooterController::class, 'upFooterContent']);
         /**删除底部导航（列表）内容 */

config/api/news.php

@@ -97,6 +97,7 @@ Router::addGroup(
         Router::post('/addJobRecruiting', [NewsController::class, 'addJobRecruiting']);
         Router::post('/upJobRecruiting', [NewsController::class, 'upJobRecruiting']);
         Router::post('/delJobRecruiting', [NewsController::class, 'delJobRecruiting']);
+        Router::post('/checkJobRecruiting', [NewsController::class, 'checkJobRecruiting']);
         // 菜单
         Router::get('/getJobRecruitingArea', [NewsController::class, 'getJobRecruitingArea']);
         Router::get('/getIndustry', [NewsController::class, 'getIndustry']);

config/api/public.php

@@ -68,6 +68,15 @@ Router::addGroup(
         //获取搭建列表
         Router::post('/getWebsiteTemplateList', [PublicController::class, 'getWebsiteTemplateList']);
         Router::post('/getWebsiteTemplateInfo', [PublicController::class, 'getWebsiteTemplateInfo']);
+
+        //黑名单列表-违禁词
+        Router::get('/getBlackWordList', [PublicController::class, 'getBlackWordList']);
+        //添加黑名单-违禁词
+        Router::post('/addBlackWord', [PublicController::class, 'addBlackWord']);
+        //删除黑名单-违禁词
+        Router::post('/delBlackWord', [PublicController::class, 'delBlackWord']);
+        //修改黑名单-违禁词
+        Router::post('/upBlackWord', [PublicController::class, 'upBlackWord']);
     },
     ['middleware' => [FooMiddleware::class]]
 );
@@ -84,5 +93,7 @@ Router::addGroup(
         Router::post('/buckets', [MinioController::class, 'listBuckets']);
 
         Router::post('/uploadFile', [MinioController::class, 'uploadFiles']);
+
+
     }
 );