From 15fc60d3c7a0eb8d68fe95172e6d607d6fcdec8e Mon Sep 17 00:00:00 2001
From: Tokumeikoi <tokumeikoi@protonmail.com>
Date: Fri, 31 Jan 2020 00:03:18 +0800
Subject: [PATCH] update

---
 app/Console/Commands/CheckOrder.php           |  2 ++
 app/Http/Controllers/Server/Controller.php    | 20 --------------
 .../Server/DeepbworkController.php            | 14 ++++++++--
 app/Http/Controllers/User/UserController.php  |  3 ++-
 app/Http/Middleware/Server.php                | 27 -------------------
 5 files changed, 16 insertions(+), 50 deletions(-)
 delete mode 100644 app/Http/Controllers/Server/Controller.php
 delete mode 100644 app/Http/Middleware/Server.php

diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php
index ef7f2418..11a0d9a5 100755
--- a/app/Console/Commands/CheckOrder.php
+++ b/app/Console/Commands/CheckOrder.php
@@ -76,6 +76,8 @@ class CheckOrder extends Command
         }
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
         $user->enable = 1;
+        $user->u = 0;
+        $user->d = 0;
         $user->plan_id = $plan->id;
         $user->group_id = $plan->group_id;
         $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
diff --git a/app/Http/Controllers/Server/Controller.php b/app/Http/Controllers/Server/Controller.php
deleted file mode 100644
index 9f0cddd5..00000000
--- a/app/Http/Controllers/Server/Controller.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Server;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller as BaseController;
-
-class Controller extends BaseController
-{
-    public function __construct(Request $request)
-    {
-        $token = $request->input('token');
-        if (empty($token)) {
-            abort(500, 'token is null');
-        }
-        if ($token !== config('v2board.server_token')) {
-            abort(500, 'token is error');
-        }
-    }
-}
diff --git a/app/Http/Controllers/Server/DeepbworkController.php b/app/Http/Controllers/Server/DeepbworkController.php
index 30f3f672..b5c691e5 100644
--- a/app/Http/Controllers/Server/DeepbworkController.php
+++ b/app/Http/Controllers/Server/DeepbworkController.php
@@ -3,9 +3,8 @@
 namespace App\Http\Controllers\Server;
 
 use Illuminate\Http\Request;
-use App\Http\Controllers\Server\Controller;
+use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\Plan;
 use App\Models\Server;
 use App\Models\ServerLog;
 use Illuminate\Support\Facades\Log;
@@ -15,6 +14,17 @@ class DeepbworkController extends Controller
 {
     CONST SERVER_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"routing":{"settings":{"rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]},"strategy":"rules"},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
 
+    public function __construct(Request $request)
+    {
+        $token = $request->input('token');
+        if (empty($token)) {
+            abort(500, 'token is null');
+        }
+        if ($token !== config('v2board.server_token')) {
+            abort(500, 'token is error');
+        }
+    }
+
     // 后端获取用户
     public function user(Request $request)
     {
diff --git a/app/Http/Controllers/User/UserController.php b/app/Http/Controllers/User/UserController.php
index a921965b..c01e26d1 100755
--- a/app/Http/Controllers/User/UserController.php
+++ b/app/Http/Controllers/User/UserController.php
@@ -17,8 +17,9 @@ class UserController extends Controller
 {
     public function logout(Request $request)
     {
+        $request->session()->flush();
         return response([
-            'data' => $request->session()->flush()
+            'data' => true
         ]);
     }
 
diff --git a/app/Http/Middleware/Server.php b/app/Http/Middleware/Server.php
deleted file mode 100644
index 858f25c2..00000000
--- a/app/Http/Middleware/Server.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-
-class Server
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $token = $request->input('token');
-        if (empty($token)) {
-            abort(500, 'token is null');
-        }
-        if ($token !== config('v2board.server_token')) {
-            abort(500, 'token is error');
-        }
-        return $next($request);
-    }
-}