gx

@@ -96,8 +96,8 @@ class BlogCategoryController extends BaseController
      */
     public function save(BlogCategoryRequest $request,BlogCategoryLogic $blogCategoryLogic){
         $request->validated();
-        $blogCategoryLogic->categorySave();
-        $this->response('success');
+        $data = $blogCategoryLogic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
 

@@ -198,8 +198,8 @@ class BlogController extends BaseController
      */
     public function save(BlogRequest $request,BlogLogic $blogLogic){
         $request->validated();
-        $blogLogic->blogSave();
-        $this->response('success');
+        $data = $blogLogic->blogSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -30,8 +30,8 @@ class BlogLabelController extends BaseController
      */
     public function add(BlogLabelRequest $request,BlogLabelLogic $blogLabelLogic){
         $request->validated();
-        $blogLabelLogic->add_blog_label();
-        $this->response('success');
+        $data = $blogLabelLogic->add_blog_label();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**
@@ -63,8 +63,8 @@ class BlogLabelController extends BaseController
         ],[
             'id.required' => 'ID不能为空'
         ]);
-        $blogLabelLogic->edit_blog_label();
-        $this->response('success');
+        $data = $blogLabelLogic->edit_blog_label();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -135,8 +135,8 @@ class CustomModuleCategoryController extends BaseController
             'module_id.required' => '所选模块id不能为空',
             'pid.required' => '上级不能为空'
         ]);
-        $logic->categorySave();
-        $this->response('success');
+        $data = $logic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -204,8 +204,8 @@ class CustomModuleContentController extends BaseController
             'route.required' => '分类路由不能为空',
             'module_id.required' => '所选模块id不能为空'
         ]);
-        $logic->contentSave();
-        $this->response('success');
+        $data = $logic->contentSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**
@@ -264,7 +264,7 @@ class CustomModuleContentController extends BaseController
      * @time   :2024/4/28 16:31
      */
     public function copyModuleContent(CustomModuleContentLogic $logic){
-        $logic->copyModuleContentInfo();
-        $this->response('success');
+        $data = $logic->copyModuleContentInfo();
+        $this->response('success',Code::SUCCESS,$data);
     }
 }

@@ -67,8 +67,8 @@ class CustomModuleController extends BaseController
         ],[
             'name.required' => '模块名称不能为空',
         ]);
