yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 04:44:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
root 2020-01-29 16:08:50 +08:00
parent 5fae1f2bd8
commit 6dd562df8c
16 changed files with 107 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AppController.php → app/Http/Controllers/Client/AppController.php
View File

@ -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;

4
app/Http/Controllers/ClientController.php → app/Http/Controllers/Client/ClientController.php
View File

@ -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;

18
app/Http/Controllers/Passport/RegisterController.php
View File

@ -12,11 +12,6 @@ use App\Models\InviteCode;
class RegisterController extends Controller
{
private function setTryOut()
{
}
public function index(RegisterIndex $request)
{
if ((int)config('v2board.stop_register', 0)) {
@ -85,4 +80,17 @@ class RegisterController extends Controller
'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
]);
}
}

3
app/Http/Controllers/CouponController.php → app/Http/Controllers/User/CouponController.php
View File

@ -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;

4
app/Http/Controllers/InviteController.php → app/Http/Controllers/User/InviteController.php
View File

@ -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;

4
app/Http/Controllers/NoticeController.php → app/Http/Controllers/User/NoticeController.php
View File

@ -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;

6
app/Http/Controllers/OrderController.php → app/Http/Controllers/User/OrderController.php
View File

@ -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 @@ class OrderController extends Controller
{
$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();

4
app/Http/Controllers/PlanController.php → app/Http/Controllers/User/PlanController.php
View File

@ -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

4
app/Http/Controllers/ServerController.php → app/Http/Controllers/User/ServerController.php
View File

@ -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;

4
app/Http/Controllers/TicketController.php → app/Http/Controllers/User/TicketController.php
View File

@ -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;

4
app/Http/Controllers/TutorialController.php → app/Http/Controllers/User/TutorialController.php
View File

@ -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;

4
app/Http/Controllers/UserController.php → app/Http/Controllers/User/UserController.php
View File

@ -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;

3
install.sql
View File

@ -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

2
pm2.yaml
View File

@ -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'

174
routes/api.php
View File

@ -19,139 +19,93 @@ Route::prefix('v1')
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');
}
});
});
});

5
update.sql
View File

@ -130,4 +130,7 @@ ALTER TABLE `v2_server_log`
CHANGE `rate` `rate` decimal(10,2) NOT NULL AFTER `d`;
ALTER TABLE `v2_order`
DROP `method`;
DROP `method`;
ALTER TABLE `v2_invite_code`
ADD `pv` int(11) NOT NULL DEFAULT '0' AFTER `status`;