up - token

app/api/http/middleware/LoginMiddleware.php

@@ -17,6 +17,7 @@ namespace app\api\http\middleware;
 
 
 use app\common\cache\UserTokenCache;
+use app\common\model\master_worker\MappingMworkerSession;
 use app\common\service\JsonService;
 use app\api\service\UserTokenService;
 use think\facade\Config;
@@ -34,6 +35,10 @@ class LoginMiddleware
     public function handle($request, \Closure $next)
     {
         $token = $request->header('token');
+        $mapSession = MappingMworkerSession::where([['type', '=', 2],['token', '=', $token], ['expire_time', '>', time()]])->findOrEmpty();
+        if(!$mapSession->isEmpty()) {
+            $mapSession->map_token && $token = $mapSession->map_token;
+        }
         //判断接口是否免登录
         $isNotNeedLogin = $request->controllerObject->isNotNeedLogin();
 

app/common/logic/PaymentLogic.php

@@ -342,7 +342,7 @@ class PaymentLogic extends BaseLogic
             return ['sn' => $order['sn'],'need_pay'=>0];
         }
 
-        $mapSession = MappingMworkerSession::where([['map_token', '=', $userInfo['token']], ['expire_time', '>', time()]])->findOrEmpty();
+        $mapSession = MappingMworkerSession::where([['type', '=', 1],['map_token', '=', $userInfo['token']], ['expire_time', '>', time()]])->findOrEmpty();
         if(!$mapSession->isEmpty()) {
             $token = '';
             $mapSession->token && $token = $mapSession->token;

app/workerapi/http/middleware/LoginMiddleware.php

@@ -35,7 +35,7 @@ class LoginMiddleware
     public function handle($request, \Closure $next)
     {
         $token = $request->header('token');
-        $mapSession = MappingMworkerSession::where([['token', '=', $token], ['expire_time', '>', time()]])->findOrEmpty();
+        $mapSession = MappingMworkerSession::where([['type', '=', 1],['token', '=', $token], ['expire_time', '>', time()]])->findOrEmpty();
         if(!$mapSession->isEmpty()) {
             $mapSession->map_token && $token = $mapSession->map_token;
         }