1

application/api/controller/User.php

@@ -35,8 +35,8 @@ class User extends Base
     public function login()
     public function login()
     {
     {
         $jscode = input("post.code");
         $jscode = input("post.code");
-//        $signature     = input("post.signature");
-//        $rawData       = input("post.rawData");
+        //        $signature     = input("post.signature");
+        $rawData       = json_decode(input("post.rawData"), true);
         $encryptedData = input("post.encryptedData");
         $encryptedData = input("post.encryptedData");
         $iv            = input('post.iv');
         $iv            = input('post.iv');
 
 
@@ -55,49 +55,44 @@ class User extends Base
         $session_key = $response->session_key;
         $session_key = $response->session_key;
         $openid      = $response->openid;
         $openid      = $response->openid;
 
 
-        // 解密加密数据
-        include_once VENDOR_PATH . 'aesphp/wxBizDataCrypt.php';
-        $pc      = new \WXBizDataCrypt($appId, $session_key);
-        $errCode = $pc->decryptData($encryptedData, $iv, $data);
-
-        if ($errCode == 0) {
-            $data = json_decode($data);
-            $user = UserModel::where(['openid' => $data->openId])->find();
-            if ($user) {
-                //更新
-                // 省份和城市
-                $user->city     = $data->city;
-                $user->province = $data->province;
-                //ip
-                $user->ip = request()->ip();
-                $user->save();
-                // 登录成功
+        // 解密加密数据(已失效)
+        // include_once VENDOR_PATH . 'aesphp/wxBizDataCrypt.php';
+        // $pc      = new \WXBizDataCrypt($appId, $session_key);
+        // $errCode = $pc->decryptData($encryptedData, $iv, $data);
+
+        $user = UserModel::where(['openid' => $response->openid])->find();
+        if ($user) {
+            //更新
+            // 省份和城市
+            $user->city     = isset($rawData['city']) ? $rawData['city'] : '';
+            $user->province = isset($rawData['province']) ? $rawData['province'] : '';
+            //ip
+            $user->ip = request()->ip();
+            $user->save();
+            // 登录成功
+            $token = $this->usertoken($user);
+            return ["code" => 0, "msg" => "登录成功", "token" => $token, "user" => $user];
+        } else {
+            //第一次注册
+            $user           = new UserModel;
+            $user->openid   = $response->openid;
+            $user->nickname = isset($rawData['nickName']) ? $rawData['nickName'] : '';
+            // 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知
+            $user->gender = isset($rawData['gender']) ? $rawData['gender'] : '';
+            $user->avatar = isset($rawData['avatarUrl']) ? $rawData['avatarUrl'] : '';
+            $user->is_vip = 0;  // 0非会员 1会员 默认为非会员
+            // 省份和城市
+            $user->city     = isset($rawData['city']) ? $rawData['city'] : '';
+            $user->province = isset($rawData['province']) ? $rawData['province'] : '';
+            //ip
+            $user->ip = request()->ip();
+            if ($user->save()) {
+                // 注册成功
                 $token = $this->usertoken($user);
                 $token = $this->usertoken($user);
-                return ["code" => 0, "msg" => "登录成功", "token" => $token, "user" => $user];
+                return ["code" => 0, "msg" => "注册成功", "token" => $token, "user" => $user];
             } else {
             } else {
-                //第一次注册
-                $user           = new UserModel;
-                $user->openid   = $data->openId;
-                $user->nickname = $data->nickName;
-                // 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知
-                $user->gender = intval($data->gender);
-                $user->avatar = $data->avatarUrl;
-                $user->is_vip = 0;  // 0非会员 1会员 默认为非会员
-                // 省份和城市
-                $user->city     = $data->city;
-                $user->province = $data->province;
-                //ip
-                $user->ip = request()->ip();
-                if ($user->save()) {
-                    // 注册成功
-                    $token = $this->usertoken($user);
-                    return ["code" => 0, "msg" => "注册成功", "token" => $token, "user" => $user];
-                } else {
-                    return ["code" => 1, "msg" => "注册失败"];
-                }
+                return ["code" => 1, "msg" => "注册失败"];
             }
             }
-        } else {
-            return ["code" => 1, "msg" => "注册失败，请重试！"];
         }
         }
     }
     }
 
 
@@ -463,5 +458,4 @@ class User extends Base
         // $user->save();
         // $user->save();
         return ['code' => 0, 'msg' => '更新成功', 'avatar_url' => $url];
         return ['code' => 0, 'msg' => '更新成功', 'avatar_url' => $url];
     }
     }
-
 }
 }