merge geetest & recaptcha

.env.example

@@ -2,7 +2,7 @@ APP_DEMO=false
 APP_NAME=ssrpanel
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=http://localhost
 APP_TIMEZONE=Asia/Shanghai
 APP_LOCALE=zh-CN

app/Components/CaptchaVerify.php

@@ -2,23 +2,20 @@
 
 namespace App\Components;
 
-use Illuminate\Http\Request;
-
 /**
  * Class CaptchaVerify 验证码
  *
  * @package App\Components
  */
-
-Class CaptchaVerify 
+Class CaptchaVerify
 {
     /**
      * 从后台获取 Geetest_id 和 Geetest_key
      */
-    public static function geetestCaptchaGetConfig() 
+    public static function geetestCaptchaGetConfig()
     {
         return [
-            "geetest_id" => Helpers::systemConfig()["geetest_id"],
+            "geetest_id"  => Helpers::systemConfig()["geetest_id"],
             "geetest_key" => Helpers::systemConfig()["geetest_key"]
         ];
     }
@@ -26,11 +23,11 @@ Class CaptchaVerify
     /**
      * 从后台获取 google_captcha_sitekey 和 google_captcha_secret
      */
-    public static function googleCaptchaGetConfig() 
+    public static function googleCaptchaGetConfig()
     {
         return [
             "sitekey" => Helpers::systemConfig()["google_captcha_sitekey"],
-            "secret" => Helpers::systemConfig()["google_captcha_secret"],
+            "secret"  => Helpers::systemConfig()["google_captcha_secret"],
             "options" => []
         ];
     }

app/Http/Controllers/AuthController.php

@@ -82,10 +82,10 @@ class AuthController extends Controller
                     break;
                 case 3:
                     // Google reCAPTCHA
-                    $result = $this->validate($request,[
+                    $result = $this->validate($request, [
                         'g-recaptcha-response' => 'required|NoCaptcha'
                     ]);
-                    
+
                     if (!$result) {
                         Session::flash('errorMsg', trans('login.fail_captcha'));
                         return Redirect::back()->withInput();
@@ -95,7 +95,7 @@ class AuthController extends Controller
                     # nothing..
                     break;
             }
-            
+
             // 验证账号并创建会话
             if (!Auth::attempt(['username' => $username, 'password' => $password], $remember)) {
                 Session::flash('errorMsg', '用户名或密码错误');
@@ -279,7 +279,7 @@ class AuthController extends Controller
                         break;
                     case 3:
                         // Google reCAPTCHA
-                        $result = $this->validate($request,[
+                        $result = $this->validate($request, [
                             'g-recaptcha-response' => 'required|NoCaptcha'
                         ]);
                         if (!$result) {
@@ -768,7 +768,7 @@ class AuthController extends Controller
      * 添加用户登录日志
      *
      * @param string $userId 用户ID
-     * @param string $ip     IP地址
+     * @param string $ip IP地址
      */
     private function addUserLoginLog($userId, $ip)
     {
@@ -816,7 +816,7 @@ class AuthController extends Controller
      * 获取AFF
      *
      * @param string $code 邀请码
-     * @param string $aff  URL中的aff参数
+     * @param string $aff URL中的aff参数
      *
      * @return array
      */

app/Http/Controllers/PaymentController.php

@@ -184,7 +184,7 @@ class PaymentController extends Controller
                     'return_raw'      => false
                 ], [
                     'body'     => '',
-                    'subject'  => self::$systemConfig['f2fpay_subject_name'], 
+                    'subject'  => self::$systemConfig['f2fpay_subject_name'],
                     'order_no' => $orderSn,
                     'amount'   => $amount,
                 ]);

app/Http/Controllers/SubscribeController.php

@@ -220,7 +220,7 @@ class SubscribeController extends Controller
                     "tls"  => $node['v2_tls'] ? "tls" : ""
                 ];
 
-                $scheme .= 'vmess://' . base64url_encode(json_encode($v2_json,JSON_PRETTY_PRINT)) . "\n";
+                $scheme .= 'vmess://' . base64url_encode(json_encode($v2_json, JSON_PRETTY_PRINT)) . "\n";
             }
         }
 

app/Http/Controllers/UserController.php

@@ -214,7 +214,7 @@ class UserController extends Controller
                     "path" => $node->v2_path,
                     "tls"  => $node->v2_tls == 1 ? "tls" : ""
                 ];
-                $v2_scheme = 'vmess://' . base64url_encode(json_encode($v2_json,JSON_PRETTY_PRINT));
+                $v2_scheme = 'vmess://' . base64url_encode(json_encode($v2_json, JSON_PRETTY_PRINT));
 
                 // 生成文本配置信息
                 $txt = "服务器：" . ($node->server ? $node->server : $node->ip) . "\r\n";

config/NoCaptcha.php

@@ -1,10 +1,10 @@
 <?php
 
 return [
-    'secret' => env('NOCAPTCHA_SECRET'),
-    'sitekey' => env('NOCAPTCHA_SITEKEY'),
+    'secret'            => env('NOCAPTCHA_SECRET'),
+    'sitekey'           => env('NOCAPTCHA_SITEKEY'),
     'server-get-config' => true,
-    'options' => [
+    'options'           => [
         'timeout' => 30,
     ],
 ];

resources/lang/en/login.php

@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'title'           => 'Sign In',
-    'tips'            => 'Please Enter Username and Password',
-    'username'        => 'Username',
-    'password'        => 'Password',
-    'captcha'         => 'Captcha',
-    'remember'        => 'Remember Me',
-    'forget_password' => 'Forget Password',
-    'login'           => 'Sign In',
-    'register'        => 'Sign Up',
-    'loading_captcha'         => 'Loading verification code...',
-    'required_captcha'         => 'Please complete the verification code operation correctly',
-    'fail_captcha'         => 'Server verification failed, please try again',
+    'title'            => 'Sign In',
+    'tips'             => 'Please Enter Username and Password',
+    'username'         => 'Username',
+    'password'         => 'Password',
+    'captcha'          => 'Captcha',
+    'remember'         => 'Remember Me',
+    'forget_password'  => 'Forget Password',
+    'login'            => 'Sign In',
+    'register'         => 'Sign Up',
+    'loading_captcha'  => 'Loading verification code...',
+    'required_captcha' => 'Please complete the verification code operation correctly',
+    'fail_captcha'     => 'Server verification failed, please try again',
 ];

resources/lang/ja/login.php

@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'title'           => 'ログイン',
-    'tips'            => 'あなたのアカウントとパスワードを入力してください',
-    'username'        => 'アカウント',
-    'password'        => 'パスワード',
-    'captcha'         => '認証コード',
-    'remember'        => 'ログイン状態を保持',
-    'forget_password' => 'パスワードを忘れた',
-    'login'           => 'ログイン',
-    'register'        => '登録する',
-    'loading_captcha'         => '確認コードを読み込んでいます...',
-    'required_captcha'         => '確認コードの操作を正しく完了してください',
-    'fail_captcha'         => 'サーバーの確認に失敗しました。もう一度お試しください',
+    'title'            => 'ログイン',
+    'tips'             => 'あなたのアカウントとパスワードを入力してください',
+    'username'         => 'アカウント',
+    'password'         => 'パスワード',
+    'captcha'          => '認証コード',
+    'remember'         => 'ログイン状態を保持',
+    'forget_password'  => 'パスワードを忘れた',
+    'login'            => 'ログイン',
+    'register'         => '登録する',
+    'loading_captcha'  => '確認コードを読み込んでいます...',
+    'required_captcha' => '確認コードの操作を正しく完了してください',
+    'fail_captcha'     => 'サーバーの確認に失敗しました。もう一度お試しください',
 ];

resources/lang/ko/login.php

@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'title'           => '로그인',
-    'tips'            => '아이디 및 비밀번호를 입력하세요  ',
-    'username'        => '아이디',
-    'password'        => '비밀번호',
-    'captcha'         => '인증코드',
-    'remember'        => '로그인 상태 유지',
-    'forget_password' => '비밀번호 찾기',
-    'login'           => '로그인',
-    'register'        => '회원가입',
-    'loading_captcha'         => '인증 코드로드 중 ...',
-    'required_captcha'         => '인증 코드 작업을 올바르게 완료하십시오.',
-    'fail_captcha'         => '서버 확인에 실패했습니다. 다시 시도하십시오.',
+    'title'            => '로그인',
+    'tips'             => '아이디 및 비밀번호를 입력하세요  ',
+    'username'         => '아이디',
+    'password'         => '비밀번호',
+    'captcha'          => '인증코드',
+    'remember'         => '로그인 상태 유지',
+    'forget_password'  => '비밀번호 찾기',
+    'login'            => '로그인',
+    'register'         => '회원가입',
+    'loading_captcha'  => '인증 코드로드 중 ...',
+    'required_captcha' => '인증 코드 작업을 올바르게 완료하십시오.',
+    'fail_captcha'     => '서버 확인에 실패했습니다. 다시 시도하십시오.',
 ];

