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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\CustomTemplateLogic;
 use App\Http\Logic\Bside\BTemplate\CustomTemplateLogic;
+use App\Http\Requests\Bside\Template\CustomTemplateRequest;
 
 
 /**
 /**
  * @remark :自定义模块
  * @remark :自定义模块
@@ -39,8 +40,8 @@ class CustomTemplateController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
-        $customTemplateLogic->customTemplateInfo();
-        $this->response('success');
+        $info = $customTemplateLogic->customTemplateInfo();
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
     /**
     /**
@@ -50,7 +51,15 @@ class CustomTemplateController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/6/29 9:30
      * @time   :2023/6/29 9:30
      */
      */
-    public function save(CustomTemplateLogic $customTemplateLogic){
+    public function save(CustomTemplateRequest $customTemplateRequest,CustomTemplateLogic $customTemplateLogic){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $this->request->validate([
+                'id'=>['required'],
+            ],[
+                'id.required' => 'ID不能为空',
+            ]);
+        }
+        $customTemplateRequest->validated();
         $customTemplateLogic->customTemplateSave();
         $customTemplateLogic->customTemplateSave();
         $this->response('success');
         $this->response('success');
     }
     }

@@ -22,6 +22,8 @@ class CustomTemplateLogic extends BaseLogic
      * @time   :2023/6/29 15:46
      * @time   :2023/6/29 15:46
      */
      */
     public function customTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['*']){
     public function customTemplateLists($map,$page,$row,$order = 'created_at',$filed = ['*']){
+        $map['status'] = 0;
+        $map['deleted_status'] = 0;
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         $lists = $this->model->lists($map,$page,$row,$order,$filed);
         return $this->success($lists);
         return $this->success($lists);
     }
     }
@@ -49,6 +51,14 @@ class CustomTemplateLogic extends BaseLogic
      * @time   :2023/6/29 16:21
      * @time   :2023/6/29 16:21
      */
      */
     public function customTemplateSave(){
     public function customTemplateSave(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $rs = $this->model->add($this->param);
+        }
+        if($rs === false){
+            $this->fail('error');
+        }
         return $this->success();
         return $this->success();
     }
     }
 
 

+<?php
+
+namespace App\Http\Requests\Bside\Template;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CustomTemplateRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'=>'required',
+            'url'=>'required',
+            'keywords'=>'required',
+            'description'=>'required',
+            'title'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'模版名称不能为空',
+            'url.required'=>'自定义访问地址',
+            'keywords.required'=>'页面关键字不能为空',
+            'description.required'=>'页面描述不能为空',
+            'title.required'=>'标题不能为空',
+        ];
+    }
+}

@@ -257,6 +257,7 @@ Route::middleware(['bloginauth'])->group(function () {
     // 自定义页面，专题页
     // 自定义页面，专题页
     Route::prefix('custom')->group(function () {
     Route::prefix('custom')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'lists'])->name('custom_lists');
         Route::any('/', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'lists'])->name('custom_lists');
+        Route::any('/read', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'read'])->name('custom_read');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'save'])->name('custom_save');
         Route::any('/save', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'save'])->name('custom_save');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'del'])->name('custom_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Template\CustomTemplateController::class, 'del'])->name('custom_del');
     });
     });