diff --git a/app/Models/Model.php b/app/Models/Model.php index 1af9f1d243668bad9cea463247db21912ce0e439..80ad5f68d4de973485c8f12df3661cbbadd58ea8 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 { @@ -30,7 +29,7 @@ class Model extends EloquentModel public $timestamps = true; /** - * 模型日期的存储格式 + * 模型日期的存储格式:录入时,创建与更新的时间为:时间戳 * * @var string */ @@ -39,29 +38,44 @@ class Model extends EloquentModel 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() { return $this->is_delete; } + public function getDeleteField() { return $this->delete_field; } + /** + * 不可批量赋值的属性 + * + * @var array + */ + protected $guarded = []; + + + + + + /** * 模型的 "booted" 方法 @@ -72,8 +86,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/Modules/Admin/Entities/Log/AdminLog.php b/app/Modules/Admin/Entities/Log/AdminLog.php index b8585b96a9548a1aa8fc5ebf385acf0e85559bae..a3e1aa18c36b72e3d7179c4f536c716e5124e501 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 a2e9feacdaff4a6e9dcee061c28e0c7bc29717d5..224e7ebc5c3311a96f3e95e4b9f3b9381032f85a 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/Admin.php b/app/Modules/Admin/Entities/Rabc/Admin.php index d5a110b530ee804a0adb44c9a2d1dbb952091272..f20b9ddaeded78938b7b61184cb35488fb4cf086 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/Entities/Rabc/AdminInfo.php b/app/Modules/Admin/Entities/Rabc/AdminInfo.php index f62507e815089fff28c5b711cc878b42449e5beb..9c0ed7d22eea0e59a00a0037bb104ba09a82495e 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 9a8ff1ee5fb2973d581ce4c1c590526a55c6a79b..5e38c19a3bf25d053bdb3884137b871eba5191c1 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 383e3415141a1f57f484baca0bb43f2e6fd44542..1e74293a667fe0b1f39b983103208aac086c5620 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 0000000000000000000000000000000000000000..38c5e44a237c8521cd0a6ca52135e1d988b0c385 --- /dev/null +++ b/app/Modules/Admin/Entities/Rabc/AdminRoleWithAdmin.php @@ -0,0 +1,10 @@ +successJson($this->service->lists($request->all())); } /** - * 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) + { + 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()); + } + } + + public function delete(Request $request) { - return view('admin::create'); + if ($this->service->delete($request->all())){ + return $this->successJson([], $this->service->getError()); + }else{ + return $this->errorJson($this->service->getError()); + } } /** @@ -36,20 +74,11 @@ class AdminController 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 +90,6 @@ class AdminController 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/Log/AdminLogController.php b/app/Modules/Admin/Http/Controllers/Log/AdminLogController.php new file mode 100644 index 0000000000000000000000000000000000000000..7ca869b99c284c9c112af29940a289ec564dd9d8 --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/Log/AdminLogController.php @@ -0,0 +1,14 @@ +service = $adminLogService; + } +} 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 0000000000000000000000000000000000000000..47811b5a17b850a0d76a20a97dadad5eb28c4a1f --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/Log/AdminLoginLogController.php @@ -0,0 +1,14 @@ +service = $adminLoginLogService; + } +} 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 0000000000000000000000000000000000000000..a4a03fd6956390365e7f5db487c11657250a3d98 --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminController.php @@ -0,0 +1,25 @@ +service = $adminService; + } + + public function create(AdminRequest $request) + { + return $this->createService($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 new file mode 100644 index 0000000000000000000000000000000000000000..40d95e9aab972383567b2f44b2320092746ee87e --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminMenuController.php @@ -0,0 +1,25 @@ +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 0000000000000000000000000000000000000000..5ff9f1eb1cf0e7e61ca7b3de70ab1fffd4f7f195 --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/Rabc/AdminRoleController.php @@ -0,0 +1,25 @@ +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/Controllers/System/BannerController.php b/app/Modules/Admin/Http/Controllers/System/BannerController.php new file mode 100644 index 0000000000000000000000000000000000000000..11598c26f11286fec96550bee6994091901746f9 --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/System/BannerController.php @@ -0,0 +1,25 @@ +service = $bannerService; + } + + 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/Controllers/System/ConfigController.php b/app/Modules/Admin/Http/Controllers/System/ConfigController.php new file mode 100644 index 0000000000000000000000000000000000000000..78b6ce9b26819738a74b403c16430fe8922c250b --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/System/ConfigController.php @@ -0,0 +1,25 @@ +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/Controllers/System/FriendlinkController.php b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php new file mode 100644 index 0000000000000000000000000000000000000000..3cecbac7d3c3c04237fcbd46a67a004f1f52fe7c --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/System/FriendlinkController.php @@ -0,0 +1,25 @@ +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/Controllers/System/ProtocolController.php b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php new file mode 100644 index 0000000000000000000000000000000000000000..86ab72687fbe6d13029afc39f9dbb93fbd922ddd --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/System/ProtocolController.php @@ -0,0 +1,25 @@ +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/Controllers/System/VersionController.php b/app/Modules/Admin/Http/Controllers/System/VersionController.php new file mode 100644 index 0000000000000000000000000000000000000000..d79ae3e70f536b436d5954d6be3ea573e1c6db0a --- /dev/null +++ b/app/Modules/Admin/Http/Controllers/System/VersionController.php @@ -0,0 +1,25 @@ +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/BaseRequest.php b/app/Modules/Admin/Http/Requests/BaseRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..2c17922f9ec8644d16f67854afa5ea0d6b976770 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/BaseRequest.php @@ -0,0 +1,30 @@ + '管理员密码为必填项!', ]; } - - /** - * 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/Rabc/AdminMenuRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..3f6b457e2f7eb102e7652e204488c945983177f5 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/Rabc/AdminMenuRequest.php @@ -0,0 +1,40 @@ +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/AdminRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..04bab90ac3386c1873344321e5aa3b2dadd7ae73 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/Rabc/AdminRequest.php @@ -0,0 +1,50 @@ +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/Http/Requests/Rabc/AdminRoleRequest.php b/app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..9024904815ce6ab936a263506558e29d6b0872e6 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/Rabc/AdminRoleRequest.php @@ -0,0 +1,39 @@ +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/Http/Requests/System/BannerRequest.php b/app/Modules/Admin/Http/Requests/System/BannerRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..dad6e1bedf03bae5fb0a6fe034a5cc5d5aedba1a --- /dev/null +++ b/app/Modules/Admin/Http/Requests/System/BannerRequest.php @@ -0,0 +1,39 @@ +getKeyName(); + $validate_id = ',' . request()->input($primarykey, 0) . ',' . $primarykey; + + return [ + 'banner_title' => [ + 'required', + 'max:256', + 'unique:banners,banner_title' . $validate_id + ], + 'banner_cover' => [ + 'required', + ] + ]; + } + + public function messages() + { + return [ + 'banner_title.required' => '请输入Banner标题!', + 'banner_cover.required' => '请上传Banner封面!', + ]; + } +} 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 0000000000000000000000000000000000000000..5cb7d0d8450b0b9e8b1eb11be69b8c1f0d57282c --- /dev/null +++ b/app/Modules/Admin/Http/Requests/System/ConfigRequest.php @@ -0,0 +1,41 @@ +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/Http/Requests/System/FriendlinkRequest.php b/app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..065bc4162b316a8b00a81c94ec27330bc642f441 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/System/FriendlinkRequest.php @@ -0,0 +1,49 @@ +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/Http/Requests/System/ProtocolRequest.php b/app/Modules/Admin/Http/Requests/System/ProtocolRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..a9e98fa0af4a58d0bac1664e8b7345e2bdf68dce --- /dev/null +++ b/app/Modules/Admin/Http/Requests/System/ProtocolRequest.php @@ -0,0 +1,48 @@ +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/Http/Requests/System/VersionRequest.php b/app/Modules/Admin/Http/Requests/System/VersionRequest.php new file mode 100644 index 0000000000000000000000000000000000000000..14a2cc906500852b0fad8fbb5e7d10a1951be452 --- /dev/null +++ b/app/Modules/Admin/Http/Requests/System/VersionRequest.php @@ -0,0 +1,50 @@ +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/Routes/web.php b/app/Modules/Admin/Routes/web.php index 9f57bd8549fab065950cbed61114232c8ebc9e1c..369be7de856b3b58503b9ad20e9615011dd99730 100644 --- a/app/Modules/Admin/Routes/web.php +++ b/app/Modules/Admin/Routes/web.php @@ -23,4 +23,74 @@ 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'); + Route::any('/create', 'System\BannerController@create'); + 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'); + }); }); diff --git a/app/Modules/Admin/Services/AdminLogService.php b/app/Modules/Admin/Services/AdminLogService.php new file mode 100644 index 0000000000000000000000000000000000000000..ddd89a5731fbcab170fca80f4f9c7c7f6f7719ad --- /dev/null +++ b/app/Modules/Admin/Services/AdminLogService.php @@ -0,0 +1,13 @@ +model = $adminLog; + } +} diff --git a/app/Modules/Admin/Services/AdminLoginLogService.php b/app/Modules/Admin/Services/AdminLoginLogService.php new file mode 100644 index 0000000000000000000000000000000000000000..7d93f8b659bef7e9572cf8b1b64eed13dfee4f7f --- /dev/null +++ b/app/Modules/Admin/Services/AdminLoginLogService.php @@ -0,0 +1,13 @@ +model = $adminLoginLog; + } +} diff --git a/app/Modules/Admin/Services/AdminMenuService.php b/app/Modules/Admin/Services/AdminMenuService.php new file mode 100644 index 0000000000000000000000000000000000000000..2e8c42674ab95b701329dfa7381a2e17e3feae53 --- /dev/null +++ b/app/Modules/Admin/Services/AdminMenuService.php @@ -0,0 +1,13 @@ +model = $adminMenu; + } +} diff --git a/app/Modules/Admin/Services/AdminRoleService.php b/app/Modules/Admin/Services/AdminRoleService.php new file mode 100644 index 0000000000000000000000000000000000000000..16015130ef2f9f7dbbe13a9cc870816f82e98f38 --- /dev/null +++ b/app/Modules/Admin/Services/AdminRoleService.php @@ -0,0 +1,13 @@ +model = $adminRole; + } +} diff --git a/app/Modules/Admin/Services/AdminService.php b/app/Modules/Admin/Services/AdminService.php new file mode 100644 index 0000000000000000000000000000000000000000..9ce39d66749cef22703ded22a4967cf6045bae7b --- /dev/null +++ b/app/Modules/Admin/Services/AdminService.php @@ -0,0 +1,13 @@ +model = $admin; + } +} diff --git a/app/Modules/Admin/Services/BannerService.php b/app/Modules/Admin/Services/BannerService.php new file mode 100644 index 0000000000000000000000000000000000000000..3a363f61515481fd606e29d9e2a69fa6742cbdf5 --- /dev/null +++ b/app/Modules/Admin/Services/BannerService.php @@ -0,0 +1,13 @@ +model = $banner; + } +} diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php new file mode 100644 index 0000000000000000000000000000000000000000..7829864bc00d2cd97ca139a35f7045f27263987e --- /dev/null +++ b/app/Modules/Admin/Services/BaseService.php @@ -0,0 +1,44 @@ +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(), + ]; + } + + 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); + } + + 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(); + } + } +} diff --git a/app/Modules/Admin/Services/ConfigService.php b/app/Modules/Admin/Services/ConfigService.php new file mode 100644 index 0000000000000000000000000000000000000000..3230b3884fb5ce6726c976fecba7c559268414e8 --- /dev/null +++ b/app/Modules/Admin/Services/ConfigService.php @@ -0,0 +1,13 @@ +model = $config; + } +} diff --git a/app/Modules/Admin/Services/FriendlinkService.php b/app/Modules/Admin/Services/FriendlinkService.php new file mode 100644 index 0000000000000000000000000000000000000000..492418a5f1866b681aee3b1f793f482302abef93 --- /dev/null +++ b/app/Modules/Admin/Services/FriendlinkService.php @@ -0,0 +1,13 @@ +model = $friendlink; + } +} diff --git a/app/Modules/Admin/Services/ProtocolService.php b/app/Modules/Admin/Services/ProtocolService.php new file mode 100644 index 0000000000000000000000000000000000000000..9e97a3808aa7cf246a4a830d3c3b0e4aaa53f248 --- /dev/null +++ b/app/Modules/Admin/Services/ProtocolService.php @@ -0,0 +1,13 @@ +model = $protocol; + } +} diff --git a/app/Modules/Admin/Services/VersionService.php b/app/Modules/Admin/Services/VersionService.php new file mode 100644 index 0000000000000000000000000000000000000000..1472806bd39a3e0dd95e4dc81ed82373785b97f7 --- /dev/null +++ b/app/Modules/Admin/Services/VersionService.php @@ -0,0 +1,13 @@ +model = $version; + } +} diff --git a/app/Scopes/DeleteScope.php b/app/Scopes/DeleteScope.php index 9486c5d2dfb6e8122bc180beeecf4f4e449f9d0e..6fe95f3d22e571c6385d328f3da15d6af4a467b1 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(); } /**