代码优化

app/Http/Kernel.php

@@ -57,9 +57,9 @@ class Kernel extends HttpKernel
         'can' => \Illuminate\Auth\Middleware\Authorize::class,
         'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'admin' => \App\Http\Middleware\Admin::class,
-        'user' => \App\Http\Middleware\User::class,
-        'forbidden' => \App\Http\Middleware\Forbidden::class,
+        'isAdmin' => \App\Http\Middleware\isAdmin::class,
+        'isLogin' => \App\Http\Middleware\isLogin::class,
+        'isForbidden' => \App\Http\Middleware\isForbidden::class,
         'affiliate' => \App\Http\Middleware\Affiliate::class,
 
     ];

app/Http/Middleware/SetLocale.php

@@ -4,12 +4,11 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Session;
-use Illuminate\Support\Facades\App;
 
 class SetLocale
 {
     /**
-     * Handle an incoming request.
+     * 变更语言
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $next
@@ -19,12 +18,12 @@ class SetLocale
     public function handle($request, Closure $next)
     {
         if (Session::has('locale')) {
-            App::setLocale(Session::get('locale'));
+            app()->setLocale(Session::get('locale'));
         }
 
         if ($request->query('locale')) {
             Session::put('locale', $request->query('locale'));
-            App::setLocale($request->query('locale'));
+            app()->setLocale($request->query('locale'));
         }
 
         return $next($request);

app/Http/Middleware/VerifyCsrfToken.php

@@ -12,6 +12,6 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
-        "payment/*", "mu/v2/*"
+        "payment/*"
     ];
 }

app/Http/Middleware/Admin.php → app/Http/Middleware/isAdmin.php

@@ -4,12 +4,11 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Redirect;
-use Auth;
 
-class Admin
+class isAdmin
 {
     /**
-     * Handle an incoming request.
+     * 校验是否为管理员身份
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $next
@@ -18,7 +17,7 @@ class Admin
      */
     public function handle($request, Closure $next)
     {
-        if (!Auth::user()->is_admin) {
+        if (!auth()->user()->is_admin) {
             return Redirect::to('/');
         }
 

app/Http/Middleware/Forbidden.php → app/Http/Middleware/isForbidden.php

@@ -4,16 +4,14 @@ namespace App\Http\Middleware;
 
 use App\Components\Helpers;
 use App\Components\QQWry;
-use App\Http\Models\Config;
-use Response;
 use Agent;
 use Log;
 use Closure;
 
-class Forbidden
+class isForbidden
 {
     /**
-     * Handle an incoming request.
+     * 限制机器人、指定IP访问
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $next
@@ -23,19 +21,18 @@ class Forbidden
     public function handle($request, Closure $next)
     {
         // 拒绝机器人访问
-        $config = Config::query()->where('name', 'is_forbid_robot')->first();
-        if ($config && $config->value) {
+        if (Helpers::systemConfig()['is_forbid_robot']) {
             if (Agent::isRobot()) {
                 Log::info("识别到机器人访问(" . getClientIp() . ")");
 
-                return Response::view('error.403', [], 403);
+                return response()->view('error.403', [], 403);
             }
         }
 
         $isIPv6 = false;
         $ip = getClientIP();
-        $qqwry = new QQWry();
-        $ipInfo = $qqwry->ip($ip);
+        $qqWry = new QQWry();
+        $ipInfo = $qqWry->ip($ip);
         if (isset($ipInfo['error'])) {
             $isIPv6 = true;
             Log::info('无法识别IP，可能是IPv6，尝试解析：' . $ip);
@@ -44,7 +41,7 @@ class Forbidden
 
         // 拒绝无IP请求
         if (empty($ipInfo) || empty($ipInfo['country'])) {
-            return Response::view('error.403', [], 403);
+            return response()->view('error.403', [], 403);
         }
 
         if (!in_array($ipInfo['country'], ['本机地址', '局域网'])) {
@@ -53,7 +50,7 @@ class Forbidden
                 if (($ipInfo['country'] == '中国' && !in_array($ipInfo['province'], ['香港', '澳门', '台湾'])) || ($isIPv6 && $ipInfo['country'] == 'China')) {
                     Log::info('识别到大陆IP，拒绝访问：' . $ip);
 
-                    return Response::view('error.403', [], 403);
+                    return response()->view('error.403', [], 403);
                 }
             }
 
@@ -62,7 +59,7 @@ class Forbidden
                 if ($ipInfo['country'] != '中国' || in_array($ipInfo['province'], ['香港', '澳门', '台湾']) || ($isIPv6 && $ipInfo['country'] != 'China')) {
                     Log::info('识别到海外IP，拒绝访问：' . $ip . ' - ' . $ipInfo['country']);
 
-                    return Response::view('error.403', [], 403);
+                    return response()->view('error.403', [], 403);
                 }
             }
         }

app/Http/Middleware/User.php → app/Http/Middleware/isLogin.php

@@ -4,12 +4,11 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Redirect;
-use Auth;
 
-class User
+class isLogin
 {
     /**
-     * Handle an incoming request.
+     * 校验是否已登录
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Closure                 $next
@@ -18,7 +17,7 @@ class User
      */
     public function handle($request, Closure $next)
     {
-        if (!Auth::check()) {
+        if (auth()->guest()) {
             return Redirect::to('login');
         }
 

resources/views/admin/layouts.blade.php

@@ -344,7 +344,7 @@
 <!-- END CONTAINER -->
 <!-- BEGIN FOOTER -->
 <div class="page-footer">
-    <div class="page-footer-inner">  &copy; 2017 - 2019 <a href="https://github.com/ssrpanel/ssrpanel" target="_blank">SSRPanel</a> {{config('version.name')}} </div>
+    <div class="page-footer-inner"> &copy; 2017 - 2019 <a href="https://github.com/ssrpanel/ssrpanel" target="_blank">SSRPanel</a> {{config('version.name')}} </div>
     <div class="scroll-to-top">
         <i class="icon-arrow-up"></i>
     </div>

routes/web.php

@@ -2,7 +2,7 @@
 
 Route::get('s/{code}', 'SubscribeController@index'); // 节点订阅地址
 
-Route::group(['middleware' => ['forbidden', 'affiliate']], function () {
+Route::group(['middleware' => ['isForbidden', 'affiliate']], function () {
     Route::get('lang/{locale}', 'AuthController@switchLang'); // 语言切换
     Route::any('login', 'AuthController@login'); // 登录
     Route::get('logout', 'AuthController@logout'); // 退出
@@ -17,7 +17,7 @@ Route::group(['middleware' => ['forbidden', 'affiliate']], function () {
     Route::get('makeVmessId', 'Controller@makeVmessId'); // 生成VmessId
 });
 
-Route::group(['middleware' => ['forbidden', 'user', 'admin']], function () {
+Route::group(['middleware' => ['isForbidden', 'isLogin', 'isAdmin']], function () {
     Route::get('admin', 'AdminController@index'); // 后台首页
     Route::get('admin/userList', 'AdminController@userList'); // 账号列表
     Route::any('admin/addUser', 'AdminController@addUser'); // 添加账号
@@ -103,7 +103,7 @@ Route::group(['middleware' => ['forbidden', 'user', 'admin']], function () {
     Route::get('admin/makePort', 'AdminController@makePort'); // 生成端口
 });
 
-Route::group(['middleware' => ['forbidden', 'user']], function () {
+Route::group(['middleware' => ['isForbidden', 'isLogin']], function () {
     Route::any('/', 'UserController@index'); // 用户首页
     Route::any('article', 'UserController@article'); // 文章详情
     Route::post('exchangeSubscribe', 'UserController@exchangeSubscribe'); // 更换节点订阅地址