Weenier utc项目部署 0625

app/Http/Controllers/Api/LoginController.php

@@ -28,21 +28,18 @@ class LoginController extends webApp
             return message($params, true);
         }
 
-        // 获取授权TOKEN
-        $jwt = new Jwt('jwt_app');
-        $token = $jwt->getToken($userId, 3);
-
-        // 结果返回
-        $result = [
-            'access_token' => $token,
-            'info'=> $this->userInfo,
-        ];
+        if(!$result = MemberService::make()->login($params)){
+            return message(MemberService::getError(), true);
+        }
 
-        // 用户信息
-        RedisService::set("auths:info:{$userId}", $this->userInfo, 4*24*3600);
-        return message('获取授权成功', true, $result);
+        return message(2004, true, $result);
     }
 
+    /**
+     * 账号注册
+     * @param MemberValidator $validator
+     * @return array
+     */
     public function register(MemberValidator  $validator)
     {
         $params = request()->all();
@@ -55,9 +52,11 @@ class LoginController extends webApp
             return message(1017, true);
         }
 
-        if(MemberService::make()->register($params)){
+        if(!MemberService::make()->register($params)){
             return message(MemberService::getError());
         }
+
+        return message(2008);
     }
 
     /**

app/Services/Api/MemberService.php

@@ -14,6 +14,7 @@ use App\Helpers\Jwt;
 use App\Models\ActionLogModel;
 use App\Models\UserModel;
 use App\Services\BaseService;
+use App\Services\RedisService;
 use Illuminate\Support\Facades\Validator;
 
 /**
@@ -51,14 +52,21 @@ class MemberService extends BaseService
             return true;
         }
 
+        $this->error = 2007;
         return false;
     }
 
+    /**
+     * 用户登录
+     * @param $params
+     * @return array|false
+     */
     public function login($params)
     {
         $username = isset($params['username'])? $params['username'] : '';
         $password = isset($params['password'])? $params['password'] : '';
         if(empty($username) || empty($password)){
+            $this->error = 1013;
             return false;
         }
 
@@ -87,8 +95,9 @@ class MemberService extends BaseService
         ActionLogModel::record($info);
 
         // JWT生成token
-        $jwt = new Jwt();
+        $jwt = new Jwt('jwt_app');
         $token = $jwt->getToken($info['id']);
+        RedisService::set("stores:auths:info:{$info['id']}", $info, 5, 10);
 
         // 登录数据
         return [