cqpCow 1 år sedan
förälder
incheckning
3c23ea7c24

+ 0 - 28
app/Http/Controllers/Api/LoginController.php

@@ -4,19 +4,10 @@ namespace App\Http\Controllers\Api;
 use App\Service\EmployeeService;
 use App\Service\TokenService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 
 //登录
 class LoginController extends BaseController
 {
-    const MOBILE = '[mobile]';// 手机端
-    const PERSONAL_COMPUTER = '[personalComputer]';// 电脑端
-
-    public static $port = [
-        self::MOBILE => '',
-        self::PERSONAL_COMPUTER => '',
-    ];
-
     public function login(Request $request){
         $data = $request->only("account","password");
 
@@ -25,28 +16,9 @@ class LoginController extends BaseController
         list($bool, $return) = $result;
         if(! $bool) return $this->json_return(201,'',$return);
 
-        //日志
-        $res = Log::channel('login')->info("登录成功", $return);
-
         //生成token
         $jwtToken = TokenService::getToken($return['id']);
-        $jwtToken = self::PERSONAL_COMPUTER . $jwtToken;
 
         return $this->json_return(200,'', ['token' => $jwtToken, 'emp_name'=>$return['name']]);
     }
-
-    public function loginMobile(Request $request){
-        $data = $request->only("account","password");
-
-        //登录
-        $result = (new EmployeeService())->loginRule($data);
-        list($bool, $return) = $result;
-        if(! $bool) return $this->json_return(201,'',$return);
-
-        //生成token
-        $jwtToken = TokenService::getToken($return['id']);
-        $jwtToken = self::MOBILE . $jwtToken;
-
-        return $this->json_return(200,'', ['token' => $jwtToken]);
-    }
 }

+ 0 - 8
app/Http/Middleware/CheckLogin.php

@@ -23,14 +23,6 @@ class CheckLogin
             return  response()->json(['code'=>1,'msg'=>'缺少token','data'=>null]);
         }
 
-        //登录来源前缀清除
-        foreach (LoginController::$port as $key => $value){
-            if (strpos($token,$key) !== false) {
-                $token = str_replace($key, $value, $token);
-                break;
-            }
-        }
-
         //校验token
         $result = TokenService::verifyToken($token);
         if ($result < 0){

+ 4 - 4
app/Service/TokenService.php

@@ -7,7 +7,7 @@ use Firebase\JWT\Key;
 
 class TokenService
 {
-    const key = "jf2.0"; //签发人  可空
+    const key = "xyzx"; //签发人  可空
     const validity = 8640000; //有效期
     const error = [
         -1 => "签名不正确",
@@ -27,12 +27,12 @@ class TokenService
         $token = array(
             "iat"=> time(), //签发时间
             "nbf"=> time() - 1, //生效时间  (立即生效)
-            "exp"=> time() + TokenService::validity,
+            "exp"=> time() + self::validity,
             "data"=> [
                 'user_id' => $userId
             ]
         );
-        return JWT::encode($token,TokenService::key,"HS256");
+        return JWT::encode($token,self::key,"HS256");
     }
 
     /**
@@ -45,7 +45,7 @@ class TokenService
     public static function verifyToken($token){
         try {
             JWT::$leeway = 60;//当前时间减去60,把时间留点余地,同步其他服务器时间,解决nbf字段验证不通过问题
-            $decoded = JWT::decode($token,new Key(TokenService::key, "HS256")); //HS256方式,这里要和签发的时候对应
+            $decoded = JWT::decode($token,new Key(self::key, "HS256")); //HS256方式,这里要和签发的时候对应
 
             $arr = (array)$decoded;
             return $arr['data']->user_id;