vali 6 éve
szülő
commit
9d2ef60d24
1 módosított fájl, 9 hozzáadás és 28 törlés
  1. 9 28
      application/service/controller/Login.php

+ 9 - 28
application/service/controller/Login.php

@@ -75,36 +75,18 @@ class Login extends Controller
         $verifySystem = isset($param['verifySystem']) ? $param['verifySystem'] : '';
         $verifySystemId = isset($param['verifySystemId']) ? $param['verifySystemId'] : '';
         $platformData = db('platform')->find();
-
-        if ($platformData['platform_status'] === 1) {
-            if (empty($verifySystem) === false) {
-                $appUserName = unlock_url($verifySystem, $platformData['platform_code']);
-                $verifyData = json_encode([
-                    'appUserName' => $appUserName,
-                    'userAccount' => $userAccount,
-                ], 256);
-                $verifyToken = lock_url($verifyData, $platformData['platform_code']);
-                $platformUrl = $platformData['platform_url_token'] . '?backSystem=' . $verifyToken . '&verifySystemId=' . $verifySystemId;
-                $backData = json_decode(make_request($platformUrl, ''), true);
-                if ($backData['code'] == 1) {
-                    return json(['code' => 100, 'data' => ['user' => $user[0]], 'msg' => '验证成功']);
-                }
-                return json($backData);
-            }
-
-            // 验证码验证.
-            $securityCode = isset($param['securityCode']) ? $param['securityCode'] : '';
-            $securityData = json_encode([
-                'platformUser' => $userAccount,
-                'code' => $securityCode,
+        if ($platformData['platform_status'] === 1 && empty($verifySystem) === false) {
+            $appUserName = unlock_url($verifySystem, $platformData['platform_code']);
+            $verifyData = json_encode([
+                'appUserName' => $appUserName,
+                'userAccount' => $userAccount,
             ], 256);
-            $securityToken = lock_url($securityData, $platformData['platform_code']);
-            $platformUrl = $platformData['platform_url_code'] . '?backSystem=' . $securityToken . '&platformCode=' . $platformData['platform_code'];
+            $verifyToken = lock_url($verifyData, $platformData['platform_code']);
+            $platformUrl = $platformData['platform_url_token'] . '?backSystem=' . $verifyToken . '&verifySystemId=' . $verifySystemId;
             $backData = json_decode(make_request($platformUrl, ''), true);
-            if ($backData['code'] != 1) {
-                return json(['code' => -2, 'data' => [], 'msg' => '验证码错误']);
+            if ($backData['code'] == 1) {
+                return json(['code' => 100, 'data' => ['user' => $user[0]], 'msg' => '验证成功']);
             }
-
             return json($backData);
         }
         
@@ -121,7 +103,6 @@ class Login extends Controller
             if ($backData['code'] != 1) {
                 return json(['code' => -2, 'data' => [], 'msg' => '验证码错误']);
             }
-
         }