Merge remote-tracking branch 'origin/master' into akun

@@ -19,7 +19,7 @@ class HrController extends BaseController
      */
     public function list(ManageHr $manageHr)
     {
-        $lists = $manageHr->lists($this->map,$this->page,$this->row,$this->order);
+        $lists = $manageHr->lists($this->map,$this->page,$this->row,['sort','id']);
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 $v['photo_gallery_link'] = json_decode($v['photo_gallery']);
@@ -28,7 +28,7 @@ class HrController extends BaseController
                 $lists['list'][$k] = $v;
             }
         }
-        return $this->response('success', Code::SUCCESS, $lists);
+        $this->response('success', Code::SUCCESS, $lists);
     }
 
     /**
@@ -55,7 +55,7 @@ class HrController extends BaseController
      */
     public function save(HrLogic $logic){
         $logic->hrSave();
-        return $this->response('success');
+        $this->response('success');
     }
 
     /**
@@ -89,7 +89,7 @@ class HrController extends BaseController
                 'status' => $v->status,
             ];
         }
-        return $this->response('success',Code::SUCCESS, $result);
+        $this->response('success',Code::SUCCESS, $result);
     }
 
     /**
@@ -106,6 +106,6 @@ class HrController extends BaseController
             'id.required' => 'ID不能为空'
         ]);
         $hrLogic->setSort();
-        return $this->response('success');
+        $this->response('success');
     }
 }

@@ -129,13 +129,13 @@ class OnlineController extends BaseController
      * @time   :2023/8/18 10:58
      */
     public function searchParam(&$query){
-        if(!empty($this->map['search']) && !empty($this->map['search_type'])){
+        if(!empty($this->map['message']) && !empty($this->map['type'])){
             // 搜索域名
-            if($this->map['search_type'] == 'test_domain'){
-                $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['search'].'%');
+            if($this->map['type'] == 'test_domain'){
+                $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['message'].'%');
             } else {
                 // 搜索名称
-                $query->where('gl_project.title', 'like', '%' . $this->map['search'] . '%');
+                $query->where('gl_project.title', 'like', '%' . $this->map['message'] . '%');
             }
         }
         if(isset($this->map['qa_status'])){

@@ -188,7 +188,7 @@ class ComController extends BaseController
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
         }
-        $this->response('success');
+        $this->response('success',Code::SUCCESS,['status'=>0]);
     }
 
     /**

@@ -181,7 +181,6 @@ class LoginController extends BaseController
      */
     public function eventMessage(){
         $message = file_get_contents("php://input");
-        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $jsonData = json_encode($message);
         $arrayData = json_decode($jsonData, true);

@@ -47,6 +47,7 @@ class BlogCategoryLogic extends BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['alias'=>$route],['id'=>$id]);
                 //处理子集
                 $this->addProcessingSon($id);

@@ -41,6 +41,7 @@ class BlogLogic extends BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['url'=>$route],['id'=>$id]);
             }
             DB::commit();

@@ -115,6 +115,7 @@ class CustomModuleCategoryLogic extends BaseLogic
                 $id, $this->user['project_id']);
             $this->handleAddSon($id);
             $this->addUpdateNotify(RouteMap::SOURCE_MODULE_CATE.$this->param['module_id'],$route);
+            $this->curlDelRoute(['new_route'=>$route]);
             $this->edit(['url' => $route], ['id' => $id]);
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');

@@ -57,6 +57,7 @@ class NewsCategoryLogic extends BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['alias'=>$route],['id'=>$id]);
                 //当父级分类拥有产品时，处理子集
                 $this->addProcessingSon($id);

@@ -71,6 +71,7 @@ class NewsLogic extends BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['url' => $route], ['id' => $id]);
             }
             //更新路由
@@ -100,7 +101,6 @@ class NewsLogic extends BaseLogic
         return true;
     }
 
-
     /**
      * @name :编辑seo
      * @return void

@@ -123,6 +123,7 @@ class CategoryLogic extends  BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->edit(['route'=>$route],['id'=>$id]);
                 //处理子集
                 $this->addProcessingSon($id);

@@ -64,6 +64,7 @@ class KeywordLogic extends  BaseLogic
                 //路由映射
                 $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
             }
             //清除缓存
@@ -142,6 +143,7 @@ class KeywordLogic extends  BaseLogic
             foreach ($idArr as $v){
                 $this->model = new Keyword();
                 $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['route'=>$route],['id'=>$v['id']]);
             }
         }catch (\Exception $e){

@@ -57,6 +57,7 @@ class ProductLogic extends  BaseLogic
                 $id = $this->model->addReturnId($this->param);
                 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
                 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
+                $this->curlDelRoute(['new_route'=>$route]);
                 $this->model->edit(['route'=>$route],['id'=>$id]);
             }
             //产品分类关联