周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 cb8a6a01b7b2e7f72b79478c90fc4bacb6fbcf29 2 个父辈 fdfcb47e 8a90debc

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 24 行增加 和 24 行删除
... ... @@ -84,7 +84,7 @@ class BlogController extends BaseController
*/
public function getAllSub($id,&$str = []){
$cateModel = new BlogCategory();
$list = $cateModel->list(['pid'=>$id,'status'=>1],['id','pid']);
$list = $cateModel->list(['pid'=>$id,'status'=>0],['id','pid']);
if(!empty($list)){
foreach ($list as $v){
$str[] = $v['id'];
... ...
... ... @@ -60,6 +60,7 @@ class NewsController extends BaseController
$str = [];
$str[] = $this->map['category_id'];
$this->getAllSub($this->map['category_id'],$str);
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($str, true) . PHP_EOL, FILE_APPEND);
$query->where(function ($subQuery) use ($str) {
foreach ($str as $v) {
$subQuery->orWhereRaw("FIND_IN_SET(?, category_id) > 0", [$v]);
... ... @@ -87,7 +88,7 @@ class NewsController extends BaseController
*/
public function getAllSub($id,&$str = []){
$cateModel = new NewsCategory();
$list = $cateModel->list(['pid'=>$id,'status'=>1],['id','pid']);
$list = $cateModel->list(['pid'=>$id,'status'=>0],['id','pid']);
if(!empty($list)){
foreach ($list as $v){
$str[] = $v['id'];
... ...
... ... @@ -63,23 +63,22 @@ class CustomTemplateLogic extends BaseLogic
* @time :2023/6/29 16:21
*/
public function customTemplateSave(){
try {
$this->param['url'] = str_replace_url($this->param['url']);
if(isset($this->param['id']) && !empty($this->param['id'])){
$this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $this->param['id'], $this->user['project_id']);
$this->editCustomRoute($this->param['url']);
$this->model->edit($this->param,['id'=>$this->param['id']]);
}else{
if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
$this->fail('404页面已存在');
}
$this->param['project_id'] = $this->user['project_id'];
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
$this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
$this->model->edit(['url'=>$route],['id'=>$id]);
$this->param['url'] = str_replace_url($this->param['url']);
if(isset($this->param['id']) && !empty($this->param['id'])){
$this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $this->param['id'], $this->user['project_id']);
$this->editCustomRoute($this->param['url']);
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
}else{
if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
$this->fail('404页面已存在');
}
}catch (\Exception $e){
$this->param['project_id'] = $this->user['project_id'];
$id = $this->model->addReturnId($this->param);
$route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
$this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
$rs = $this->model->edit(['url'=>$route],['id'=>$id]);
}
if($rs === false){
$this->fail('保存失败，请联系管理员');
}
return $this->success();
... ... @@ -208,13 +207,13 @@ class CustomTemplateLogic extends BaseLogic
*/
public function editCustomRoute($route){
$info = $this->model->read(['id'=>$this->param['id']]);
if($info['url'] == $this->model::NOT_FOUND_PAGE_URL && $route['url'] != '404'){
$this->fail('404页面链接不可修改');
}
if($info['url'] != $route){
$this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
$this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
if($info['url'] == $this->model::NOT_FOUND_PAGE_URL){
if($route != '404'){
$this->fail('不可删除， 只可以修改tdk');
}
}
$this->addUpdateNotify(RouteMap::SOURCE_PAGE,$route);
$this->curlDelRoute(['route'=>$info['url'],'new_route'=>$route]);
return true;
}
... ...