|
@@ -83,7 +83,7 @@ class Login extends Controller
|
|
|
'userAccount' => $userAccount,
|
|
'userAccount' => $userAccount,
|
|
|
], 256);
|
|
], 256);
|
|
|
$verifyToken = lock_url($verifyData, $platformData['platform_code']);
|
|
$verifyToken = lock_url($verifyData, $platformData['platform_code']);
|
|
|
- $platformUrl = $platformData['platform_url_token'] . '?backSystem=' . $verifyToken . '&verifySystemId=' . $verifySystemId;
|
|
|
|
|
|
|
+ $platformUrl = $platformData['platform_url_token'] . '?backSystem=' . $verifyToken . '&verifySystemId=' . $verifySystemId.'&platformCode=' . $platformData['platform_code'];
|
|
|
$backData = json_decode(make_request($platformUrl, ''), true);
|
|
$backData = json_decode(make_request($platformUrl, ''), true);
|
|
|
if ($backData['code'] == 1) {
|
|
if ($backData['code'] == 1) {
|
|
|
return json(['code' => 100, 'data' => ['user' => $user[0]], 'msg' => '验证成功','data'=> $platformUrl]);
|
|
return json(['code' => 100, 'data' => ['user' => $user[0]], 'msg' => '验证成功','data'=> $platformUrl]);
|
|
@@ -106,8 +106,7 @@ class Login extends Controller
|
|
|
return json(['code' => -2, 'data' => [], 'msg' => '验证码错误']);
|
|
return json(['code' => -2, 'data' => [], 'msg' => '验证码错误']);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return json(['code' => -2, 'data' => $backData, 'msg' => '验证码错误555']);
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
$this->assign([
|
|
$this->assign([
|
|
|
'token' => $token,
|
|
'token' => $token,
|
|
|
'user_name' => $user[0]['user_name'],
|
|
'user_name' => $user[0]['user_name'],
|
xiang