From 7860d74c271e1fe29b9f87d859197d30d2e76444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Mon, 14 Dec 2020 23:44:26 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4=E6=88=B3?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=9B=20=E5=81=87=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80=E4=BD=9C=E7=94=A8=E5=9F=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Model.php       | 32 +++++++++++++++-----------------
 app/Scopes/DeleteScope.php |  6 +++---
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/Models/Model.php b/app/Models/Model.php
index 1af9f1d..425b0cf 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -7,7 +7,6 @@ use App\Traits\Error;
 use App\Traits\Instance;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
-use function Symfony\Component\String\s;
 
 class Model extends EloquentModel
 {
@@ -29,28 +28,23 @@ class Model extends EloquentModel
      */
     public $timestamps = true;
 
-    /**
-     * 模型日期的存储格式
-     *
-     * @var string
-     */
-    protected $dateFormat = 'U';
-
     const CREATED_AT = 'created_time';
     const UPDATED_AT = 'updated_time';
 
-//    /**
-//     * 模型的数据库连接名
-//     *
-//     * @var string
-//     */
-//    protected $connection = 'mysql';
+    public function getCreatedTimeAttribute()
+    {
+        return $this->attributes[self::CREATED_AT];
+    }
 
+    public function getUpdatedTimeAttribute()
+    {
+        return $this->attributes[self::UPDATED_AT];
+    }
 
     /**
      * 自定义的软删除
      */
-    protected $is_delete = 1; //是否开启删除（1.开启删除，就是直接删除；）
+    protected $is_delete = 1; //是否开启删除（1.开启删除，就是直接删除；0.假删除）
     protected $delete_field = 'is_delete'; //删除字段
 
     public function getIsDelete()
@@ -72,8 +66,12 @@ class Model extends EloquentModel
      */
     protected static function booted()
     {
-        $self = self::getInstance();
         // 假删除的作用域
-        static::addGlobalScope(new DeleteScope($self->getIsDelete(), $self->getDeleteField()));
+        static::addGlobalScope(new DeleteScope(new static));
+    }
+
+    public static function firstByWhere($where)
+    {
+        return self::where($where)->first();
     }
 }
diff --git a/app/Scopes/DeleteScope.php b/app/Scopes/DeleteScope.php
index 9486c5d..6fe95f3 100644
--- a/app/Scopes/DeleteScope.php
+++ b/app/Scopes/DeleteScope.php
@@ -11,10 +11,10 @@ class DeleteScope implements Scope
     protected $is_delete = 1; //是否开启删除（1.开启删除，就是直接删除；）
     protected $delete_field = 'is_delete'; //删除字段
 
-    public function __construct(int $is_delete = 1, string $delete_field = 'is_delete')
+    public function __construct(\App\Models\Model $model)
     {
-        $this->delete = $is_delete;
-        $this->delete_field = $delete_field;
+        $this->is_delete = $model->getIsDelete();
+        $this->delete_field = $model->getDeleteField();
     }
 
     /**
-- 
Gitee


From 6d10aa95119321f377f9e9a359d7e347988076a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Mon, 14 Dec 2020 23:45:59 +0800
Subject: [PATCH 02/15] =?UTF-8?q?Banner=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=9B=20=E5=9F=BA=E7=A1=80service=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Modules/Admin/Entities/System/Banner.php  | 13 +++--------
 ...AdminController.php => BaseController.php} |  6 ++---
 .../Controllers/System/BannerController.php   | 14 +++++++++++
 app/Modules/Admin/Routes/web.php              |  4 ++++
 app/Modules/Admin/Services/BannerService.php  | 13 +++++++++++
 app/Modules/Admin/Services/BaseService.php    | 23 +++++++++++++++++++
 6 files changed, 60 insertions(+), 13 deletions(-)
 rename app/Modules/Admin/Http/Controllers/{AdminController.php => BaseController.php} (90%)
 create mode 100644 app/Modules/Admin/Http/Controllers/System/BannerController.php
 create mode 100644 app/Modules/Admin/Services/BannerService.php
 create mode 100644 app/Modules/Admin/Services/BaseService.php

diff --git a/app/Modules/Admin/Entities/System/Banner.php b/app/Modules/Admin/Entities/System/Banner.php
index e69be3e..e4a2a1d 100644
--- a/app/Modules/Admin/Entities/System/Banner.php
+++ b/app/Modules/Admin/Entities/System/Banner.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\System;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class Banner extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\System/BannerFactory::new();
-    }
+    protected $primaryKey = 'banner_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Http/Controllers/AdminController.php b/app/Modules/Admin/Http/Controllers/BaseController.php
similarity index 90%
rename from app/Modules/Admin/Http/Controllers/AdminController.php
rename to app/Modules/Admin/Http/Controllers/BaseController.php
index 7148ef8..9b77dfe 100644
--- a/app/Modules/Admin/Http/Controllers/AdminController.php
+++ b/app/Modules/Admin/Http/Controllers/BaseController.php
@@ -7,7 +7,7 @@ use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 
-class AdminController extends Controller
+class BaseController extends Controller
 {
     use Json;
 
@@ -17,9 +17,9 @@ class AdminController extends Controller
      * Display a listing of the resource.
      * @return Renderable
      */
