周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 b90bed6bbbbd1cbbfc4236d9f4422ec4167c5326 2 个父辈 2a6467a8 96291a47

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

内嵌 并排对比
正在显示 12 个修改的文件 包含 19 行增加 和 12 行删除
@@ -19,7 +19,7 @@ class HrController extends BaseController @@ -19,7 +19,7 @@ class HrController extends BaseController
19 */ 19 */
20 public function list(ManageHr $manageHr) 20 public function list(ManageHr $manageHr)
21 { 21 {
22 - $lists = $manageHr->lists($this->map,$this->page,$this->row,$this->order); 22 + $lists = $manageHr->lists($this->map,$this->page,$this->row,['sort','id']);
23 if(!empty($lists) && !empty($lists['list'])){ 23 if(!empty($lists) && !empty($lists['list'])){
24 foreach ($lists['list'] as $k => $v){ 24 foreach ($lists['list'] as $k => $v){
25 $v['photo_gallery_link'] = json_decode($v['photo_gallery']); 25 $v['photo_gallery_link'] = json_decode($v['photo_gallery']);
@@ -28,7 +28,7 @@ class HrController extends BaseController @@ -28,7 +28,7 @@ class HrController extends BaseController
28 $lists['list'][$k] = $v; 28 $lists['list'][$k] = $v;
29 } 29 }
30 } 30 }
31 - return $this->response('success', Code::SUCCESS, $lists); 31 + $this->response('success', Code::SUCCESS, $lists);
32 } 32 }
33 33
34 /** 34 /**
@@ -55,7 +55,7 @@ class HrController extends BaseController @@ -55,7 +55,7 @@ class HrController extends BaseController
55 */ 55 */
56 public function save(HrLogic $logic){ 56 public function save(HrLogic $logic){
57 $logic->hrSave(); 57 $logic->hrSave();
58 - return $this->response('success'); 58 + $this->response('success');
59 } 59 }
60 60
61 /** 61 /**
@@ -89,7 +89,7 @@ class HrController extends BaseController @@ -89,7 +89,7 @@ class HrController extends BaseController
89 'status' => $v->status, 89 'status' => $v->status,
90 ]; 90 ];
91 } 91 }
92 - return $this->response('success',Code::SUCCESS, $result); 92 + $this->response('success',Code::SUCCESS, $result);
93 } 93 }
94 94
95 /** 95 /**
@@ -106,6 +106,6 @@ class HrController extends BaseController @@ -106,6 +106,6 @@ class HrController extends BaseController
106 'id.required' => 'ID不能为空' 106 'id.required' => 'ID不能为空'
107 ]); 107 ]);
108 $hrLogic->setSort(); 108 $hrLogic->setSort();
109 - return $this->response('success'); 109 + $this->response('success');
110 } 110 }
111 } 111 }
@@ -129,13 +129,13 @@ class OnlineController extends BaseController @@ -129,13 +129,13 @@ class OnlineController extends BaseController
129 * @time :2023/8/18 10:58 129 * @time :2023/8/18 10:58
130 */ 130 */
131 public function searchParam(&$query){ 131 public function searchParam(&$query){
132 - if(!empty($this->map['search']) && !empty($this->map['search_type'])){ 132 + if(!empty($this->map['message']) && !empty($this->map['type'])){
133 // 搜索域名 133 // 搜索域名
134 - if($this->map['search_type'] == 'test_domain'){  
135 - $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['search'].'%'); 134 + if($this->map['type'] == 'test_domain'){
  135 + $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['message'].'%');
136 } else { 136 } else {
137 // 搜索名称 137 // 搜索名称
138 - $query->where('gl_project.title', 'like', '%' . $this->map['search'] . '%'); 138 + $query->where('gl_project.title', 'like', '%' . $this->map['message'] . '%');
139 } 139 }
140 } 140 }
141 if(isset($this->map['qa_status'])){ 141 if(isset($this->map['qa_status'])){
@@ -188,7 +188,7 @@ class ComController extends BaseController @@ -188,7 +188,7 @@ class ComController extends BaseController
188 if($rs === false){ 188 if($rs === false){
189 $this->response('error',Code::USER_ERROR); 189 $this->response('error',Code::USER_ERROR);
190 } 190 }
191 - $this->response('success'); 191 + $this->response('success',Code::SUCCESS,['status'=>0]);
192 } 192 }
193 193
194 /** 194 /**
@@ -181,7 +181,6 @@ class LoginController extends BaseController @@ -181,7 +181,6 @@ class LoginController extends BaseController
181 */ 181 */
182 public function eventMessage(){ 182 public function eventMessage(){
183 $message = file_get_contents("php://input"); 183 $message = file_get_contents("php://input");
184 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);  
185 $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR); 184 $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
186 $jsonData = json_encode($message); 185 $jsonData = json_encode($message);
187 $arrayData = json_decode($jsonData, true); 186 $arrayData = json_decode($jsonData, true);
@@ -47,6 +47,7 @@ class BlogCategoryLogic extends BaseLogic @@ -47,6 +47,7 @@ class BlogCategoryLogic extends BaseLogic
47 $id = $this->model->addReturnId($this->param); 47 $id = $this->model->addReturnId($this->param);
48 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']); 48 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
49 $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route); 49 $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
  50 + $this->curlDelRoute(['new_route'=>$route]);
