0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validate 分离 controller

Browse Source
This commit is contained in:
yanwnewu
2018-11-30 09:56:27 +08:00
parent e957f9f474
commit 430e466e12
9 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/admin/controller/Permission.php
View File

@@ -3,7 +3,7 @@ namespace app\admin\controller;
use think\Collection;
use think\permissions\facade\Permissions;
use app\validates\PermissionValidate;
use app\admin\request\PermissionRequest;
use app\service\MenuService;
class Permission extends Base
@@ -20,13 +20,10 @@ class Permission extends Base
* @time at 2018年11月13日
* @return mixed|string
*/
public function create(PermissionValidate $validate, MenuService $menuService)
public function create(PermissionRequest $request, MenuService $menuService)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
if ($request->isPost()) {
$data = $request->post();
Permissions::store($data) ? $this->success('添加成功', url('permission/index')) : $this->error('添加失败');
}
@@ -41,13 +38,10 @@ class Permission extends Base
* @time at 2018年11月13日
* @return mixed|string
*/
public function edit(PermissionValidate $validate, MenuService $menuService)
public function edit(PermissionRequest $request, MenuService $menuService)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
if ($request->isPost()) {
$data = $request->post();
Permissions::updateBy($data['id'], $data) !== false ? $this->success('编辑成功', url('permission/index')) : $this->error('');
}
$permissionId = $this->request->param('id');

20
application/admin/controller/Role.php
View File

@@ -2,7 +2,7 @@
namespace app\admin\controller;
use think\permissions\facade\Roles;
use app\validates\RoleValidate;
use app\admin\request\RoleRequest;
use think\permissions\facade\Permissions;
use app\service\MenuService;
@@ -20,14 +20,10 @@ class Role extends Base
* @time at 2018年11月13日
* @return mixed|string
*/
public function create(RoleValidate $validate)
public function create(RoleRequest $request)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
Roles::store($data) ? $this->success('创建成功', url('role/index')) : $this->error('创建失败');
if ($request->isPost()) {
Roles::store($request->post()) ? $this->success('创建成功', url('role/index')) : $this->error('创建失败');
}
return $this->fetch();
}
@@ -38,14 +34,10 @@ class Role extends Base
* @time at 2018年11月13日
* @return mixed|string
*/
public function edit(RoleValidate $validate)
public function edit(RoleRequest $request)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
Roles::updateBy($data['id'], $data) !== false ? $this->success('编辑成功', url('role/index')) : $this->error('编辑失败');
Roles::updateBy($request->post('id'), $request->post()) !== false ? $this->success('编辑成功', url('role/index')) : $this->error('编辑失败');
}
$this->role = Roles::getRoleBy($this->request->param('id'));

1
application/admin/controller/User.php
View File

@@ -34,6 +34,7 @@ class User extends Base
if ($request->isPost()) {
$data = $request->post();
$data['password'] = generatePassword($data['password']);
if ($userId = $userModel->store($data)) {
// 分配角色
$this->giveRoles($userModel, $userId, $data);