-    public function index()
+    public function index(Request $request)
     {
-        return view('admin::index');
+        return $this->successJson($this->service->lists($request->all()));
     }
 
     /**
diff --git a/app/Modules/Admin/Http/Controllers/System/BannerController.php b/app/Modules/Admin/Http/Controllers/System/BannerController.php
new file mode 100644
index 0000000..307da34
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/System/BannerController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\System;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Services\BannerService;
+
+class BannerController extends BaseController
+{
+    public function __construct(BannerService $bannerService)
+    {
+        $this->service = $bannerService;
+    }
+}
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index 9f57bd8..e7ba5ba 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -23,4 +23,8 @@ Route::prefix('admin')->group(function() {
         Route::any('me', 'AuthController@me');
         Route::any('logout', 'AuthController@logout');
     });
+
+    Route::prefix('banners')->group(function() {
+        Route::any('/', 'System\BannerController@index');
+    });
 });
diff --git a/app/Modules/Admin/Services/BannerService.php b/app/Modules/Admin/Services/BannerService.php
new file mode 100644
index 0000000..3a363f6
--- /dev/null
+++ b/app/Modules/Admin/Services/BannerService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\System\Banner;
+
+class BannerService extends BaseService
+{
+    public function __construct(Banner $banner)
+    {
+        $this->model = $banner;
+    }
+}
diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
new file mode 100644
index 0000000..1e7233f
--- /dev/null
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Services\Service;
+
+class BaseService extends Service
+{
+    protected $model;
+
+    public function lists(array $params)
+    {
+        $lists = $this->model->orderBy($this->model->getKeyName(), 'DESC')->paginate($this->getLimit($params['limit'] ?? 10));
+
+        return [
+            'current_page' => $lists->currentPage(),
+            'per_page' => $lists->perPage(),
+            'count_page' => $lists->lastPage(),
+            'total' => $lists->total(),
+            'data' => $lists->items(),
+        ];
+    }
+}
-- 
Gitee


From 2f7e2e86c685d23eec00dafa846e76cbba8dccd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 00:31:14 +0800
Subject: [PATCH 03/15] =?UTF-8?q?Banner=E7=9A=84=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=99=A8=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=B8=8E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=9B=20=E6=9C=80=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E4=B8=8E=E6=9B=B4=E6=96=B0=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=9B=20=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E5=8C=B9=E9=85=8D=E8=B5=8B=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=88=E9=BB=91=E5=90=8D=E5=8D=95=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9E=8B=E9=83=BD=E5=8F=AF?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=9B=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AE=E5=BD=95=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=9A=84=E5=88=9B=E5=BB=BA=E4=B8=8E=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=BA=E6=97=B6=E9=97=B4=E6=88=B3=E6=A0=BC=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Model.php                          | 19 +++++++
 app/Modules/Admin/Entities/Rabc/Role.php      | 18 ------
 app/Modules/Admin/Entities/Rabc/RoleMenu.php  | 18 ------
 .../Admin/Http/Controllers/BaseController.php | 57 +++++++++++--------
 .../Controllers/System/BannerController.php   | 12 ++++
 .../Http/Requests/System/BannerRequest.php    | 49 ++++++++++++++++
 app/Modules/Admin/Routes/web.php              |  2 +
 app/Modules/Admin/Services/BaseService.php    | 11 ++++
 8 files changed, 126 insertions(+), 60 deletions(-)
 delete mode 100644 app/Modules/Admin/Entities/Rabc/Role.php
 delete mode 100644 app/Modules/Admin/Entities/Rabc/RoleMenu.php
 create mode 100644 app/Modules/Admin/Http/Requests/System/BannerRequest.php

diff --git a/app/Models/Model.php b/app/Models/Model.php
index 425b0cf..760f945 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -28,6 +28,13 @@ class Model extends EloquentModel
      */
     public $timestamps = true;
 
+    /**
+     * 模型日期的存储格式：录入时，创建与更新的时间为：时间戳
+     *
+     * @var string
+     */
+    protected $dateFormat = 'U';
+
     const CREATED_AT = 'created_time';
     const UPDATED_AT = 'updated_time';
 
@@ -56,6 +63,18 @@ class Model extends EloquentModel
         return $this->delete_field;
     }
 
+    /**
+     * 不可批量赋值的属性
+     *
+     * @var array
+     */
+    protected $guarded = [];
+
+
+
+
+
+
 
     /**
      * 模型的 "booted" 方法
diff --git a/app/Modules/Admin/Entities/Rabc/Role.php b/app/Modules/Admin/Entities/Rabc/Role.php
deleted file mode 100644
index b72368c..0000000
--- a/app/Modules/Admin/Entities/Rabc/Role.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Modules\Admin\Entities\Rabc;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class Role extends Model
-{
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Rabc/RoleFactory::new();
-    }
-}
diff --git a/app/Modules/Admin/Entities/Rabc/RoleMenu.php b/app/Modules/Admin/Entities/Rabc/RoleMenu.php
deleted file mode 100644
index ece65be..0000000
--- a/app/Modules/Admin/Entities/Rabc/RoleMenu.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Modules\Admin\Entities\Rabc;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class RoleMenu extends Model
-{
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Rabc/RoleMenuFactory::new();
-    }
-}
diff --git a/app/Modules/Admin/Http/Controllers/BaseController.php b/app/Modules/Admin/Http/Controllers/BaseController.php
index 9b77dfe..fea7716 100644
--- a/app/Modules/Admin/Http/Controllers/BaseController.php
+++ b/app/Modules/Admin/Http/Controllers/BaseController.php
@@ -2,8 +2,10 @@
 
 namespace App\Modules\Admin\Http\Controllers;
 
+use App\Modules\Admin\Http\Requests\BaseRequest;
 use App\Traits\Json;
 use Illuminate\Contracts\Support\Renderable;
+use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 
@@ -23,12 +25,39 @@ class BaseController extends Controller
     }
 
     /**
-     * Show the form for creating a new resource.
+     * Show the specified resource.
+     * @param int $id
      * @return Renderable
      */
-    public function create()
+    public function show($id)
+    {
+        return $this->successJson();
+    }
+
+    public function createService($request)
+    {
+        if ($request instanceof FormRequest){
+            $request->validated();
+        }
+
+        if ($this->service->create($request->all())){
+            return $this->successJson([], $this->service->getError());
+        }else{
+            return $this->errorJson($this->service->getError());
+        }
+    }
+
+    public function updateService($request)
     {
-        return view('admin::create');
+        if ($request instanceof FormRequest){
+            $request->validated();
+        }
+
+        if ($this->service->update($request->all())){
+            return $this->successJson([], $this->service->getError());
+        }else{
+            return $this->errorJson($this->service->getError());
+        }
     }
 
     /**
@@ -36,20 +65,11 @@ class BaseController extends Controller
      * @param Request $request
      * @return Renderable
      */
-    public function store(Request $request)
+    public function store(BaseRequest $request)
     {
         //
     }
 
