Merge branch 'jiang_fix_20210906' into test

application/services/user/UserService.php

@@ -33,12 +33,17 @@ class UserService
             throw new UserException(['cus' => 0]);
         }
 
-        //频率锁
-        $key = "wx_wechat_login".$params['code'];
+        $redis = RedisUtil::getInstance('cache');
+        $key = "wx_wechat_login_".$code;
+        $keyCode = "wx_wechat_login_code_".$code;
         $lock = FrequencyLockUtil::isLocked($key);
         if ($lock) {
-            FileLog::error("wechatLogin:请求频繁", json_encode($params, JSON_UNESCAPED_UNICODE),'','jianghaiming@yidian-inc.com');
-            throw new UserException(['cus' => 13]);
+            sleep(1);
+            $user = $redis->get($keyCode);
+            if (!empty($user)) {
+                $user = json_decode($user,true);
+            }
+            return $user;
         }
 
         //需要授权微信
@@ -109,7 +114,9 @@ class UserService
             $newWechatId = UserWechatBind::save($insert,['openid' => $openid]);
         }
 
+
         $user['third_session'] = self::generate3rdSession($openid);
+        $redis->set($keyCode, json_encode($user),10);
         return $user;       
     }