'修改登陆验证'

application/service/controller/Login.php

@@ -81,8 +81,11 @@ class Login extends Controller
             ], 256);
             $verifyToken = lock_url($verifyData, $platformData['platform_code']);
             $platformUrl = $platformData['platform_url_token'].'?backSystem='.$verifyToken.'&verifySystemId='.$verifySystemId;
-            $backData = make_request($platformUrl, '');
-            return $backData;
+            $backData = json_decode(make_request($platformUrl, ''), true);
+            if ($backData['code'] == 1) {
+                return json(['code' => 100, 'data' => ['user' => $user[0]], 'msg' => '验证成功']);
+            }
+            return json($backData);
         }
 
         // 验证码验证.
@@ -92,10 +95,10 @@ class Login extends Controller
             'code' => $securityCode,
         ], 256);
         $securityToken = lock_url($securityData, $platformData['platform_code']);
-        $platformUrl = $platformData['platform_url_code'].'?backSystem='.$securityToken.'&verifySystemId='.$verifySystemId;
+        $platformUrl = $platformData['platform_url_code'].'?backSystem='.$securityToken.'&platformCode='.$platformData['platform_code'];
         $backData = json_decode(make_request($platformUrl, ''), true);
         if ($backData['code'] != 1) {
-            return json(['code' => 2, 'data' => [], 'msg' => '验证码错误']);
+            return json(['code' => -2, 'data' => [], 'msg' => '验证码错误']);
         }
 
         $this->assign([

application/service/model/ServiceLog.php

@@ -27,7 +27,7 @@ class ServiceLog extends Model
         if (empty($join) === false) {
             $result = $result->alias('a');
             foreach ($join as $k => $v) {
-                $result = $result->join($k, $v);
+                $result = $result->join($k, $v, 'left');
             }
         }