-    /**
-     * Show the specified resource.
-     * @param int $id
-     * @return Renderable
-     */
-    public function show($id)
-    {
-        return view('admin::show');
-    }
 
     /**
      * Show the form for editing the specified resource.
@@ -61,17 +81,6 @@ class BaseController extends Controller
         return view('admin::edit');
     }
 
-    /**
-     * Update the specified resource in storage.
-     * @param Request $request
-     * @param int $id
-     * @return Renderable
-     */
-    public function update(Request $request, $id)
-    {
-        //
-    }
-
     /**
      * Remove the specified resource from storage.
      * @param int $id
diff --git a/app/Modules/Admin/Http/Controllers/System/BannerController.php b/app/Modules/Admin/Http/Controllers/System/BannerController.php
index 307da34..8627b70 100644
--- a/app/Modules/Admin/Http/Controllers/System/BannerController.php
+++ b/app/Modules/Admin/Http/Controllers/System/BannerController.php
@@ -3,7 +3,9 @@
 namespace App\Modules\Admin\Http\Controllers\System;
 
 use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\System\BannerRequest;
 use App\Modules\Admin\Services\BannerService;
+use Illuminate\Http\Request;
 
 class BannerController extends BaseController
 {
@@ -11,4 +13,14 @@ class BannerController extends BaseController
     {
         $this->service = $bannerService;
     }
+
+    public function create(BannerRequest $bannerRequest)
+    {
+        return $this->createService($bannerRequest);
+    }
+
+    public function update(BannerRequest $bannerRequest)
+    {
+        return $this->updateService($bannerRequest);
+    }
 }
diff --git a/app/Modules/Admin/Http/Requests/System/BannerRequest.php b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
new file mode 100644
index 0000000..96a80a8
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\System;
+
+use App\Modules\Admin\Entities\System\Banner;
+use Illuminate\Foundation\Http\FormRequest;
+
+class BannerRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'banner_title' => [
+                'required',
+                'max:256',
+                function ($attribute, $value, $fail)
+                {
+                    $where[] = [$attribute, '=', $value];
+                    if (request()->route()->getActionMethod() != 'create') {
+                        $primarykey = Banner::getInstance()->getKeyName();
+                        $where[]      = [$primarykey, '<>', request()->input($primarykey)];
+                    }
+                    if ($admin = Banner::firstByWhere($where)) {
+                        $fail('该Banner标题已存在！');
+                        return;
+                    }
+                },
+            ],
+            'banner_cover' => [
+                'required',
+            ]
+        ];
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+}
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index e7ba5ba..032dba5 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -26,5 +26,7 @@ Route::prefix('admin')->group(function() {
 
     Route::prefix('banners')->group(function() {
         Route::any('/', 'System\BannerController@index');
+        Route::any('/create', 'System\BannerController@create');
+        Route::any('/update', 'System\BannerController@update');
     });
 });
diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
index 1e7233f..76bbb36 100644
--- a/app/Modules/Admin/Services/BaseService.php
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -20,4 +20,15 @@ class BaseService extends Service
             'data' => $lists->items(),
         ];
     }
+
+    public function create(array $params)
+    {
+        return $this->model->create($params);
+    }
+
+    public function update(array $params)
+    {
+        $primaryKey = $this->model->getKeyName();
+        return $this->model->where($primaryKey, $params[$primaryKey])->update($params);
+    }
 }
-- 
Gitee


From 5e0e4264b15a31707c42c190dcba9ae460e1977e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 00:36:17 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E4=B8=8E=E5=81=87=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Modules/Admin/Entities/Log/AdminLog.php   | 13 ++------
 .../Admin/Entities/Log/AdminLoginLog.php      | 12 ++------
 app/Modules/Admin/Entities/Rabc/AdminInfo.php | 12 ++------
 app/Modules/Admin/Entities/Rabc/AdminMenu.php | 13 ++------
 app/Modules/Admin/Entities/Rabc/AdminRole.php | 13 ++------
 .../Entities/Rabc/AdminRoleWithAdmin.php      | 10 +++++++
 .../Admin/Entities/Rabc/AdminWithRole.php     | 10 +++++++
 app/Modules/Admin/Entities/System/Config.php  | 13 ++------
 .../Admin/Entities/System/Friendlink.php      | 13 ++------
 .../Admin/Entities/System/Protocol.php        | 13 ++------
 app/Modules/Admin/Entities/System/Version.php | 13 ++------
 .../Admin/Http/Requests/BaseRequest.php       | 30 +++++++++++++++++++
 .../Admin/Http/Requests/LoginRequest.php      | 14 +--------
 .../Http/Requests/System/BannerRequest.php    | 16 +++++-----
 14 files changed, 82 insertions(+), 113 deletions(-)
 create mode 100644 app/Modules/Admin/Entities/Rabc/AdminRoleWithAdmin.php
 create mode 100644 app/Modules/Admin/Entities/Rabc/AdminWithRole.php
 create mode 100644 app/Modules/Admin/Http/Requests/BaseRequest.php

diff --git a/app/Modules/Admin/Entities/Log/AdminLog.php b/app/Modules/Admin/Entities/Log/AdminLog.php
index b8585b9..a3e1aa1 100644
--- a/app/Modules/Admin/Entities/Log/AdminLog.php
+++ b/app/Modules/Admin/Entities/Log/AdminLog.php
@@ -2,17 +2,8 @@
 
 namespace App\Modules\Admin\Entities\Log;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\MonthModel;
 
-class AdminLog extends Model
+class AdminLog extends MonthModel
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Log/AdminLogFactory::new();
-    }
 }
diff --git a/app/Modules/Admin/Entities/Log/AdminLoginLog.php b/app/Modules/Admin/Entities/Log/AdminLoginLog.php
index a2e9fea..224e7eb 100644
--- a/app/Modules/Admin/Entities/Log/AdminLoginLog.php
+++ b/app/Modules/Admin/Entities/Log/AdminLoginLog.php
@@ -2,17 +2,9 @@
 
 namespace App\Modules\Admin\Entities\Log;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\MonthModel;
 
-class AdminLoginLog extends Model
+class AdminLoginLog extends MonthModel
 {
-    use HasFactory;
 
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Log/AdminLoginLogFactory::new();
-    }
 }
diff --git a/app/Modules/Admin/Entities/Rabc/AdminInfo.php b/app/Modules/Admin/Entities/Rabc/AdminInfo.php
index f62507e..9c0ed7d 100644
--- a/app/Modules/Admin/Entities/Rabc/AdminInfo.php
+++ b/app/Modules/Admin/Entities/Rabc/AdminInfo.php
@@ -2,17 +2,9 @@
 
 namespace App\Modules\Admin\Entities\Rabc;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class AdminInfo extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Rabc/AdminInfoFactory::new();
-    }
+    protected $primaryKey = 'admin_id';
 }
diff --git a/app/Modules/Admin/Entities/Rabc/AdminMenu.php b/app/Modules/Admin/Entities/Rabc/AdminMenu.php
index 9a8ff1e..5e38c19 100644
--- a/app/Modules/Admin/Entities/Rabc/AdminMenu.php
+++ b/app/Modules/Admin/Entities/Rabc/AdminMenu.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\Rabc;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class AdminMenu extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Rabc/AdminMenuFactory::new();
-    }
+    protected $primaryKey = 'menu_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Entities/Rabc/AdminRole.php b/app/Modules/Admin/Entities/Rabc/AdminRole.php
index 383e341..1e74293 100644
--- a/app/Modules/Admin/Entities/Rabc/AdminRole.php
+++ b/app/Modules/Admin/Entities/Rabc/AdminRole.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\Rabc;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class AdminRole extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\Rabc/AdminRoleFactory::new();
-    }
+    protected $primaryKey = 'role_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Entities/Rabc/AdminRoleWithAdmin.php b/app/Modules/Admin/Entities/Rabc/AdminRoleWithAdmin.php
new file mode 100644
index 0000000..38c5e44
--- /dev/null
+++ b/app/Modules/Admin/Entities/Rabc/AdminRoleWithAdmin.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Modules\Admin\Entities\Rabc;
+
+use App\Models\Model;
+
+class AdminRoleWithAdmin extends Model
+{
+    protected $primaryKey = 'with_id';
+}
diff --git a/app/Modules/Admin/Entities/Rabc/AdminWithRole.php b/app/Modules/Admin/Entities/Rabc/AdminWithRole.php
new file mode 100644
index 0000000..89fed33
--- /dev/null
+++ b/app/Modules/Admin/Entities/Rabc/AdminWithRole.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Modules\Admin\Entities\Rabc;
+
+use App\Models\Model;
+
+class AdminWithRole extends Model
+{
+    protected $primaryKey = 'with_id';
+}
diff --git a/app/Modules/Admin/Entities/System/Config.php b/app/Modules/Admin/Entities/System/Config.php
index cb4220d..5d3f328 100644
--- a/app/Modules/Admin/Entities/System/Config.php
+++ b/app/Modules/Admin/Entities/System/Config.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\System;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class Config extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\System/ConfigFactory::new();
-    }
+    protected $primaryKey = 'config_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Entities/System/Friendlink.php b/app/Modules/Admin/Entities/System/Friendlink.php
index 18ce212..2f4b06b 100644
--- a/app/Modules/Admin/Entities/System/Friendlink.php
+++ b/app/Modules/Admin/Entities/System/Friendlink.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\System;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class Friendlink extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\System/FriendlinkFactory::new();
-    }
+    protected $primaryKey = 'link_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Entities/System/Protocol.php b/app/Modules/Admin/Entities/System/Protocol.php
index 1c8404a..d4fd0e4 100644
--- a/app/Modules/Admin/Entities/System/Protocol.php
+++ b/app/Modules/Admin/Entities/System/Protocol.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\System;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class Protocol extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\System/ProtocolFactory::new();
-    }
+    protected $primaryKey = 'protocol_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Entities/System/Version.php b/app/Modules/Admin/Entities/System/Version.php
index 5a12b27..e3a7636 100644
--- a/app/Modules/Admin/Entities/System/Version.php
+++ b/app/Modules/Admin/Entities/System/Version.php
@@ -2,17 +2,10 @@
 
 namespace App\Modules\Admin\Entities\System;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use App\Models\Model;
 
 class Version extends Model
 {
-    use HasFactory;
-
-    protected $fillable = [];
-    
-    protected static function newFactory()
-    {
-        return \App\Modules\Admin\Database\factories\System/VersionFactory::new();
-    }
+    protected $primaryKey = 'version_id';
+    protected $is_delete = 0;
 }
diff --git a/app/Modules/Admin/Http/Requests/BaseRequest.php b/app/Modules/Admin/Http/Requests/BaseRequest.php
new file mode 100644
index 0000000..2c17922
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/BaseRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class BaseRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/LoginRequest.php b/app/Modules/Admin/Http/Requests/LoginRequest.php
index 616b88a..b2b022d 100644
--- a/app/Modules/Admin/Http/Requests/LoginRequest.php
+++ b/app/Modules/Admin/Http/Requests/LoginRequest.php
@@ -2,9 +2,7 @@
 
 namespace App\Modules\Admin\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
-
-class LoginRequest extends FormRequest
+class LoginRequest extends BaseRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -26,14 +24,4 @@ class LoginRequest extends FormRequest
             'password.required'   => '管理员密码为必填项！',
         ];
     }
-
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
 }
diff --git a/app/Modules/Admin/Http/Requests/System/BannerRequest.php b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
index 96a80a8..52cb859 100644
--- a/app/Modules/Admin/Http/Requests/System/BannerRequest.php
+++ b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
@@ -3,9 +3,9 @@
 namespace App\Modules\Admin\Http\Requests\System;
 
 use App\Modules\Admin\Entities\System\Banner;
-use Illuminate\Foundation\Http\FormRequest;
+use App\Modules\Admin\Http\Requests\BaseRequest;
 
-class BannerRequest extends FormRequest
+class BannerRequest extends BaseRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -37,13 +37,11 @@ class BannerRequest extends FormRequest
         ];
     }
 
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
+    public function messages()
     {
-        return true;
+        return [
+            'banner_title.required' => '请输入Banner标题！',
+            'banner_cover.required'   => '请上传Banner封面！',
+        ];
     }
 }
-- 
Gitee


From 01b8e271c08246718db8174b68a1014264a1fe44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:02:02 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=99=A8=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=9A=E5=94=AF=E4=B8=80=E6=80=A7=E7=9A=84=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=B8=8E=E6=9B=B4=E6=96=B0=E9=83=BD?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Http/Requests/System/BannerRequest.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/Modules/Admin/Http/Requests/System/BannerRequest.php b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
index 52cb859..dad6e1b 100644
--- a/app/Modules/Admin/Http/Requests/System/BannerRequest.php
+++ b/app/Modules/Admin/Http/Requests/System/BannerRequest.php
@@ -14,22 +14,14 @@ class BannerRequest extends BaseRequest
      */
     public function rules()
     {
+        $primarykey = Banner::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
         return [
             'banner_title' => [
                 'required',
                 'max:256',
-                function ($attribute, $value, $fail)
-                {
-                    $where[] = [$attribute, '=', $value];
-                    if (request()->route()->getActionMethod() != 'create') {
-                        $primarykey = Banner::getInstance()->getKeyName();
-                        $where[]      = [$primarykey, '<>', request()->input($primarykey)];
-                    }
-                    if ($admin = Banner::firstByWhere($where)) {
-                        $fail('该Banner标题已存在！');
-                        return;
-                    }
-                },
+                'unique:banners,banner_title' . $validate_id
             ],
             'banner_cover' => [
                 'required',
-- 
Gitee


From b92fdbafdf21e0d421cad212125bdbb7adb932a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:33:20 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E5=8F=8B=E6=83=85=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/BannerController.php   |  9 ++--
 .../System/FriendlinkController.php           | 25 ++++++++++
 .../Requests/System/FriendlinkRequest.php     | 49 +++++++++++++++++++
 .../Admin/Services/FriendlinkService.php      | 13 +++++
 4 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 app/Modules/Admin/Http/Controllers/System/FriendlinkController.php
 create mode 100644 app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php
 create mode 100644 app/Modules/Admin/Services/FriendlinkService.php

diff --git a/app/Modules/Admin/Http/Controllers/System/BannerController.php b/app/Modules/Admin/Http/Controllers/System/BannerController.php
index 8627b70..11598c2 100644
--- a/app/Modules/Admin/Http/Controllers/System/BannerController.php
+++ b/app/Modules/Admin/Http/Controllers/System/BannerController.php
@@ -5,7 +5,6 @@ namespace App\Modules\Admin\Http\Controllers\System;
 use App\Modules\Admin\Http\Controllers\BaseController;
 use App\Modules\Admin\Http\Requests\System\BannerRequest;
 use App\Modules\Admin\Services\BannerService;
-use Illuminate\Http\Request;
 
 class BannerController extends BaseController
 {
@@ -14,13 +13,13 @@ class BannerController extends BaseController
         $this->service = $bannerService;
     }
 
-    public function create(BannerRequest $bannerRequest)
+    public function create(BannerRequest $request)
     {
-        return $this->createService($bannerRequest);
+        return $this->createService($request);
     }
 
-    public function update(BannerRequest $bannerRequest)
+    public function update(BannerRequest $request)
     {
-        return $this->updateService($bannerRequest);
+        return $this->updateService($request);
     }
 }
diff --git a/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php
new file mode 100644
index 0000000..3cecbac
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\System;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\System\FriendlinkRequest;
+use App\Modules\Admin\Services\FriendlinkService;
+
+class FriendlinkController extends BaseController
+{
+    public function __construct(FriendlinkService $friendlinkService)
+    {
+        $this->service = $friendlinkService;
+    }
+
+    public function create(FriendlinkRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(FriendlinkRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php b/app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php
new file mode 100644
index 0000000..065bc41
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\System;
+
+use App\Modules\Admin\Entities\System\Banner;
+use App\Modules\Admin\Entities\System\Friendlink;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class FriendlinkRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = Friendlink::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
+        return [
+            'link_name' => [
+                'required',
+                'max:256',
+                'unique:friendlinks,link_name' . $validate_id
+            ],
+            'link_url' => [
+                'url',
+            ],
+            'link_cover' => [
+                'required',
+            ],
+            'link_sort' => [
+                'required',
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'link_name.required' => '请输入友链名称！',
+            'link_cover.required'   => '请上传友链图标！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/FriendlinkService.php b/app/Modules/Admin/Services/FriendlinkService.php
new file mode 100644
index 0000000..492418a
--- /dev/null
+++ b/app/Modules/Admin/Services/FriendlinkService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\System\Friendlink;
+
+class FriendlinkService extends BaseService
+{
+    public function __construct(Friendlink $friendlink)
+    {
+        $this->model = $friendlink;
+    }
+}
-- 
Gitee


From 4ca7c710bae3a4fa280ff0963bf726ad6ffd3f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:47:03 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E4=B8=8E?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=B1=82=EF=BC=8C=E5=88=A0=E9=99=A4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=9B=20banner=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Model.php                                  |  1 +
 app/Modules/Admin/Entities/Rabc/Admin.php             |  3 +++
 app/Modules/Admin/Http/Controllers/BaseController.php |  9 +++++++++
 app/Modules/Admin/Routes/web.php                      |  1 +
 app/Modules/Admin/Services/BaseService.php            | 10 ++++++++++
 5 files changed, 24 insertions(+)

diff --git a/app/Models/Model.php b/app/Models/Model.php
index 760f945..80ad5f6 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -58,6 +58,7 @@ class Model extends EloquentModel
     {
         return $this->is_delete;
     }
+
     public function getDeleteField()
     {
         return $this->delete_field;
diff --git a/app/Modules/Admin/Entities/Rabc/Admin.php b/app/Modules/Admin/Entities/Rabc/Admin.php
index d5a110b..f20b9dd 100644
--- a/app/Modules/Admin/Entities/Rabc/Admin.php
+++ b/app/Modules/Admin/Entities/Rabc/Admin.php
@@ -2,11 +2,14 @@
 
 namespace App\Modules\Admin\Entities\Rabc;
 
+use App\Traits\Instance;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 
 class Admin extends Authenticatable implements JWTSubject
 {
+    use Instance;
+
     protected $primaryKey = 'admin_id';
 
     protected $hidden = ['password'];
diff --git a/app/Modules/Admin/Http/Controllers/BaseController.php b/app/Modules/Admin/Http/Controllers/BaseController.php
index fea7716..cdd57c7 100644
--- a/app/Modules/Admin/Http/Controllers/BaseController.php
+++ b/app/Modules/Admin/Http/Controllers/BaseController.php
@@ -60,6 +60,15 @@ class BaseController extends Controller
         }
     }
 
+    public function delete(Request $request)
+    {
+        if ($this->service->delete($request->all())){
+            return $this->successJson([], $this->service->getError());
+        }else{
+            return $this->errorJson($this->service->getError());
+        }
+    }
+
     /**
      * Store a newly created resource in storage.
      * @param Request $request
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index 032dba5..ddc3609 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -28,5 +28,6 @@ Route::prefix('admin')->group(function() {
         Route::any('/', 'System\BannerController@index');
         Route::any('/create', 'System\BannerController@create');
         Route::any('/update', 'System\BannerController@update');
+        Route::any('/delete', 'System\BannerController@delete');
     });
 });
diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
index 76bbb36..7829864 100644
--- a/app/Modules/Admin/Services/BaseService.php
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -31,4 +31,14 @@ class BaseService extends Service
         $primaryKey = $this->model->getKeyName();
         return $this->model->where($primaryKey, $params[$primaryKey])->update($params);
     }
+
+    public function delete(array $params)
+    {
+        $primaryKey = $this->model->getKeyName();
+        if ($this->model->getIsDelete() == 0){
+            return $this->model->where($primaryKey, $params[$primaryKey])->update([$this->model->getDeleteField() => 1]);
+        }else{
+            return $this->model->where($primaryKey, $params[$primaryKey])->delete();
+        }
+    }
 }
-- 
Gitee


From 54cdcf7b9198851948d0d38a6cc2ffb878afb0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:49:48 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Log/AdminLogController.php    | 14 ++++++++++++++
 app/Modules/Admin/Services/AdminLogService.php     | 13 +++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/Log/AdminLogController.php
 create mode 100644 app/Modules/Admin/Services/AdminLogService.php

diff --git a/app/Modules/Admin/Http/Controllers/Log/AdminLogController.php b/app/Modules/Admin/Http/Controllers/Log/AdminLogController.php
new file mode 100644
index 0000000..7ca869b
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Log/AdminLogController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Log;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Services\AdminLogService;
+
+class AdminLogController extends BaseController
+{
+    public function __construct(AdminLogService $adminLogService)
+    {
+        $this->service = $adminLogService;
+    }
+}
diff --git a/app/Modules/Admin/Services/AdminLogService.php b/app/Modules/Admin/Services/AdminLogService.php
new file mode 100644
index 0000000..ddd89a5
--- /dev/null
+++ b/app/Modules/Admin/Services/AdminLogService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Log\AdminLog;
+
+class AdminLogService extends BaseService
+{
+    public function __construct(AdminLog $adminLog)
+    {
+        $this->model = $adminLog;
+    }
+}
-- 
Gitee


From cd1c7584b055bccc3089a7dd3a0b57fd0858d375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:50:51 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Log/AdminLoginLogController.php    | 14 ++++++++++++++
 .../Admin/Services/AdminLoginLogService.php        | 13 +++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/Log/AdminLoginLogController.php
 create mode 100644 app/Modules/Admin/Services/AdminLoginLogService.php

diff --git a/app/Modules/Admin/Http/Controllers/Log/AdminLoginLogController.php b/app/Modules/Admin/Http/Controllers/Log/AdminLoginLogController.php
new file mode 100644
index 0000000..47811b5
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Log/AdminLoginLogController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Log;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Services\AdminLoginLogService;
+
+class AdminLoginLogController extends BaseController
+{
+    public function __construct(AdminLoginLogService $adminLoginLogService)
+    {
+        $this->service = $adminLoginLogService;
+    }
+}
diff --git a/app/Modules/Admin/Services/AdminLoginLogService.php b/app/Modules/Admin/Services/AdminLoginLogService.php
new file mode 100644
index 0000000..7d93f8b
--- /dev/null
+++ b/app/Modules/Admin/Services/AdminLoginLogService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Log\AdminLoginLog;
+
+class AdminLoginLogService extends BaseService
+{
+    public function __construct(AdminLoginLog $adminLoginLog)
+    {
+        $this->model = $adminLoginLog;
+    }
+}
-- 
Gitee


From 88d8cc86bda13d9fd3e9fc9aae07010da71c47eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Tue, 15 Dec 2020 23:51:10 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/VersionController.php  | 25 ++++++++++
 .../Http/Requests/System/VersionRequest.php   | 50 +++++++++++++++++++
 app/Modules/Admin/Services/VersionService.php | 13 +++++
 3 files changed, 88 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/System/VersionController.php
 create mode 100644 app/Modules/Admin/Http/Requests/System/VersionRequest.php
 create mode 100644 app/Modules/Admin/Services/VersionService.php

diff --git a/app/Modules/Admin/Http/Controllers/System/VersionController.php b/app/Modules/Admin/Http/Controllers/System/VersionController.php
new file mode 100644
index 0000000..d79ae3e
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/System/VersionController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\System;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\System\FriendlinkRequest;
+use App\Modules\Admin\Services\VersionService;
+
+class VersionController extends BaseController
+{
+    public function __construct(VersionService $versionService)
+    {
+        $this->service = $versionService;
+    }
+
+    public function create(FriendlinkRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(FriendlinkRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/System/VersionRequest.php b/app/Modules/Admin/Http/Requests/System/VersionRequest.php
new file mode 100644
index 0000000..14a2cc9
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/System/VersionRequest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\System;
+
+use App\Modules\Admin\Entities\System\Banner;
+use App\Modules\Admin\Entities\System\Friendlink;
+use App\Modules\Admin\Entities\System\Version;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class VersionRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = Version::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
+        return [
+            'version_name' => [
+                'required',
+                'max:256',
+                'unique:versions,version_name' . $validate_id
+            ],
+            'version_number' => [
+                'required',
+            ],
+            'version_content' => [
+                'required',
+            ],
+            'version_sort' => [
+                'number',
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'version_name.required' => '请输入版本名称！',
+            'version_number.required'   => '请输入版本号！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/VersionService.php b/app/Modules/Admin/Services/VersionService.php
new file mode 100644
index 0000000..1472806
--- /dev/null
+++ b/app/Modules/Admin/Services/VersionService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\System\Version;
+
+class VersionService extends BaseService
+{
+    public function __construct(Version $version)
+    {
+        $this->model = $version;
+    }
+}
-- 
Gitee


From dcaa05b940c7f4841048f6b7a0cf74d29506c1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 16 Dec 2020 00:02:39 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Rabc/AdminController.php | 24 +++++++++
 .../Admin/Http/Requests/Rabc/AdminRequest.php | 50 +++++++++++++++++++
 app/Modules/Admin/Services/AdminService.php   | 13 +++++
 3 files changed, 87 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
 create mode 100644 app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php
 create mode 100644 app/Modules/Admin/Services/AdminService.php

diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
new file mode 100644
index 0000000..5f120ea
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Rabc;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Services\AdminService;
+
+class AdminController extends BaseController
+{
+    public function __construct(AdminService $adminService)
+    {
+        $this->service = $adminService;
+    }
+
+    public function create(BannerRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(BannerRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php
new file mode 100644
index 0000000..04bab90
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\Rabc;
+
+use App\Modules\Admin\Entities\Rabc\Admin;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class AdminRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = Admin::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' . $primarykey;
+
+        return [
+            'admin_name' => [
+                'required',
+                'max:256',
+                'unique:admins,admin_name' . $validate_id
+            ],
+            'admin_email' => [
+                'required',
+                'max:256',
+                'email',
+            ],
+            'password' => [
+                'confirmed',
+            ],
+            'password_confirmation' => [
+
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'admin_name.required' => '请输入管理员账户！',
+            'password.confirmed' => '密码确认不匹配！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/AdminService.php b/app/Modules/Admin/Services/AdminService.php
new file mode 100644
index 0000000..9ce39d6
--- /dev/null
+++ b/app/Modules/Admin/Services/AdminService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Rabc\Admin;
+
+class AdminService extends BaseService
+{
+    public function __construct(Admin $admin)
+    {
+        $this->model = $admin;
+    }
+}
-- 
Gitee


From 9b43231748ca65d2e1909206123a77cb4f43f62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 16 Dec 2020 00:13:48 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=9F=BA=E7=A1=80=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Rabc/AdminMenuController.php  | 27 +++++++++++++
 .../Controllers/Rabc/AdminRoleController.php  | 25 ++++++++++++
 .../Http/Requests/Rabc/AdminMenuRequest.php   | 40 +++++++++++++++++++
 .../Http/Requests/Rabc/AdminRoleRequest.php   | 39 ++++++++++++++++++
 .../Admin/Services/AdminMenuService.php       | 13 ++++++
 .../Admin/Services/AdminRoleService.php       | 13 ++++++
 6 files changed, 157 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
 create mode 100644 app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php
 create mode 100644 app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php
 create mode 100644 app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php
 create mode 100644 app/Modules/Admin/Services/AdminMenuService.php
 create mode 100644 app/Modules/Admin/Services/AdminRoleService.php

diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
new file mode 100644
index 0000000..9cd8fcf
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Rabc;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\Rabc\AdminMenuRequest;
+use App\Modules\Admin\Http\Requests\Rabc\AdminRoleRequest;
+use App\Modules\Admin\Services\AdminMenuService;
+use App\Modules\Admin\Services\AdminRoleService;
+
+class AdminMenuController extends BaseController
+{
+    public function __construct(AdminMenuService $adminMenuService)
+    {
+        $this->service = $adminMenuService;
+    }
+
+    public function create(AdminMenuRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(AdminMenuRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php
new file mode 100644
index 0000000..5ff9f1e
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Rabc;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\Rabc\AdminRoleRequest;
+use App\Modules\Admin\Services\AdminRoleService;
+
+class AdminRoleController extends BaseController
+{
+    public function __construct(AdminRoleService $adminRoleService)
+    {
+        $this->service = $adminRoleService;
+    }
+
+    public function create(AdminRoleRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(AdminRoleRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php
new file mode 100644
index 0000000..3f6b457
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\Rabc;
+
+use App\Modules\Admin\Entities\Rabc\Admin;
+use App\Modules\Admin\Entities\Rabc\AdminMenu;
+use App\Modules\Admin\Entities\Rabc\AdminRole;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class AdminMenuRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = AdminMenu::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' . $primarykey;
+
+        return [
+            'menu_name' => [
+                'required',
+                'max:256',
+                'unique:admin_menus,menu_name' . $validate_id
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'menu_name.required' => '请输入菜单名称！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php
new file mode 100644
index 0000000..9024904
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\Rabc;
+
+use App\Modules\Admin\Entities\Rabc\Admin;
+use App\Modules\Admin\Entities\Rabc\AdminRole;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class AdminRoleRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = AdminRole::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' . $primarykey;
+
+        return [
+            'role_name' => [
+                'required',
+                'max:256',
+                'unique:admin_roles,role_name' . $validate_id
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'role_name.required' => '请输入角色名称！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/AdminMenuService.php b/app/Modules/Admin/Services/AdminMenuService.php
new file mode 100644
index 0000000..2e8c426
--- /dev/null
+++ b/app/Modules/Admin/Services/AdminMenuService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Rabc\AdminMenu;
+
+class AdminMenuService extends BaseService
+{
+    public function __construct(AdminMenu $adminMenu)
+    {
+        $this->model = $adminMenu;
+    }
+}
diff --git a/app/Modules/Admin/Services/AdminRoleService.php b/app/Modules/Admin/Services/AdminRoleService.php
new file mode 100644
index 0000000..1601513
--- /dev/null
+++ b/app/Modules/Admin/Services/AdminRoleService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Rabc\AdminRole;
+
+class AdminRoleService extends BaseService
+{
+    public function __construct(AdminRole $adminRole)
+    {
+        $this->model = $adminRole;
+    }
+}
-- 
Gitee


From 97335879dc1276cf7a6ce542b66d8144ecad52a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 16 Dec 2020 00:15:35 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/ConfigController.php   | 25 +++++++++++
 .../Http/Requests/System/ConfigRequest.php    | 41 +++++++++++++++++++
 app/Modules/Admin/Services/ConfigService.php  | 13 ++++++
 3 files changed, 79 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/System/ConfigController.php
 create mode 100644 app/Modules/Admin/Http/Requests/System/ConfigRequest.php
 create mode 100644 app/Modules/Admin/Services/ConfigService.php

diff --git a/app/Modules/Admin/Http/Controllers/System/ConfigController.php b/app/Modules/Admin/Http/Controllers/System/ConfigController.php
new file mode 100644
index 0000000..78b6ce9
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/System/ConfigController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\System;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\System\ConfigRequest;
+use App\Modules\Admin\Services\ConfigService;
+
+class ConfigController extends BaseController
+{
+    public function __construct(ConfigService $configService)
+    {
+        $this->service = $configService;
+    }
+
+    public function create(ConfigRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(ConfigRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/System/ConfigRequest.php b/app/Modules/Admin/Http/Requests/System/ConfigRequest.php
new file mode 100644
index 0000000..5cb7d0d
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/System/ConfigRequest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\System;
+
+use App\Modules\Admin\Entities\System\Banner;
+use App\Modules\Admin\Entities\System\Config;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class ConfigRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = Config::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
+        return [
+            'config_title' => [
+                'required',
+                'max:256',
+            ],
+            'config_name' => [
+                'required',
+                'max:256',
+                'unique:configs,config_name' . $validate_id
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'config_title.required' => '请输入配置标题！',
+            'config_name.required'   => '请输入配置标识！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/ConfigService.php b/app/Modules/Admin/Services/ConfigService.php
new file mode 100644
index 0000000..3230b38
--- /dev/null
+++ b/app/Modules/Admin/Services/ConfigService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\System\Config;
+
+class ConfigService extends BaseService
+{
+    public function __construct(Config $config)
+    {
+        $this->model = $config;
+    }
+}
-- 
Gitee


From 2259f2829dac0d6b4a18b275e07f0a38d768bdbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 16 Dec 2020 00:15:50 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/ProtocolController.php | 25 ++++++++++
 .../Http/Requests/System/ProtocolRequest.php  | 48 +++++++++++++++++++
 .../Admin/Services/ProtocolService.php        | 13 +++++
 3 files changed, 86 insertions(+)
 create mode 100644 app/Modules/Admin/Http/Controllers/System/ProtocolController.php
 create mode 100644 app/Modules/Admin/Http/Requests/System/ProtocolRequest.php
 create mode 100644 app/Modules/Admin/Services/ProtocolService.php

diff --git a/app/Modules/Admin/Http/Controllers/System/ProtocolController.php b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php
new file mode 100644
index 0000000..86ab726
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\System;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\System\ProtocolRequest;
+use App\Modules\Admin\Services\ProtocolService;
+
+class ProtocolController extends BaseController
+{
+    public function __construct(ProtocolService $protocolService)
+    {
+        $this->service = $protocolService;
+    }
+
+    public function create(ProtocolRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(ProtocolRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/System/ProtocolRequest.php b/app/Modules/Admin/Http/Requests/System/ProtocolRequest.php
new file mode 100644
index 0000000..a9e98fa
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/System/ProtocolRequest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\System;
+
+use App\Modules\Admin\Entities\System\Banner;
+use App\Modules\Admin\Entities\System\Friendlink;
+use App\Modules\Admin\Entities\System\Protocol;
+use App\Modules\Admin\Entities\System\Version;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class ProtocolRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $primarykey = Protocol::getInstance()->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
+        return [
+            'protocol_name' => [
+                'required',
+                'max:256',
+                'unique:protocols,protocol_name' . $validate_id
+            ],
+            'protocol_type' => [
+                'required',
+            ],
+            'protocol_content' => [
+                'required',
+            ],
+            'is_check' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'protocol_name.required' => '请输入版本名称！',
+            'protocol_type.required'   => '请输入版本号！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Services/ProtocolService.php b/app/Modules/Admin/Services/ProtocolService.php
new file mode 100644
index 0000000..9e97a38
--- /dev/null
+++ b/app/Modules/Admin/Services/ProtocolService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\System\Protocol;
+
+class ProtocolService extends BaseService
+{
+    public function __construct(Protocol $protocol)
+    {
+        $this->model = $protocol;
+    }
+}
-- 
Gitee


From 0bf14a81653cdc4fc9a6826197edbac3f98f86d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 16 Dec 2020 00:23:10 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/Rabc/AdminController.php |  5 +-
 .../Controllers/Rabc/AdminMenuController.php  |  2 -
 app/Modules/Admin/Routes/web.php              | 63 +++++++++++++++++++
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
index 5f120ea..a4a03fd 100644
--- a/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
+++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php
@@ -3,6 +3,7 @@
 namespace App\Modules\Admin\Http\Controllers\Rabc;
 
 use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\Rabc\AdminRequest;
 use App\Modules\Admin\Services\AdminService;
 
 class AdminController extends BaseController
@@ -12,12 +13,12 @@ class AdminController extends BaseController
         $this->service = $adminService;
     }
 
-    public function create(BannerRequest $request)
+    public function create(AdminRequest $request)
     {
         return $this->createService($request);
     }
 
-    public function update(BannerRequest $request)
+    public function update(AdminRequest $request)
     {
         return $this->updateService($request);
     }
diff --git a/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
index 9cd8fcf..40d95e9 100644
--- a/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
+++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php
@@ -4,9 +4,7 @@ namespace App\Modules\Admin\Http\Controllers\Rabc;
 
 use App\Modules\Admin\Http\Controllers\BaseController;
 use App\Modules\Admin\Http\Requests\Rabc\AdminMenuRequest;
-use App\Modules\Admin\Http\Requests\Rabc\AdminRoleRequest;
 use App\Modules\Admin\Services\AdminMenuService;
-use App\Modules\Admin\Services\AdminRoleService;
 
 class AdminMenuController extends BaseController
 {
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index ddc3609..369be7d 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -30,4 +30,67 @@ Route::prefix('admin')->group(function() {
         Route::any('/update', 'System\BannerController@update');
         Route::any('/delete', 'System\BannerController@delete');
     });
+
+    Route::prefix('configs')->group(function() {
+        Route::any('/', 'System\ConfigController@index');
+        Route::any('/create', 'System\ConfigController@create');
+        Route::any('/update', 'System\ConfigController@update');
+        Route::any('/delete', 'System\ConfigController@delete');
+    });
+
+    Route::prefix('friendlinks')->group(function() {
+        Route::any('/', 'System\FriendlinkController@index');
+        Route::any('/create', 'System\FriendlinkController@create');
+        Route::any('/update', 'System\FriendlinkController@update');
+        Route::any('/delete', 'System\FriendlinkController@delete');
+    });
+
+    Route::prefix('protocols')->group(function() {
+        Route::any('/', 'System\ProtocolController@index');
+        Route::any('/create', 'System\ProtocolController@create');
+        Route::any('/update', 'System\ProtocolController@update');
+        Route::any('/delete', 'System\ProtocolController@delete');
+    });
+
+    Route::prefix('versions')->group(function() {
+        Route::any('/', 'System\VersionController@index');
+        Route::any('/create', 'System\VersionController@create');
+        Route::any('/update', 'System\VersionController@update');
+        Route::any('/delete', 'System\VersionController@delete');
+    });
+
+    Route::prefix('admins')->group(function() {
+        Route::any('/', 'Rabc\AdminController@index');
+        Route::any('/create', 'Rabc\AdminController@create');
+        Route::any('/update', 'Rabc\AdminController@update');
+        Route::any('/delete', 'Rabc\AdminController@delete');
+    });
+
+    Route::prefix('roles')->group(function() {
+        Route::any('/', 'Rabc\AdminRoleController@index');
+        Route::any('/create', 'Rabc\AdminRoleController@create');
+        Route::any('/update', 'Rabc\AdminRoleController@update');
+        Route::any('/delete', 'Rabc\AdminRoleController@delete');
+    });
+
+    Route::prefix('menus')->group(function() {
+        Route::any('/', 'Rabc\AdminMenuController@index');
+        Route::any('/create', 'Rabc\AdminMenuController@create');
+        Route::any('/update', 'Rabc\AdminMenuController@update');
+        Route::any('/delete', 'Rabc\AdminMenuController@delete');
+    });
+
+    Route::prefix('adminlogs')->group(function() {
+        Route::any('/', 'Log\AdminLogController@index');
+        Route::any('/create', 'System\AdminLogController@create');
+        Route::any('/update', 'System\AdminLogController@update');
+        Route::any('/delete', 'System\AdminLogController@delete');
+    });
+
+    Route::prefix('adminloginlogs')->group(function() {
+        Route::any('/', 'Log\AdminLoginLogController@index');
+        Route::any('/create', 'System\AdminLoginLogController@create');
+        Route::any('/update', 'System\AdminLoginLogController@update');
+        Route::any('/delete', 'System\AdminLoginLogController@delete');
+    });
 });
-- 
Gitee