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

实验性分离 Validate 和 Request

Browse Source
This commit is contained in:
yanwenwu
2018-11-29 22:44:16 +08:00
parent 105b80e968
commit e957f9f474
10 changed files with 134 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,6 @@
<?php
namespace app\admin\controller;
use think\Exception;
use think\permissions\facade\Roles;
use app\validates\RoleValidate;
use think\permissions\facade\Permissions;

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

@@ -3,7 +3,7 @@
namespace app\admin\controller;
use app\model\UserModel;
use app\validates\UserValidate;
use app\admin\request\UserRequest;
use think\permissions\facade\Roles;
class User extends Base
@@ -29,13 +29,10 @@ class User extends Base
* @time at 2018年11月12日
* @return mixed|string
*/
public function create(UserModel $userModel, UserValidate $validate)
public function create(UserModel $userModel, UserRequest $request)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
if ($request->isPost()) {
$data = $request->post();
$data['password'] = generatePassword($data['password']);
if ($userId = $userModel->store($data)) {
// 分配角色
@@ -55,13 +52,10 @@ class User extends Base
* @time at 2018年11月12日
* @return mixed|string
*/
public function edit(UserModel $userModel, UserValidate $validate)
public function edit(UserModel $userModel, UserRequest $request)
{
if ($this->request->isPost()) {
$data = $this->request->post();
if ($err = $validate->getErrors($data)) {
$this->error($err);
}
if ($request->isPost()) {
$data = $request->post();
$this->giveRoles($userModel, $data['id'], $data);
$data['password'] = generatePassword($data['password']);
$userModel->updateBy($data['id'], $data) ? $this->success('修改成功', url('user/index')) : $this->error('修改失败');