Merge branch 'usweb' of github.com:dongxie/uswebapi into usweb

app/Game/Logics/SendCodeLogic.php

@@ -232,11 +232,11 @@ class SendCodeLogic extends BaseApiLogic
     {
 
         // 如果之前发送过验证码并且还没使用，还返回之前的验证码
-        $query = DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
-            ->where('PhoneNum', $phone)
-            ->first();
-
-        if ($query) return $query->Code;
+//        $query = DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
+//            ->where('PhoneNum', $phone)
+//            ->first();
+//
+//        if ($query) return $query->Code;
 
 
         $length = $this->config['lengthNum'] ?: 4;

app/Game/WebChannelConfig.php

@@ -99,16 +99,16 @@ class WebChannelConfig extends Model
     {
         $cacheKey = self::$key . $channel;
 
-//        $cachedConfig = Redis::get($cacheKey);
+        $cachedConfig = Redis::get($cacheKey);
 
-//        if ($cachedConfig) {
-//            return new self(json_decode($cachedConfig,true));
-//        }
+        if ($cachedConfig) {
+            return new self(json_decode($cachedConfig,true));
+        }
 
         $config = self::where('Channel', $channel)->first();
 
         if ($config) {
-            Redis::setex($cacheKey, 30, $config->toJson());
+            Redis::setex($cacheKey, 300, $config->toJson());
         }
 
         return $config;

app/Http/Controllers/Game/LoginController.php

@@ -138,7 +138,7 @@ class LoginController extends Controller
         if ($first) {
             SetNXLock::release($redisKey);
             Log::info('web.verify.already_bound',[$Phone,$PhoneCode]);
-            return apiReturnFail(['web.verify.already_bound', 'O número de telefone foi vinculado']); // 电话号码已绑定
+            return apiReturnFail(['web.verify.already_bound', 'O número de telefone foi vinculado'],GlobalUserInfo::getGameUserInfoToWeb('UserID',$first->UserID)); // 电话号码已绑定
         }
 
         if (!is_numeric($PhoneCode)) {
@@ -784,7 +784,7 @@ class LoginController extends Controller
 
                     return $isExist;
                 }
-                return apiReturnFail(['web.reg.fail_phone_exist', 'O número de telefone já existe, altere-o e tente se cadastrar novamente!']);
+                return apiReturnFail(['web.reg.fail_phone_exist', 'O número de telefone já existe, altere-o e tente se cadastrar novamente!'],GlobalUserInfo::toWebData($isExist));
             }
         }
         return $Phone;

app/Http/Controllers/Game/SendCodeController.php

@@ -32,7 +32,7 @@ class SendCodeController
             return apiReturnFail(['web.user.phone_fail', 'Not correct phone number'], '', 422);
         }
 
-        $LocationCode = $request->country ?? env('COUNTRY_CODE',55);
+        $LocationCode = $request->country ?? env('COUNTRY_CODE',1);
 
         $user=$request->user();
         if($user){
@@ -40,7 +40,8 @@ class SendCodeController
             $Channel=$user->Channel;
         }
 
-        $Type = $request->Type ?: 0;    // 标识 1找回密码
+//        $Type = $request->Type ?: 0;    // 标识 1找回密码
+        $Type = 2;//无论是否存在都发code
         $ip = $request->ip();
 
 

app/Models/GamePhoneVerityCode.php

@@ -4,6 +4,7 @@
 namespace App\Models;
 
 
+use App\Game\WebChannelConfig;
 use App\Util;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
@@ -14,30 +15,16 @@ class GamePhoneVerityCode extends Model
     {
 
         $now = date('Y-m-d H:i:s');
-        $query = DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
-            ->where('PhoneNum',$PhoneNum)
-            ->exists();
-
-
-        $pack=Util::getPackageByURL();
-        ///// 如果发送过验证码，直接返回，更新手机号和过期时间
-        if ($query) {
-            DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
-                ->where('PhoneNum',$PhoneNum)
-                ->update(['UserID'=>$UserID,'Code'=>$Code,'CreateDate'=>$now,'Channel'=>$pack['channel']]);
-
-        }else{
-            $data = [
-                'UserID' => $UserID,
-                'PhoneNum' => $PhoneNum,
-                'Code' => $Code,
-                'CreateDate' => $now,
-                'Ip' => $Ip,
-                'Channel'=>$pack['channel']
-            ];
-            DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
-                ->updateOrInsert(['PhoneNum'=>"$PhoneNum"],$data);
-        }
+        $data = [
+            'UserID' => $UserID,
+            'PhoneNum' => $PhoneNum,
+            'Code' => $Code,
+            'CreateDate' => $now,
+            'Ip' => $Ip,
+            'Channel'=>AccountsInfo::query()->where('UserID',$UserID)->value('Channel'),
+        ];
+        DB::connection('write')->table('QPTreasureDB.dbo.GamePhoneVerityCode')
+            ->updateOrInsert(['PhoneNum'=>"$PhoneNum"],$data);
 
         return true;
     }