update

LovelyHaochi · Jan 29, 2020 · 6dd562d · 6dd562d
1 parent 5fae1f2
commit 6dd562d
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 140 deletions.
diff --git a/app/Http/Controllers/AppController.php → ...Http/Controllers/Client/AppController.php b/app/Http/Controllers/AppController.php → ...Http/Controllers/Client/AppController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Client;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
 use App\Models\Server;

diff --git a/app/Http/Controllers/ClientController.php → ...p/Controllers/Client/ClientController.php b/app/Http/Controllers/ClientController.php → ...p/Controllers/Client/ClientController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Client;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
 use App\Models\Server;

diff --git a/app/Http/Controllers/Passport/RegisterController.php b/app/Http/Controllers/Passport/RegisterController.php
@@ -12,11 +12,6 @@
 
 class RegisterController extends Controller
 {
-    private function setTryOut()
-    {
-
-    }
-
     public function index(RegisterIndex $request)
     {
         if ((int)config('v2board.stop_register', 0)) {
@@ -85,4 +80,17 @@ public function index(RegisterIndex $request)
             'data' => true
         ]);
     }
+
+    public function pv(Request $request)
+    {
+        $inviteCode = InviteCode::where('code', $request->input('invite_code'))->first();
+        if ($inviteCode) {
+            $inviteCode->pv = $inviteCode->pv + 1;
+            $inviteCode->save();
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/CouponController.php → ...ttp/Controllers/User/CouponController.php b/app/Http/Controllers/CouponController.php → ...ttp/Controllers/User/CouponController.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Coupon;
 

diff --git a/app/Http/Controllers/InviteController.php → ...ttp/Controllers/User/InviteController.php b/app/Http/Controllers/InviteController.php → ...ttp/Controllers/User/InviteController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Order;
 use App\Models\InviteCode;

diff --git a/app/Http/Controllers/NoticeController.php → ...ttp/Controllers/User/NoticeController.php b/app/Http/Controllers/NoticeController.php → ...ttp/Controllers/User/NoticeController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\Notice;
 use App\Utils\Helper;
 

diff --git a/app/Http/Controllers/OrderController.php → ...Http/Controllers/User/OrderController.php b/app/Http/Controllers/OrderController.php → ...Http/Controllers/User/OrderController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use App\Http\Requests\OrderSave;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\OrderSave;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
@@ -25,7 +25,7 @@ public function fetch(Request $request)
     {
         $model = Order::where('user_id', $request->session()->get('id'))
             ->orderBy('created_at', 'DESC');
-        if (!empty($request->input('status'))) {
+        if ($request->input('status') !== null) {
             $model->where('status', $request->input('status'));
         }
         $order = $model->get();

diff --git a/app/Http/Controllers/PlanController.php → app/Http/Controllers/User/PlanController.php b/app/Http/Controllers/PlanController.php → app/Http/Controllers/User/PlanController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\Plan;
 
 class PlanController extends Controller

diff --git a/app/Http/Controllers/ServerController.php → ...ttp/Controllers/User/ServerController.php b/app/Http/Controllers/ServerController.php → ...ttp/Controllers/User/ServerController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Http\Controllers\Controller;
 use App\Models\Server;
 use App\Models\ServerLog;
 use App\Models\User;

diff --git a/app/Http/Controllers/TicketController.php → ...ttp/Controllers/User/TicketController.php b/app/Http/Controllers/TicketController.php → ...ttp/Controllers/User/TicketController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\TicketSave;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Models\Ticket;
 use App\Models\TicketMessage;
 use App\Utils\Helper;

diff --git a/app/Http/Controllers/TutorialController.php → ...p/Controllers/User/TutorialController.php b/app/Http/Controllers/TutorialController.php → ...p/Controllers/User/TutorialController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Tutorial;
 

diff --git a/app/Http/Controllers/UserController.php → app/Http/Controllers/User/UserController.php b/app/Http/Controllers/UserController.php → app/Http/Controllers/User/UserController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\UserUpdate;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Models\Plan;
 use App\Models\Server;

diff --git a/install.sql b/install.sql
@@ -29,6 +29,7 @@ CREATE TABLE `v2_invite_code` (
   `user_id` int(11) NOT NULL,
   `code` char(32) NOT NULL,
   `status` tinyint(1) NOT NULL DEFAULT '0',
+  `pv` int(11) NOT NULL DEFAULT '0',
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -222,4 +223,4 @@ CREATE TABLE `v2_user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
--- 2020-01-20 15:33:23
+-- 2020-01-29 07:11:28
diff --git a/pm2.yaml b/pm2.yaml
@@ -1,5 +1,5 @@
 apps:
-  - name     : 'V2Board Queue'
+  - name     : 'V2Board'
     script   : 'php artisan queue:work --queue=verify_mail,other_mail'
     instances: 4
     out_file : './storage/logs/queue/queue.log'
diff --git a/routes/api.php b/routes/api.php
@@ -19,139 +19,93 @@
         Route::prefix('admin')
             ->middleware('admin')
             ->group(function () {
-                // Config
-                Route::get('config/fetch', 'Admin\\ConfigController@fetch');
-                Route::post('config/save', 'Admin\\ConfigController@save');
-                // Plan
-                Route::get('plan/fetch', 'Admin\\PlanController@fetch');
-                Route::post('plan/save', 'Admin\\PlanController@save');
-                Route::post('plan/drop', 'Admin\\PlanController@drop');
-                Route::post('plan/update', 'Admin\\PlanController@update');
-                // Server
-                Route::get('server/fetch', 'Admin\\ServerController@fetch');
-                Route::post('server/save', 'Admin\\ServerController@save');
-                Route::get('server/group/fetch', 'Admin\\ServerController@groupFetch');
-                Route::post('server/group/save', 'Admin\\ServerController@groupSave');
-                Route::post('server/group/drop', 'Admin\\ServerController@groupDrop');
-                Route::post('server/drop', 'Admin\\ServerController@drop');
-                Route::post('server/update', 'Admin\\ServerController@update');
-                // Order
-                Route::get('order/fetch', 'Admin\\OrderController@fetch');
-                Route::post('order/repair', 'Admin\\OrderController@repair');
-                Route::post('order/update', 'Admin\\OrderController@update');
-                // User
-                Route::get('user/fetch', 'Admin\\UserController@fetch');
-                Route::post('user/update', 'Admin\\UserController@update');
-                Route::get('user/id2UserInfo/{id}', 'Admin\\UserController@id2UserInfo');
-                // Stat
-                Route::get('stat/getOverride', 'Admin\\StatController@getOverride');
-                // Notice
-                Route::get('notice/fetch', 'Admin\\NoticeController@fetch');
-                Route::post('notice/save', 'Admin\\NoticeController@save');
-                Route::post('notice/update', 'Admin\\NoticeController@update');
-                Route::post('notice/drop', 'Admin\\NoticeController@drop');
-                // Ticket
-                Route::get('ticket/fetch', 'Admin\\TicketController@fetch');
-                Route::post('ticket/reply', 'Admin\\TicketController@reply');
-                Route::post('ticket/close', 'Admin\\TicketController@close');
-                // Mail
-                Route::post('mail/send', 'Admin\\MailController@send');
-                // Coupon
-                Route::get('coupon/fetch', 'Admin\\CouponController@fetch');
-                Route::post('coupon/save', 'Admin\\CouponController@save');
-                Route::post('coupon/drop', 'Admin\\CouponController@drop');
-                // Tutorial
-                Route::get('tutorial/fetch', 'Admin\\TutorialController@fetch');
-                Route::post('tutorial/save', 'Admin\\TutorialController@save');
-                Route::post('tutorial/show', 'Admin\\TutorialController@show');
-                Route::post('tutorial/drop', 'Admin\\TutorialController@drop');
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\User\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
             });
         // User
         Route::prefix('user')
             ->middleware('user')
             ->group(function () {
-                // User
-                Route::get('resetSecurity', 'UserController@resetSecurity');
-                Route::get('logout', 'UserController@logout');
-                Route::get('info', 'UserController@info');
-                Route::post('changePassword', 'UserController@changePassword');
-                Route::post('update', 'UserController@update');
-                Route::get('getSubscribe', 'UserController@getSubscribe');
-                Route::get('getStat', 'UserController@getStat');
-                // Order
-                Route::post('order/save', 'OrderController@save');
-                Route::post('order/checkout', 'OrderController@checkout');
-                Route::get('order/check', 'OrderController@check');
-                Route::get('order/details', 'OrderController@details');
-                Route::get('order/fetch', 'OrderController@fetch');
-                Route::get('order/getPaymentMethod', 'OrderController@getPaymentMethod');
-                Route::post('order/cancel', 'OrderController@cancel');
-                // Plan
-                Route::get('plan/fetch', 'PlanController@fetch');
-                // Invite
-                Route::get('invite/save', 'InviteController@save');
-                Route::get('invite/fetch', 'InviteController@fetch');
-                Route::get('invite/details', 'InviteController@details');
-                // Tutorial
-                Route::get('tutorial/getSubscribeUrl', 'TutorialController@getSubscribeUrl');
-                Route::get('tutorial/getAppleID', 'TutorialController@getAppleID');
-                Route::get('tutorial/fetch', 'TutorialController@fetch');
-                // Notice
-                Route::get('notice/fetch', 'NoticeController@fetch');
-                // Ticket
-                Route::post('ticket/reply', 'TicketController@reply');
-                Route::post('ticket/close', 'TicketController@close');
-                Route::post('ticket/save', 'TicketController@save');
-                Route::get('ticket/fetch', 'TicketController@fetch');
-                // Server
-                Route::get('server/fetch', 'ServerController@fetch');
+            	Route::any('/{action}', function($action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\UserController");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\User\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
                 Route::get('server/log/fetch', 'ServerController@logFetch');
-                // Coupon
-                Route::post('coupon/check', 'CouponController@check');
             });
 
         // Passport
         Route::prefix('passport')
             ->group(function () {
-                // Register
-                Route::post('register', 'Passport\\RegisterController@index');
-                // Comm
-                Route::get('config', 'Passport\\CommController@config');
-                Route::post('sendEmailVerify', 'Passport\\CommController@sendEmailVerify');
-                // Login
-                Route::post('login', 'Passport\\LoginController@index');
-                Route::get('token2Login', 'Passport\\LoginController@token2Login');
-                Route::get('check', 'Passport\\LoginController@check');
-                // Forget
-                Route::post('forget', 'Passport\\ForgetController@index');
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\Passport\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
             });
         // No Auth
         Route::prefix('guest')
             ->group(function () {
-                // Plan
-                Route::get('plan/fetch', 'Guest\\PlanController@fetch');
-                // Order
-                Route::post('order/alipayNotify', 'Guest\\OrderController@alipayNotify');
-                Route::post('order/stripeNotify', 'Guest\\OrderController@stripeNotify');
-                Route::post('order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify');
-                Route::post('order/payTaroNotify', 'Guest\\OrderController@payTaroNotify');
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\Guest\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
             });
         // Client
         Route::prefix('client')
             ->middleware('client')
             ->group(function () {
-                // Client
-                Route::get('subscribe', 'ClientController@subscribe');
-                // App
-                Route::get('app/data', 'AppController@data');
-                Route::get('app/config', 'AppController@config');
+            	Route::any('/{action}', function($action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\ClientController");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\Client\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
             });
         // Server
         Route::prefix('server')
             ->group(function () {
-                // Deepbwork
-                Route::get('deepbwork/user', 'Server\\DeepbworkController@user');
-                Route::get('deepbwork/config', 'Server\\DeepbworkController@config');
-                Route::post('deepbwork/submit', 'Server\\DeepbworkController@submit');
+            	Route::any('/{class}/{action}', function($class, $action) {
+				    $ctrl = \App::make("\\App\\Http\\Controllers\\Server\\" . ucfirst($class) . "Controller");
+				    try {
+				    	return \App::call([$ctrl, $action]);
+				    } catch (\Exception $e) {
+				    	abort(404, 'not found');
+				    }
+				});
             });
     });