-        $logic->customModuleSave();
-        $this->response('success');
+        $data = $logic->customModuleSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -85,8 +85,8 @@ class NavController extends BaseController
      */
     public function save(NavRequest $request,NavLogic $logic){
         $request->validated();
-        $logic->navSave();
-        $this->response('success');
+        $data = $logic->navSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
 

@@ -96,8 +96,8 @@ class NewsCategoryController extends BaseController
      */
     public function save(NewsCategoryRequest $request,NewsCategoryLogic $newsCategoryLogic){
         $request->validated();
-        $newsCategoryLogic->newsCategorySave();
-        $this->response('success');
+        $data = $newsCategoryLogic->newsCategorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -190,8 +190,8 @@ class NewsController extends BaseController
      */
     public function save(NewsRequest $newsRequest,NewsLogic $newsLogic){
         $newsRequest->validated();
-        $newsLogic->newsSave();
-        $this->response('success');
+        $data = $newsLogic->newsSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
 

@@ -126,8 +126,8 @@ class CategoryController extends BaseController
     public function save(CategoryRequest $request, CategoryLogic $logic)
     {
         $request->validated();
-        $logic->categorySave();
-        $this->response('success');
+        $data = $logic->categorySave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -378,8 +378,8 @@ class ProductController extends BaseController
     public function save(ProductRequest $request, ProductLogic $logic)
     {
         $request->validated();
-        $logic->productSave();
-        $this->response('success');
+        $data = $logic->productSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -74,8 +74,8 @@ class CustomTemplateController extends BaseController
      */
     public function save(CustomTemplateRequest $customTemplateRequest,CustomTemplateLogic $customTemplateLogic){
         $customTemplateRequest->validated();
-        $customTemplateLogic->customTemplateSave();
-        $this->response('success');
+        $data = $customTemplateLogic->customTemplateSave();
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -65,13 +65,14 @@ class CustomTemplateLogic extends BaseLogic
     public function customTemplateSave(){
         $this->param['url'] = str_replace_url($this->param['url']);
         if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
             $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
             $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示
             if($is_upgrade == 0 || $six_read == 1) {
-                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $this->param['id'], $this->user['project_id']);
+                $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
             }
             $this->editCustomRoute($this->param['url']);
-            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+            $rs = $this->model->edit($this->param,['id'=>$id]);
         }else{
             if($this->param['url'] == $this->model::NOT_FOUND_PAGE_URL){
                 $this->fail('404页面已存在');
@@ -85,7 +86,7 @@ class CustomTemplateLogic extends BaseLogic
         if($rs === false){
             $this->fail('保存失败，请联系管理员');
         }
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -36,10 +36,11 @@ class BlogCategoryLogic extends BaseLogic
         DB::beginTransaction();
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_BLOG_CATE, $this->param['id'], $this->user['project_id']);
+                $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'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
                 //路由拼接
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
@@ -58,7 +59,7 @@ class BlogCategoryLogic extends BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -42,11 +42,8 @@ class BlogLabelLogic extends BaseLogic
         $this->param['create_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         $this->param['project_id'] = $this->user['project_id'];
-        $rs = $this->model->add($this->param);
-        if($rs ===  false){
-            $this->fail('error');
-        }
-        return $this->success();
+        $id = $this->model->addReturnId($this->param);
+        return $this->success(['id'=>$id]);
     }
 
     /**
@@ -62,7 +59,7 @@ class BlogLabelLogic extends BaseLogic
         if($rs ===  false){
             $this->fail('error');
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
 
     /**

@@ -34,13 +34,14 @@ class BlogLogic extends BaseLogic
         try {
             $this->param = $this->paramProcessing($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
+                $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显示
                 if($is_upgrade == 0 || $six_read == 1){
-                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                 }
                 $route = $this->param['url'];
-                $this->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
                 $this->param['sort'] = $this->setNewsSort();
                 $id = $this->model->addReturnId($this->param);
@@ -54,7 +55,7 @@ class BlogLogic extends BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_BLOG,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -98,11 +98,11 @@ class CustomModuleCategoryLogic extends BaseLogic
     public function categorySave(){
         $this->param = $this->handleParam($this->param);
         if(isset($this->param['id']) && !empty($this->param['id'])){
-            $this->categoryEdit();
+            $data = $this->categoryEdit();
         }else{
-            $this->categoryAdd();
+            $data = $this->categoryAdd();
         }
-        return $this->success();
+        return $this->success($data);
     }
 
     /**
@@ -141,7 +141,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
         }
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**
@@ -152,7 +152,6 @@ class CustomModuleCategoryLogic extends BaseLogic
      * @time   :2023/12/5 10:55
      */
     public function categoryEdit(){
-
         $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
             $this->param['id'], $this->user['project_id']);
         $this->editRoute($this->param['id'],$route);
@@ -160,7 +159,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         if($rs === false){
             $this->fail('系统错误，请连续管理员');
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
 
     /**
@@ -262,7 +261,7 @@ class CustomModuleCategoryLogic extends BaseLogic
         $param = $this->setContentParams($info);
         $save_id = $this->model->insertGetId($param);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
-        $this->response('success');
+        $this->success(['id'=>$save_id]);
     }
 
     /**

@@ -121,7 +121,7 @@ class CustomModuleContentLogic extends BaseLogic
         }
         //保存扩展字段
         $this->saveExtendInfo($id,$extend);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**
@@ -405,7 +405,7 @@ class CustomModuleContentLogic extends BaseLogic
         $param = $this->setContentParams($info);
         $save_id = $this->model->insertGetId($param);
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id,$info['module_id']);
-        $this->response('success');
+        $this->success(['id'=>$save_id]);
     }
 
     /**

@@ -48,11 +48,11 @@ class CustomModuleLogic extends BaseLogic
     public function customModuleSave(){
         $this->param = $this->handleParam($this->param);
         if(isset($this->param['id']) && !empty($this->param['id'])){
-            $this->moduleEdit();
+            $data = $this->moduleEdit();
         }else{
-            $this->moduleAdd();
+            $data['id'] = $this->model->addReturnId($this->param);
         }
-        return $this->success();
+        return $this->success($data);
     }
 
     /**
@@ -71,21 +71,6 @@ class CustomModuleLogic extends BaseLogic
     }
 
     /**
-     * @remark :新增
-     * @name   :moduleAdd
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/5 9:39
-     */
-    public function moduleAdd(){
-        $rs = $this->model->add($this->param);
-        if($rs === false){
-            $this->fail('系统错误，请联系管理员');
-        }
-        return $this->success();
-    }
-
-    /**
      * @remark :编辑
      * @name   :moduleEdit
      * @author :lyh
@@ -97,7 +82,7 @@ class CustomModuleLogic extends BaseLogic
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
         }
-        return $this->success();
+        return $this->success(['id'=>$this->param['id']]);
     }
 
     /**

@@ -94,15 +94,16 @@ class NavLogic extends  BaseLogic
         $data['image'] = str_replace_url(isset($this->param['image']) ? $this->param['image'] : '');
         $data['remark_image'] = str_replace_url(isset($this->param['remark_image']) ? $this->param['remark_image'] : '');
         if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
             $this->handleEditParam();//验证是否可编辑分类
-            $this->model->edit($data,['id'=>$this->param['id']]);
+            $this->model->edit($data,['id'=>$id]);
         }else{
             $data['project_id'] = $this->user['project_id'];
-            $this->model->add($data);
+            $id = $this->model->addReturnId($data);
         }
         //编辑菜单后,通知更新
         $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all');
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -47,10 +47,11 @@ class NewsCategoryLogic extends BaseLogic
         DB::beginTransaction();
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['alias'] = RouteMap::setRoute($this->param['alias'], RouteMap::SOURCE_NEWS_CATE, $this->param['id'], $this->user['project_id']);
+                $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'];
                 $this->param['operator_id'] = $this->user['id'];
-                $this->edit($this->param,['id'=>$this->param['id']]);
+                $this->edit($this->param,['id'=>$id]);
             }else{
                 if(!isset($this->param['alias']) || empty($this->param['alias'])){
                     $this->param['alias'] = Translate::tran($this->param['name'], 'en');
@@ -67,7 +68,7 @@ class NewsCategoryLogic extends BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -65,14 +65,15 @@ class NewsLogic extends BaseLogic
         try {
             $this->param = $this->paramProcessing($this->param);
             if (isset($this->param['id']) && !empty($this->param['id'])) {
+                $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显示
                 if($is_upgrade == 0 || $six_read == 1) {
-                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
+                    $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
                 }
                 //是否更新路由
                 $route = $this->param['url'];
-                $this->edit($this->param, ['id' => $this->param['id']]);
+                $this->edit($this->param, ['id' => $id]);
             } else {
                 $this->param['sort'] = $this->setNewsSort();
                 $id = $this->model->addReturnId($this->param);
@@ -87,7 +88,7 @@ class NewsLogic extends BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**
@@ -227,10 +228,6 @@ class NewsLogic extends BaseLogic
             $str = ','.implode(',',$category).',';
         }
         return $str;
-//        foreach ($category as $v){
-//            $str .= $v.',';
-//        }
-//        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
 
     /**

@@ -118,9 +118,10 @@ class CategoryLogic extends  BaseLogic
         try {
             $this->param = $this->saveHandleParam($this->param);
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_CATE, $this->param['id'], $this->user['project_id']);
+                $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'=>$this->param['id']]);
+                $this->model->edit($this->param,['id'=>$id]);
             }else{
                 $this->param['project_id'] = $this->user['project_id'];
                 $id = $this->model->addReturnId($this->param);
@@ -136,7 +137,7 @@ class CategoryLogic extends  BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_CATE,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -72,7 +72,7 @@ class ProductLogic extends  BaseLogic
         }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->curlDelRoute(['new_route'=>$route]);
-        return $this->success();
+        return $this->success(['id'=>$id]);
     }
 
     /**

@@ -495,6 +495,7 @@ Route::middleware(['bloginauth'])->group(function () {
             Route::any('/save', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'save'])->name('custom_category_save');
             Route::any('/del', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'del'])->name('custom_category_del');
             Route::any('/sort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'sort'])->name('custom_category_sort');
+            Route::any('/copyCategory', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'copyCategory'])->name('custom_category_copyCategory');
             Route::any('/allSort', [\App\Http\Controllers\Bside\CustomModule\CustomModuleCategoryController::class, 'allSort'])->name('custom_category_allSort');
         });