周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 3ec25e4061169a22477b2c88fa33db150b90dd50 2 个父辈 cbcb2ae6 ed01b9ce

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !1604
内嵌 并排对比
正在显示 6 个修改的文件 包含 18 行增加 和 6 行删除
... ... @@ -34,11 +34,13 @@ class BlogCategoryLogic extends BaseLogic
DB::beginTransaction();
try {
if(isset($this->param['id']) && !empty($this->param['id'])){
$info = $this->model->read(['id'=>$this->param['id']],['id','alias']);
$id = $this->param['id'];
$this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
$route = $this->param['alias'];
$this->param['operator_id'] = $this->user['id'];
$this->edit($this->param,['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['alias'] ?? '']);
}else{
//路由拼接
if(!isset($this->param['alias']) || empty($this->param['alias'])){
... ... @@ -49,6 +51,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->edit(['alias'=>$route],['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route]);
}
DB::commit();
}catch (\Exception $e){
... ... @@ -56,7 +59,6 @@ class BlogCategoryLogic extends BaseLogic
$this->fail('系统错误，请联系管理');
}
$this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
$this->curlDelRoute(['new_route'=>$route]);
return $this->success(['id'=>$id]);
}
... ...
... ... @@ -30,6 +30,7 @@ class BlogLogic extends BaseLogic
//拼接参数
$this->param = $this->paramProcessing($this->param);
if(isset($this->param['id']) && !empty($this->param['id'])){
$info = $this->model->read(['id'=>$this->param['id']],['id','url']);
$id = $this->param['id'];
$is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
$six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
... ... @@ -38,14 +39,15 @@ class BlogLogic extends BaseLogic
}
$route = $this->param['url'];
$this->edit($this->param,['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['url'] ?? '']);
}else{
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
$this->edit(['url'=>$route],['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route]);
}
$this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
$this->curlDelRoute(['new_route'=>$route]);
return $this->success(['id'=>$id]);
}
... ...
... ... @@ -63,6 +63,7 @@ class NewsCategoryLogic extends BaseLogic
$this->verifyParamName($this->param['name']);
$this->param = $this->handleParam($this->param);
if(isset($this->param['id']) && !empty($this->param['id'])){
$info = $this->model->read(['id'=>$this->param['id']],['id','alias']);
$id = $this->param['id'];
$this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
$route = $this->param['alias'];
... ... @@ -71,6 +72,7 @@ class NewsCategoryLogic extends BaseLogic
}
$this->param['operator_id'] = $this->user['id'];
$this->edit($this->param,['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['alias'] ?? '']);
}else{
if(!isset($this->param['alias']) || empty($this->param['alias'])){
$this->param['alias'] = Translate::tran($this->param['name'], 'en');
... ... @@ -82,9 +84,9 @@ 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->model->edit(['alias'=>$route],['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route]);
}
$this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
$this->curlDelRoute(['new_route'=>$route]);
return $this->success(['id'=>$id]);
}
... ...
... ... @@ -61,6 +61,7 @@ class NewsLogic extends BaseLogic
{
$this->param = $this->paramProcessing($this->param);
if (isset($this->param['id']) && !empty($this->param['id'])) {
$info = $this->model->read(['id'=>$this->param['id']],['id','url']);
$id = $this->param['id'];
$is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
$six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
... ... @@ -70,14 +71,15 @@ class NewsLogic extends BaseLogic
//是否更新路由
$route = $this->param['url'];
$this->edit($this->param, ['id' => $id]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['url'] ?? '']);
} else {
$this->param['sort'] = $this->setNewsSort();
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
$this->edit(['url' => $route], ['id' => $id]);
$this->curlDelRoute(['new_route'=>$route]);
}
$this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
$this->curlDelRoute(['new_route'=>$route]);
return $this->success(['id'=>$id]);
}
... ...
... ... @@ -115,20 +115,22 @@ class CategoryLogic extends BaseLogic
public function categorySave(){
$this->param = $this->saveHandleParam($this->param);
if(isset($this->param['id']) && !empty($this->param['id'])){
$info = $this->model->read(['id'=>$this->param['id']],['id','route']);
$id = $this->param['id'];
$this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
$route = $this->param['route'];
$this->model->edit($this->param,['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['route'] ?? '']);
}else{
$this->param['project_id'] = $this->user['project_id'];
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
$this->edit(['route'=>$route],['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route]);
}
//清除缓存
Common::del_user_cache('product_category',$this->user['project_id']);
$this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
$this->curlDelRoute(['new_route'=>$route]);
return $this->success(['id'=>$id]);
}
... ...
... ... @@ -51,7 +51,6 @@ class ProductLogic extends BaseLogic
$this->saveExtendInfo($data['id'],$this->param['extend'] ?? []);//扩展字段
$this->saveDetail($data['id'],$this->param['detail'] ?? []);
$this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$data['route'] ?? '');
$this->curlDelRoute(['new_route'=>$data['route'] ?? '']);
return $this->success(['id'=>$data['id']]);
}
... ... @@ -73,6 +72,7 @@ class ProductLogic extends BaseLogic
$id = $this->model->addReturnId($param);
$route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $id, $this->user['project_id']);
$this->model->edit(['route'=>$route],['id'=>$id]);
$this->curlDelRoute(['new_route'=>$route ?? '']);
return $this->success(['id'=>$id,'route'=>$route]);
}
... ... @@ -84,6 +84,7 @@ class ProductLogic extends BaseLogic
* @time :2024/12/18 10:09
*/
public function editProduct(){
$info = $this->model->read(['id'=>$this->param['id']],['id','route']);
//处理字段
$param = $this->handleSaveParam($this->param);
$route = $param['route'];
... ... @@ -95,6 +96,7 @@ class ProductLogic extends BaseLogic
$param['route'] = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
}
$this->model->edit($param,['id'=>$this->param['id']]);
$this->curlDelRoute(['new_route'=>$route ?? '','old_route'=>$info['route'] ?? '']);
return $this->success(['id'=>$this->param['id'],'route'=>$route]);
}
... ...