resources/lang/zh-CN/login.php

@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'title'           => '登入',
-    'tips'            => '请输入用户名和密码',
-    'username'        => '用户名',
-    'password'        => '密码',
-    'captcha'         => '验证码',
-    'remember'        => '记住我',
-    'forget_password' => '忘记密码',
-    'login'           => '登 入',
-    'register'        => '注 册',
-    'loading_captcha'         => '正在加载验证码...',
-    'required_captcha'         => '请正确完成验证码操作',
-    'fail_captcha'         => '服务器验证失败，请重新尝试',
+    'title'            => '登入',
+    'tips'             => '请输入用户名和密码',
+    'username'         => '用户名',
+    'password'         => '密码',
+    'captcha'          => '验证码',
+    'remember'         => '记住我',
+    'forget_password'  => '忘记密码',
+    'login'            => '登 入',
+    'register'         => '注 册',
+    'loading_captcha'  => '正在加载验证码...',
+    'required_captcha' => '请正确完成验证码操作',
+    'fail_captcha'     => '服务器验证失败，请重新尝试',
 ];

resources/lang/zh-tw/login.php

@@ -1,16 +1,16 @@
 <?php
 
 return [
-    'title'           => '登入',
-    'tips'            => '請輸入用戶名和密碼',
-    'username'        => '用戶名',
-    'password'        => '密碼',
-    'captcha'         => '驗證碼',
-    'remember'        => '記住我',
-    'forget_password' => '忘記密碼',
-    'login'           => '登 入',
-    'register'        => '注 册',
-    'loading_captcha'         => '正在加載驗證碼...',
-    'required_captcha'         => '請正確完成驗證碼操作',
-    'fail_captcha'         => '服務器驗證失敗，請重新嘗試',
+    'title'            => '登入',
+    'tips'             => '請輸入用戶名和密碼',
+    'username'         => '用戶名',
+    'password'         => '密碼',
+    'captcha'          => '驗證碼',
+    'remember'         => '記住我',
+    'forget_password'  => '忘記密碼',
+    'login'            => '登 入',
+    'register'         => '注 册',
+    'loading_captcha'  => '正在加載驗證碼...',
+    'required_captcha' => '請正確完成驗證碼操作',
+    'fail_captcha'     => '服務器驗證失敗，請重新嘗試',
 ];

