增加注册，并修改权限初始化数据

Author: linyiyuan

app/Command/InitCommand.php

@@ -64,9 +64,16 @@ public function handle()
             'description' => '普通管理员'
         ];
 
+        $tourist_role = [
+            'name' => 'tourist_admin',
+            'guard_name' => 'web',
+            'description' => '游客'
+        ];
+
         //创建默认的两个角色
         $super_role = Role::create($super_role);
         $default_role = Role::create($default_role);
+        $tourist_role = Role::create($tourist_role);
 
         //创建权限
         $permissionList = config('permissionData.permission_list');

app/Constants/StatusCode.php

@@ -96,6 +96,17 @@ class StatusCode extends AbstractConstants
      */
     const ERR_USER_DISABLE= 2005;
 
+    /**
+     * @Message("用户名已经被使用！")
+     */
+    const ERR_USER_EXIST= 2006;
+
+
+    /**
+     * @Message("注册失败！")
+     */
+    const ERR_REGISTER_ERROR = 2007;
+
 
     /**
      * @Message("业务逻辑异常！")

app/Controller/Auth/LoginController.php

@@ -61,6 +61,53 @@ public function login()
         return $this->success($responseData);
     }
 
+    /**
+     * 注册操作
+     * @RequestMapping(path="register", methods="post")
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function register()
+    {
+        $params = [
+            'username' =>  $this->request->input('username') ?? '',
+            'password' => $this->request->input('password') ?? '',
+            'password_confirmation' => $this->request->input('password_confirmation') ?? '',
+            'desc' => $this->request->input('desc') ?? '',
+            'code_key' => $this->request->input('code_key') ?? '',
+            'captcha' => $this->request->input('captcha') ?? '',
+        ];
+        $rules = [
+            'username' => 'required|min:4|max:18|unique:users',
+            'password' => 'required|min:6|max:18|confirmed:password_confirmation',
+            'password_confirmation' => 'required|min:6|max:18',
+            'desc' => 'required',
+            'code_key' => 'required',
+            'captcha' => 'required',
+        ];
+        $message = [
+            'username.required' => ' username 缺失',
+            'username.unique' => '该用户名已经存在',
+            'username.min' => '[username]最少4位',
+            'username.max' => '[username]最多18位',
+            'desc.required' => ' desc 缺失',
+            'password.required' => ' password 缺失',
+            'password_confirmation.required' => ' password 缺失',
+            'password.min' => ' password 最少6位数',
+            'password_confirmation.min' => ' password 最少6位数',
+            'password.max' => ' password 最多18位数',
+            'password_confirmation.max' => ' password 最多18位数',
+            'code_key.required' => '验证码KEY缺失',
+            'captcha.required' => '验证码缺失',
+        ];
+        $this->verifyParams($params, $rules, $message);
+
+        $result = LoginService::getInstance()->register($params);
+        if (!$result) $this->throwExp(StatusCode::ERR_REGISTER_ERROR, '注册失败');
+
+        return $this->successByMessage('注册成功, 跳转登陆中...');
+    }
+
+
     /**
      * 初始化操作
      * @RequestMapping(path="initialization", methods="get")

app/Service/Auth/LoginService.php

@@ -8,6 +8,7 @@
 use App\Model\Auth\Permission;
 use App\Model\Auth\User;
 use App\Model\System\LoginLog;
+use Hyperf\DbConnection\Db;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Utils\ApplicationContext;
 use Phper666\JWTAuth\JWT;
@@ -73,6 +74,38 @@ public function login(array $params) : array
         return $responseData;
     }
 
+    /**
+     * 处理注册逻辑
+     * @param array $params
+     * @return array
+     */
+    public function register(array $params) : bool
+    {
+        //校验验证码 若是测试环境跳过验证码验证
+        if (env('APP_TEST')) {
+            $container = ApplicationContext::getContainer();
+            $redis = $container->get(\Hyperf\Redis\Redis::class);
+            $code = $redis->get($params['code_key']);
+            if (strtolower($params['captcha']) != strtolower($code)) $this->throwExp(StatusCode::ERR_CODE, '验证失败，验证码错误');
+        }
+        $postData = $this->request->all();
+
+        $user = new User();
+        $user->username = $postData['username'];
+        $user->password = md5($postData['password']);
+        $user->status = User::STATUS_ON;
+        $user->avatar = 'http://landlord-res.oss-cn-shenzhen.aliyuncs.com/admin_face/face' . rand(1,10) .'.png';
+        $user->last_login = time();
+        $user->last_ip = getClientIp($this->request);
+        $user->creater = '无';
+        $user->desc = $postData['desc'] ?? '';
+        $user->sex = User::SEX_BY_Female;
+
+        if (!$user->save()) $this->throwExp(StatusCode::ERR_EXCEPTION, '注册用户失败');
+        $user->assignRole('tourist_admin');
+        return true;
+    }
+
     /**
      * 登陆初始化，获取用户信息以及一些权限菜单
      * @return mixed