add master 0

lambq · Nov 3, 2016 · 5f0e58a · 5f0e58a
1 parent 9bb395b
commit 5f0e58a
Show file tree

Hide file tree

Showing 449 changed files with 13,537 additions and 5,310 deletions.
diff --git a/.env.example b/.env.example
@@ -38,4 +38,4 @@ github_redirect=xxxxxx
 
 qq_client_id=xxxxxx
 qq_client_secret=xxxxxx
-qq_redirect=xxxxxx
+qq_redirect=xxxxxx
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # 秀站分类目录
 
+[![For Laravel 5][badge_laravel]][link-github-repo]
+
 ## 有哪些模块？
 * 资讯文章管理模块
 * 目录网站管理模块
@@ -64,4 +66,18 @@
 ## 有bug反馈
 在使用中有任何问题，欢迎反馈给我，可以用以下联系方式跟我交流
 
-* qq群：55725231
+* qq群：55725231
+
+# License
+
+MIT
+
+[badge_laravel]:      https://img.shields.io/badge/laravel-5.*-green.svg
+[badge_lumen]:        https://img.shields.io/badge/lumen-5.*-green.svg
+[badge_stable]:       https://img.shields.io/packagist/v/overtrue/laravel-lang.svg
+[badge_unstable]:     https://img.shields.io/packagist/vpre/overtrue/laravel-lang.svg
+[badge_downloads]:    https://img.shields.io/packagist/dt/overtrue/laravel-lang.svg?maxAge=2592000
+[badge_license]:      https://img.shields.io/packagist/l/overtrue/laravel-lang.svg?maxAge=2592000
+
+[link-github-repo]:   https://github.com/overtrue/laravel-lang
+[link-packagist]:   https://packagist.org/packages/overtrue/laravel-lang
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -88,34 +88,26 @@ public function redirectToProvider($service)
     public function handleProviderCallback($service)
     {
         $user = Socialite::driver($service)->user();
-        
+
         if($service == 'github'){
             if(!$userinfo = User::where('email', $user->email )->first()){
-								if(!$userinfo = User::where('github_id', $user->id )->first()){
-									$userModel = new User;
-									$userModel->github_id = $user->id;
-									$userModel->email = $user->email;
-									$userModel->name = $user->name;
-									$userModel->avatar = $user->avatar_url;
-									$userModel->save();
-								}else{
-									$userData['github_id'] = $user->id;
-									if($userinfo->avatar != ''){
-										$userData['avatar'] = $user->avatar_url;
-									}
-									if($userinfo->name != ''){
-										$userData['name'] = $user->name;
-									}
-									User::where('github_id', $user->id )->update($userData);
-								}
+                if(!$userinfo = User::where('github_id', $user->id )->first()){
+                    $userModel = new User;
+                    $userModel->github_id = $user->id;
+                    $userModel->email = $user->email;
+                    $userModel->name = $user->name ? $user->name : $user->nickname ;
+                    $userModel->avatar = $user->avatar;
+                    $userModel->save();
+                }else{
+                    $userData['github_id'] = $user->id;
+                    $userData['avatar'] = $user->avatar;
+                    $userData['name'] = $user->name ? $user->name : $user->nickname ;
+                    User::where('github_id', $user->id )->update($userData);
+                }
             }else{
                 $userData['github_id'] = $user->id;
-                if($userinfo->avatar != ''){
-                    $userData['avatar'] = $user->avatar_url;
-                }
-                if($userinfo->name != ''){
-                    $userData['name'] = $user->name;
-                }
+                $userData['avatar'] = $user->avatar;
+                $userData['name'] = $user->name ? $user->name : $user->nickname ;
                 User::where('email', $user->email )->update($userData);
             }
             $userInstance = User::where('github_id',$user->id)->firstOrFail();
@@ -125,10 +117,30 @@ public function handleProviderCallback($service)
         }
 
         if($service == 'qq'){
-            return redirect('/login');
-        }
-
+            if(!$userinfo = User::where('email', $user->email )->first()){
+                if(!$userinfo = User::where('github_id', $user->id )->first()){
+                    $userModel = new User;
+                    $userModel->github_id = $user->id;
+                    $userModel->email = $user->email;
+                    $userModel->name = $user->name ? $user->name : $user->nickname ;
+                    $userModel->avatar = $user->avatar;
+                    $userModel->save();
+                }else{
+                    $userData['github_id'] = $user->id;
+                    $userData['avatar'] = $user->avatar;
+                    $userData['name'] = $user->name ? $user->name : $user->nickname ;
+                    User::where('github_id', $user->id )->update($userData);
+                }
+            }else{
+                $userData['github_id'] = $user->id;
+                $userData['avatar'] = $user->avatar;
+                $userData['name'] = $user->name ? $user->name : $user->nickname ;
+                User::where('email', $user->email )->update($userData);
+            }
+            $userInstance = User::where('github_id',$user->id)->firstOrFail();
+            Auth::login($userInstance);
 
-        // $user->token;
+            return redirect('/home');
+        }
     }
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -38,7 +38,6 @@
     Route::get('/ceshi', 'CeshiController@index');
 });
 
-
 Route::group(['as' => 'admin::'], function () {
     //自带登陆机制——扩展admin
     Route::get('admin/login', 'Admin\AuthController@showLoginForm');

diff --git a/composer.json b/composer.json
@@ -12,7 +12,8 @@
         "guzzlehttp/guzzle": "~5.3|~6.0",
         "overtrue/laravel-socialite": "~1.0",
         "stevenyangecho/laravel-u-editor": "~1.3",
-        "zgldh/qiniu-laravel-storage": "^0.4.2"
+        "zgldh/qiniu-laravel-storage": "^0.4.2",
+        "laravist/geecaptcha": "^1.1"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",