resources/views/auth/login.blade.php

@@ -41,14 +41,6 @@
             <input type="hidden" name="_token" value="{{csrf_token()}}" />
         </div>
         @switch(\App\Components\Helpers::systemConfig()['is_captcha'])
-            @case(1)
-                <!-- Default Captcha -->
-                <div class="form-group" style="margin-bottom:65px;">
-                    <label class="control-label visible-ie8 visible-ie9">{{trans('login.captcha')}}</label>
-                    <input class="form-control form-control-solid placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('login.captcha')}}" name="captcha" value="" />
-                    <img src="{{captcha_src()}}" onclick="this.src='/captcha/default?'+Math.random()" alt="{{trans('login.captcha')}}" style="float:right;" />
-                </div>
-                @break
             @case(2)
                 <!-- Geetest -->
                 <div class="form-group">
@@ -62,7 +54,14 @@
                     {!! NoCaptcha::renderJs(session::get('locale')) !!}
                 </div>
                 @break
+            @case(1)
             @default
+                <!-- Default Captcha -->
+                <div class="form-group" style="margin-bottom:65px;">
+                    <label class="control-label visible-ie8 visible-ie9">{{trans('login.captcha')}}</label>
+                    <input class="form-control form-control-solid placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('login.captcha')}}" name="captcha" value="" />
+                    <img src="{{captcha_src()}}" onclick="this.src='/captcha/default?'+Math.random()" alt="{{trans('login.captcha')}}" style="float:right;" />
+                </div>
                 @break
         @endswitch
         <div class="form-actions">

resources/views/auth/register.blade.php

@@ -59,14 +59,6 @@
             @endif
             @if(!\App\Components\Helpers::systemConfig()['is_verify_register'])
                 @switch(\App\Components\Helpers::systemConfig()['is_captcha'])
-                    @case(1)
-                        <!-- Default Captcha -->
-                        <div class="form-group" style="margin-bottom:75px;">
-                            <label class="control-label visible-ie8 visible-ie9">{{trans('register.captcha')}}</label>
-                            <input class="form-control placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('register.captcha')}}" name="captcha" value="" required />
-                            <img src="{{captcha_src()}}" onclick="this.src='/captcha/default?'+Math.random()" alt="{{trans('register.captcha')}}" style="float:right;" />
-                        </div>
-                        @break
                     @case(2)
                         <!-- Geetest -->
                         <div class="form-group">
@@ -80,7 +72,14 @@
                             {!! NoCaptcha::renderJs(session::get('locale')) !!}
                         </div>
                         @break
+                    @case(1)
                     @default
+                        <!-- Default Captcha -->
+                        <div class="form-group" style="margin-bottom:75px;">
+                            <label class="control-label visible-ie8 visible-ie9">{{trans('register.captcha')}}</label>
+                            <input class="form-control placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('register.captcha')}}" name="captcha" value="" required />
+                            <img src="{{captcha_src()}}" onclick="this.src='/captcha/default?'+Math.random()" alt="{{trans('register.captcha')}}" style="float:right;" />
+                        </div>
                         @break
                 @endswitch
             @endif