gx

+<?php
+
+namespace App\Http\Controllers\Bside\Blog;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Bside\BaseController;
+use App\Http\Requests\Bside\Blog\BlogLabelRequest;
+use App\Models\Blog\BlogLabel as BlogLabelModel;
+use Illuminate\Http\Request;
+
+class BlogLabelController extends BaseController
+{
+    /**
+     * @name :博客标签列表
+     * @return json
+     * @author :liyuhang
+     * @method
+     */
+    public function lists(BlogLabelModel $blogLabelModel){
+        $lists = $blogLabelModel->lists($this->map,$this->page,$this->row,$this->order);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @name :添加标签
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function add(BlogLabelRequest $request,BlogLabelModel $blogLabelModel){
+        $request->validated();
+        $this->param['create_id'] = $this->uid;
+        $this->param['Operator_id'] = $this->uid;
+        $this->param['project_id'] = $this->user['project_id'];
+        $rs = $blogLabelModel->add($this->param);
+        if($rs ===  false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        //TODO::写入日志
+        $this->response('success');
+    }
+
+    /**
+     * @name :编辑标签
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function edit(BlogLabelRequest $request,BlogLabelModel $blogLabelModel){
+        $request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
+        $this->param['operator_id'] = $this->uid;
+        $rs = $blogLabelModel->edit($this->param,['id'=>$this->param['id']]);
+        //TODO::路由映射
+        if($rs ===  false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        //TODO::写入日志
+        $this->response('success');
+    }
+
+    /**
+     * @name :编辑标签状态/排序
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function status(Request $request,BlogLabelModel $blogLabelModel){
+        $request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $this->param['Operator_id'] = $this->uid;
+        $rs = $blogLabelModel->edit($this->param,['id'=>$this->param['id']]);
+        if($rs ===  false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        //TODO::写入日志
+        $this->response('success');
+    }
+
+    /**
+     * @name :删除标签（批量删除）
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function del(Request $request,BlogLabelModel $blogLabelModel){
+        $request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $this->param['id'] = ['in',$this->param['id']];
+        $rs = $blogLabelModel->del($this->param);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success');
+    }
+}

@@ -56,6 +56,7 @@ class NewsController extends BaseController
         if($rs ===  false){
         if($rs ===  false){
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
+        //TODO::写入日志
         $this->response('success');
         $this->response('success');
     }
     }
 
 
@@ -76,7 +77,7 @@ class NewsController extends BaseController
         if($rs ===  false){
         if($rs ===  false){
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
-        //写入日志
+        //TODO::写入日志
         $this->response('success',Code::SUCCESS);
         $this->response('success',Code::SUCCESS);
     }
     }
 
 
@@ -97,10 +98,11 @@ class NewsController extends BaseController
         if($rs ===  false){
         if($rs ===  false){
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
+        //TODO::写入日志
         $this->response('success');
         $this->response('success');
     }
     }
     /**
     /**
-     * @name :删除
+     * @name :删除新闻（逻辑删除）
      * @return void
      * @return void
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
@@ -112,11 +114,11 @@ class NewsController extends BaseController
             'id.required' => 'ID不能为空',
             'id.required' => 'ID不能为空',
         ]);
         ]);
         $this->param['id'] = ['in',$this->param['id']];
         $this->param['id'] = ['in',$this->param['id']];
-        $rs = $news->del($this->param);
+        $rs = $news->edit(['status'=>2],$this->param);
         if($rs === false){
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
             $this->response('error',Code::USER_ERROR);
         }
         }
-        //TODO::清空相关资源
+        //TODO::清空相关资源/写入日志
         $this->response('success');
         $this->response('success');
     }
     }
 }
 }

+<?php
+
+namespace App\Http\Requests\Bside\Blog;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class BlogLabelRequest 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|max:100',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'请填写名称',
+            'name.max'=>'名称最大100字',
+
+        ];
+    }
+}

+<?php
+
+namespace App\Http\Requests\Bside\News;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class NewsLabelRequest 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|max:100',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'请填写名称',
+            'name.max'=>'名称最大100字',
+        ];
+    }
+}

+<?php
+
+namespace App\Models\Blog;
+
+use App\Models\Base;
+
+class BlogLabel extends Base
+{
+    protected $table = 'gl_blog_label';
+}

+<?php
+
+namespace App\Models\News;
+
+use App\Models\Base;
+
+class NewsLabel extends Base
+{
+    protected $table = 'gl_news_label';
+}

@@ -66,20 +66,20 @@ Route::middleware(['bloginauth'])->group(function () {
     //博客相关路由
     //博客相关路由
     Route::prefix('blog')->group(function () {
     Route::prefix('blog')->group(function () {
         //分类
         //分类
-        Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('news_category_add');
-        Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('news_category_info');
-        Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('news_category_edit');
-        Route::any('/category/lists', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
-        Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
-        Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');
+        Route::any('/category/', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('blog_category_lists');
+        Route::any('/category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('blog_category_add');
+        Route::any('/category/info', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'info'])->name('blog_category_info');
+        Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('blog_category_edit');
+        Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('blog_category_del');
+        Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('blog_category_status');
 
 
         //新闻
         //新闻
-        Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'add'])->name('news_category_add');
-        Route::any('/info', [\App\Http\Controllers\Bside\News\NewsController::class, 'info'])->name('news_category_info');
-        Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('news_category_edit');
-        Route::any('/lists', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
-        Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_category_del');
-        Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_category_status');
+        Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('blog_lists');
+        Route::any('/add', [\App\Http\Controllers\Bside\News\NewsController::class, 'add'])->name('blog_add');
+        Route::any('/info', [\App\Http\Controllers\Bside\News\NewsController::class, 'info'])->name('blog_info');
+        Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('blog_edit');
+        Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('blog_del');
+        Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('blog_status');
     });
     });
 
 
     //产品
     //产品