Merge branch 'develop' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Http/Controllers/Api/V1/CommonController.php

@@ -24,6 +24,8 @@ class CommonController extends Controller
         $req = request()->post();
         $this->validate(request(), [
             'wechat_code' => 'required',
+            'iv' => 'required',
+            'encryptData' => 'required',
             'phone|手机号' => 'max:20',
             'verify_code|验证码' => 'integer',
             'nickname|昵称' => 'max:50',
@@ -53,8 +55,8 @@ class CommonController extends Controller
 
         $session_key = !empty($data['session_key']) ? $data['session_key'] : '';
         $user = User::select(['id', 'status', 'phone', 'nickname', 'avatar'])->where('openid', $data['openid'])->first();
-        if($req['iv'] && $req['encryptData']) {
-            $decryptedData = $app->encryptor->decryptData($data['session_key'], $req['iv'], $req['encryptData']);
+        if(!empty($req['iv']) && !empty($req['encryptData'])) {
+            $decryptedData = $app->encryptor->decryptData($session_key, $req['iv'], $req['encryptData']);
             \Log::info($decryptedData);
             if(isset($decryptedData['unionId']))$data['unionid'] = $decryptedData['unionId'];
         }