jf2.0

app/Http/Controllers/Api/LoginController.php

@@ -9,6 +9,14 @@ 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");
 
@@ -22,7 +30,23 @@ class LoginController extends BaseController
 
         //生成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]);
+    }
 }

app/Http/Middleware/CheckLogin.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Http\Controllers\Api\LoginController;
 use App\Service\EmployeeService;
 use Closure;
 use App\Service\TokenService;
@@ -21,6 +22,15 @@ class CheckLogin
         if (!isset($token)){
             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){

app/Service/EmployeeService.php

@@ -385,7 +385,7 @@ class EmployeeService extends Service
 
         $res = reset($res);
         if(! Hash::check($data['password'], $res['password'])) return [false,'密码错误！'];
-        if($res['is_admin'] != Employee::IS_ADMIN) return [false,'非管理员账号！'];
+        if($res['is_admin'] != Employee::IS_ADMIN) return [false,'该账号不能登录！'];
         if($res['state'] == Employee::NOT_USE) return [false,'账号停用！'];
 
         return [true, ['id'=>$res['id'], 'name'=>$res['emp_name'], 'account' => $res['account']]];

routes/api.php

@@ -18,6 +18,7 @@ Route::middleware('auth:api')->get('/user', function (Request $request) {
 });
 
 Route::any('login', 'Api\LoginController@login');
+Route::any('loginMobile', 'Api\LoginController@loginMobile');
 Route::any('test', 'Api\TestController@aa');
 Route::any('getHeaderWord', 'Api\HeaderWordController@getHeaderWord');
 Route::group(['middleware'=> ['checkLogin']],function ($route){