50 $this->edit(['alias'=>$route],['id'=>$id]); 51 $this->edit(['alias'=>$route],['id'=>$id]);
51 //处理子集 52 //处理子集
52 $this->addProcessingSon($id); 53 $this->addProcessingSon($id);
@@ -41,6 +41,7 @@ class BlogLogic extends BaseLogic @@ -41,6 +41,7 @@ class BlogLogic extends BaseLogic
41 $id = $this->model->addReturnId($this->param); 41 $id = $this->model->addReturnId($this->param);
42 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']); 42 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
43 $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route); 43 $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
  44 + $this->curlDelRoute(['new_route'=>$route]);
44 $this->edit(['url'=>$route],['id'=>$id]); 45 $this->edit(['url'=>$route],['id'=>$id]);
45 } 46 }
46 DB::commit(); 47 DB::commit();
@@ -115,6 +115,7 @@ class CustomModuleCategoryLogic extends BaseLogic @@ -115,6 +115,7 @@ class CustomModuleCategoryLogic extends BaseLogic
115 $id, $this->user['project_id']); 115 $id, $this->user['project_id']);
116 $this->handleAddSon($id); 116 $this->handleAddSon($id);
117 $this->addUpdateNotify(RouteMap::SOURCE_MODULE_CATE.$this->param['module_id'],$route); 117 $this->addUpdateNotify(RouteMap::SOURCE_MODULE_CATE.$this->param['module_id'],$route);
  118 + $this->curlDelRoute(['new_route'=>$route]);
118 $this->edit(['url' => $route], ['id' => $id]); 119 $this->edit(['url' => $route], ['id' => $id]);
119 }catch (\Exception $e){ 120 }catch (\Exception $e){
120 $this->fail('系统错误，请联系管理员'); 121 $this->fail('系统错误，请联系管理员');
@@ -57,6 +57,7 @@ class NewsCategoryLogic extends BaseLogic @@ -57,6 +57,7 @@ class NewsCategoryLogic extends BaseLogic
57 $id = $this->model->addReturnId($this->param); 57 $id = $this->model->addReturnId($this->param);
58 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']); 58 $route = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
59 $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route); 59 $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
  60 + $this->curlDelRoute(['new_route'=>$route]);
60 $this->model->edit(['alias'=>$route],['id'=>$id]); 61 $this->model->edit(['alias'=>$route],['id'=>$id]);
61 //当父级分类拥有产品时，处理子集 62 //当父级分类拥有产品时，处理子集
62 $this->addProcessingSon($id); 63 $this->addProcessingSon($id);
@@ -71,6 +71,7 @@ class NewsLogic extends BaseLogic @@ -71,6 +71,7 @@ class NewsLogic extends BaseLogic
71 $id = $this->model->addReturnId($this->param); 71 $id = $this->model->addReturnId($this->param);
72 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']); 72 $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
73 $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route); 73 $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
  74 + $this->curlDelRoute(['new_route'=>$route]);
74 $this->edit(['url' => $route], ['id' => $id]); 75 $this->edit(['url' => $route], ['id' => $id]);
75 } 76 }
76 //更新路由 77 //更新路由
@@ -100,7 +101,6 @@ class NewsLogic extends BaseLogic @@ -100,7 +101,6 @@ class NewsLogic extends BaseLogic
100 return true; 101 return true;
101 } 102 }
102 103
103 -  
104 /** 104 /**
105 * @name :编辑seo 105 * @name :编辑seo
106 * @return void 106 * @return void
@@ -123,6 +123,7 @@ class CategoryLogic extends BaseLogic @@ -123,6 +123,7 @@ class CategoryLogic extends BaseLogic
123 $id = $this->model->addReturnId($this->param); 123 $id = $this->model->addReturnId($this->param);
124 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']); 124 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
125 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route); 125 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
  126 + $this->curlDelRoute(['new_route'=>$route]);
126 $this->edit(['route'=>$route],['id'=>$id]); 127 $this->edit(['route'=>$route],['id'=>$id]);
127 //处理子集 128 //处理子集
128 $this->addProcessingSon($id); 129 $this->addProcessingSon($id);
@@ -64,6 +64,7 @@ class KeywordLogic extends BaseLogic @@ -64,6 +64,7 @@ class KeywordLogic extends BaseLogic
64 //路由映射 64 //路由映射
65 $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']); 65 $route = RouteMap::setRoute($this->param['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
66 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route); 66 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
  67 + $this->curlDelRoute(['new_route'=>$route]);
67 $this->model->edit(['route'=>$route],['id'=>$id]); 68 $this->model->edit(['route'=>$route],['id'=>$id]);
68 } 69 }
69 //清除缓存 70 //清除缓存
@@ -142,6 +143,7 @@ class KeywordLogic extends BaseLogic @@ -142,6 +143,7 @@ class KeywordLogic extends BaseLogic
142 foreach ($idArr as $v){ 143 foreach ($idArr as $v){
143 $this->model = new Keyword(); 144 $this->model = new Keyword();
144 $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']); 145 $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']);
  146 + $this->curlDelRoute(['new_route'=>$route]);
145 $this->model->edit(['route'=>$route],['id'=>$v['id']]); 147 $this->model->edit(['route'=>$route],['id'=>$v['id']]);
146 } 148 }
147 }catch (\Exception $e){ 149 }catch (\Exception $e){
@@ -57,6 +57,7 @@ class ProductLogic extends BaseLogic @@ -57,6 +57,7 @@ class ProductLogic extends BaseLogic
57 $id = $this->model->addReturnId($this->param); 57 $id = $this->model->addReturnId($this->param);
58 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']); 58 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
59 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route); 59 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
  60 + $this->curlDelRoute(['new_route'=>$route]);
60 $this->model->edit(['route'=>$route],['id'=>$id]); 61 $this->model->edit(['route'=>$route],['id'=>$id]);
61 } 62 }
62 //产品分类关联 63 //产品分类关联