周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 6e73f8c6af31dc6ef92ca65a45c4818eff601596 2 个父辈 e964a6e6 50de9234

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

内嵌 并排对比
正在显示 10 个修改的文件 包含 48 行增加 和 56 行删除
... ... @@ -331,6 +331,7 @@ class ProjectUpdate extends Command
'status' => Product::STATUS_ON,
'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'send_time' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
'is_upgrade' => 1,
'six_read' => 1,
... ... @@ -357,6 +358,7 @@ class ProjectUpdate extends Command
'keyword' => $item['keywords'] ?? '',
'description' => $item['description'] ?? ''
]),
'send_time' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
], ['id' => $id]);
}
... ... @@ -469,6 +471,7 @@ class ProjectUpdate extends Command
'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE,
'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
'is_upgrade' => 1,
'six_read' => 1,
... ... @@ -490,6 +493,7 @@ class ProjectUpdate extends Command
'seo_description' => $item['description'] ?? '',
'text' => $item['content'] ?? '',
'image' => $new_img,
'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
'sort' => $item['sort'] ?? 0,
], ['id' => $id]);
}
... ... @@ -659,6 +663,7 @@ class ProjectUpdate extends Command
'image' => $new_img,
'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
'is_upgrade' => 1,
'six_read' => 1,
'route' => $route
... ... @@ -676,6 +681,7 @@ class ProjectUpdate extends Command
'category_id' => $category_id,
'content' => $item['content'] ?? '',
'sort' => $item['sort'] ?? 0,
'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
'image' => $new_img
], ['id' => $id]);
}
... ...
... ... @@ -182,7 +182,7 @@ class CustomModuleCategoryController extends BaseController
* @method :post
* @time :2024/1/11 9:46
*/
public function allSort(CustomModuleContentLogic $logic){
public function allSort(CustomModuleCategoryLogic $logic){
$logic->setAllSort();
$this->response('success');
}
... ...
... ... @@ -106,9 +106,10 @@ class FileManageController extends BaseController
public function getOnlyFilename($name,$project_id = 0){
$nameArr = explode('.',$name);
$enName = generateRoute(Translate::tran($nameArr[0], 'en'));
$fileName = $enName;
$i=1;
while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
$enName = $enName .'-'.$i;
$enName = $fileName .'_'.$i;
$i++;
}
return $enName.'.'.$nameArr[1];
... ...
... ... @@ -330,4 +330,15 @@ class NewsController extends BaseController
$lists = $news->list($this->map);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @remark :复制新闻
* @name :copyNews
* @author :lyh
* @method :post
* @time :2024/4/28 11:53
*/
public function copyNews(NewsModel $news){
}
}
... ...
... ... @@ -166,9 +166,10 @@ class FileController
public function getOnlyFilename($name,$project_id = 0){
$nameArr = explode('.',$name);
$enName = generateRoute(Translate::tran($nameArr[0], 'en'));
$fileName = $enName;
$i=1;
while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
$enName = $enName .'-'.$i;
$enName = $fileName .'_'.$i;
$i++;
}
return $enName.'.'.$nameArr[1];
... ...
... ... @@ -226,9 +226,10 @@ class ImageController extends Controller
public function getOnlyFilename($name,$project_id = 0){
$nameArr = explode('.',$name);
$enName = generateRoute(Translate::tran($nameArr[0], 'en'));
$fileName = $enName;
$i=1;
while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
$enName = $enName .'-'.$i;
$enName = $fileName .'_'.$i;
$i++;
}
return $enName.'.'.$nameArr[1];
... ...
... ... @@ -4,8 +4,11 @@ namespace App\Http\Logic\Bside\Blog;
use App\Helper\Translate;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\Blog\Blog;
use App\Models\Blog\Blog as BlogModel;
use App\Models\Blog\BlogCategory;
use App\Models\Blog\BlogCategory as BlogCategoryModel;
use App\Models\News\NewsCategory as NewsCategoryModel;
use App\Models\RouteMap\RouteMap;
use Illuminate\Support\Facades\DB;
... ... @@ -90,32 +93,13 @@ class BlogCategoryLogic extends BaseLogic
*/
public function delBlogCategory(){
foreach ($this->param['id'] as $id){
$this->verifyIsDelete($id);
//删除路由
$this->delRoute($id);
$this->model->del(['id'=>$id]);
}
return $this->success();
}
/**
* @remark :验证是否可删除
* @name :VerifyIsDelete
* @author :lyh
* @method :post
* @time :2023/9/7 14:40
*/
public function verifyIsDelete($id){
//查询是否有子分类
$rs = $this->model->read(['pid'=>$id],['id']);
if($rs !== false){
$this->response('当前分类拥有子分类不允许删除');
}
//查看当前分内下是否有博客
$blogModel = new BlogModel();
$rs = $blogModel->read(['category_id'=>['like','%,'.$id.',%']],['id']);
if($rs !== false){
$this->response('当前分类拥有博客,不允许删除');
//同步删除产品字段category_id
$blogModel = new Blog();
$blogModel->edit(['category_id'=>DB::raw("REPLACE(category_id, ',$id,' , ',')")],['category_id'=>['like','%,'.$id.',%']]);
$blogModel->edit(['category_id'=>null],['category_id'=>',']);
}
return $this->success();
}
... ...
... ... @@ -189,18 +189,13 @@ class CustomModuleCategoryLogic extends BaseLogic
public function categoryDel(){
$ids = $this->param['id'];
foreach ($ids as $id){
$info = $this->model->read(['pid'=>$id],['id']);
if($info !== false){
$this->fail('分类id：'.$id.'拥有子集不允许删除');
}
$contentModel = new CustomModuleContent();
$contentInfo = $contentModel->read(['category_id'=>['like','%,'.$id.',%']]);
if($contentInfo !== false){
$this->fail('当前分类拥有产品不允许删除');
}
//删除路由
$this->delRoute($id);
$this->model->del(['id'=>$id]);
//同步删除产品字段category_id
$contentModel = new CustomModuleContent();
$contentModel->edit(['category_id'=>DB::raw("REPLACE(category_id, ',$id,' , ',')")],['category_id'=>['like','%,'.$id.',%']]);
$contentModel->edit(['category_id'=>null],['category_id'=>',']);
}
return $this->success();
}
... ...
... ... @@ -4,8 +4,10 @@ namespace App\Http\Logic\Bside\News;
use App\Helper\Translate;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\News\News;
use App\Models\News\News as NewsModel;
use App\Models\News\NewsCategory as NewsCategoryModel;
use App\Models\Product\Product;
use App\Models\RouteMap\RouteMap;
use Illuminate\Support\Facades\DB;
... ... @@ -88,19 +90,12 @@ class NewsCategoryLogic extends BaseLogic
*/
public function del_news_category(){
foreach ($this->param['id'] as $id){
//查询是否有子分类
$rs = $this->model->read(['pid'=>$id],['id']);
if($rs !== false){
$this->fail('当前分类拥有子分类不允许删除');
}
//查看当前分内下是否有商品
$newsModel = new NewsModel();
$rs = $newsModel->read(['category_id'=>$id],['id']);
if($rs !== false){
$this->fail('当前分类拥有商品，不允许删除');
}
$this->delRoute($id);
$this->model->del(['id'=>$id]);
//同步删除产品字段category_id
$newsModel = new NewsModel();
$newsModel->edit(['category_id'=>DB::raw("REPLACE(category_id, ',$id,' , ',')")],['category_id'=>['like','%,'.$id.',%']]);
$newsModel->edit(['category_id'=>null],['category_id'=>',']);
}
return $this->success();
}
... ...
... ... @@ -168,18 +168,16 @@ class CategoryLogic extends BaseLogic
public function categoryDelete(){
$ids = $this->param['ids'];
foreach ($ids as $id){
$info = $this->model->read(['pid'=>$id],['id']);
if($info !== false){
$this->fail('分类id：'.$id.'拥有子集不允许删除');
}
$productModel = new Product();
$product_info = $productModel->read(['category_id'=>['like','%,'.$id.',%']]);
if($product_info !== false){
$this->fail('当前分类拥有产品不允许删除');
}
//删除路由
$this->delRoute($id);
$this->model->del(['id'=>$id]);
//同步删除关联表
$categoryRelatedModel = new CategoryRelated();
$categoryRelatedModel->del(['cate_id'=>$id]);
//同步删除产品字段category_id
$productModel = new Product();
$productModel->edit(['category_id'=>DB::raw("REPLACE(category_id, ',$id,' , ',')")],['category_id'=>['like','%,'.$id.',%']]);
$productModel->edit(['category_id'=>null],['category_id'=>',']);
}
//清除缓存
Common::del_user_cache('product_category',$this->user['project_id']);
... ...