Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

miaomiao/www/js/controllers/account.js

@@ -30,37 +30,37 @@
                  //   console.log("Failed: " + JSON.stringify(error));
                  //});
                 $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                //userService.isTest().then(function(res){
-                //    if(res.data.data){
-                //        Wechat.auth(scope, state, function (response) {
-                //            // alert("response:"+JSON.stringify(response));
-                //            // var response={code:1231};
-                //           if(response.code){
-                //               msg.loading('登录中...');
-                //               userService.wechat_login(response.code).then(function(result){
-                //                   msg.hide();
-                //                    // alert("wechat_login success: " + JSON.stringify(result));
-                //                   if(result.data.data.user){
-                //                       storage.setObject('user', result.data.data.user);
-                //                       storage.set('token', result.data.data.token);
-                //                       $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
-                //                       $scope.user=storage.getObject('user');
-                //                       $state.go('app.home');
-                //                   }else{
-                //                       $state.go("loginAccount",{wechat:result.data.data.openid})
-                //                   }
-                //               },function(error){
-                //                    console.log("loginbywx Failed: " + JSON.stringify(error));
-                //                   $state.go("loginAccount");
-                //               });
-                //           }
-                //        }, function (error) {
-                //           console.log("Failed: " + JSON.stringify(error));
-                //        })
-                //    }else{
-                //        $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
-                //    }
-                //} )
+                userService.isTest().then(function(res){
+                   if(res.data.data){
+                       Wechat.auth(scope, state, function (response) {
+                           // alert("response:"+JSON.stringify(response));
+                           // var response={code:1231};
+                          if(response.code){
+                              msg.loading('登录中...');
+                              userService.wechat_login(response.code).then(function(result){
+                                  msg.hide();
+                                   // alert("wechat_login success: " + JSON.stringify(result));
+                                  if(result.data.data.user){
+                                      storage.setObject('user', result.data.data.user);
+                                      storage.set('token', result.data.data.token);
+                                      $http.defaults.headers.common["Authorization"] = 'Bearer ' + result.data.data.token;
+                                      $scope.user=storage.getObject('user');
+                                      $state.go('app.home');
+                                  }else{
+                                      $state.go("loginAccount",{wechat:result.data.data.openid})
+                                  }
+                              },function(error){
+                                   console.log("loginbywx Failed: " + JSON.stringify(error));
+                                  $state.go("loginAccount");
+                              });
+                          }
+                       }, function (error) {
+                          console.log("Failed: " + JSON.stringify(error));
+                       })
+                   }else{
+                       $state.go("loginAccount",{wechat:'orrk51inhmfmQRXA8VvGEQfow3Es'});
+                   }
+                } )
 
             }
     }]);

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -101,13 +101,14 @@ class AuthController extends Controller
 //        $openid='';
 //        if(!$arr['errcode'])$openid = $arr['openid'];
         \Log::info('openid: ' . $wechat);
+        $user = UserInfoModel::where('wechat',$wechat)->first();
 
         $jpush = $request->jpush;
         $key = $this->keySmsCode . $phone;
         $code = Cache::store('file')->get($key);
         $password = 123456;
         if ($request->verify_code != $code) return $this->error(ErrorCode::SERVICE_CODE_FAILED);
-        $user = UserInfoModel::where('phone',$phone)->first();
+        if(empty($user))$user = UserInfoModel::where('phone',$phone)->first();
         if (empty($user)) {
             $user = UserInfoModel::create([
                 'phone'=>$phone,
@@ -120,6 +121,7 @@ class AuthController extends Controller
         }else{
             //用户已经存在，重新绑定
             $user->wechat=$wechat;
+            $user->phone=$phone;
             $user->password=bcrypt(123456);
             $user->save();
         }
@@ -192,12 +194,24 @@ class AuthController extends Controller
         $arr = json_decode($res, true);
         $openid='';
         if(!isset($arr['errcode']))$openid = $arr['openid'];
+        if(!empty($openid)){
+            $url = "https://api.weixin.qq.com/sns/userinfo?access_token=".$arr['access_token']."&openid=".$openid."&lang=zh_CN";
+            $userInfoJson = file_get_contents($url);     //file_get_contents获取指定路由返回的数据
+            $userInfo = json_decode($userInfoJson, true);
+            \Log::info('userInfo: ' . $userInfoJson);
+        }
         \Log::info('openid: ' . $openid);
         if($openid!='')$user = UserInfoModel::where('wechat',$openid)->first();
         \Log::info($user);
         if (empty($user)) {
             \Log::info('empty: ' . empty($user));
-//            return $this->error(ErrorCode::LOGIN_FAILED);
+            UserInfoModel::create([
+                'wechat'=>$openid,
+                'nickname'=>$userInfo['nickname'],
+                'nickname'=>$userInfo['avatar'],
+                'status'=>1,
+                'password'=>bcrypt(123456)
+            ]);
             return $this->api(['openid' => $openid]);
         }else{
             $token = $user->createToken($user->phone)->accessToken;