yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-06-13 13:17:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
root
2019-11-18 19:39:22 +08:00
parent 633d1f1f9b
commit 58d1711150
11 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Admin/ConfigController.php
View File

@ -19,14 +19,14 @@ class ConfigController extends Controller
return response([
'data' => [
'invite' => [
'invite_force' => (int)config('v2board.invite_force', env('DEFAULT_INVITE_FORCE')),
'invite_commission' => config('v2board.invite_commission', env('DEFAULT_INVITE_COMMISSION')),
'invite_gen_limit' => config('v2board.invite_gen_limit', env('DEFAULT_INVITE_GEN_LIMIT')),
'invite_never_expire' => config('v2board.invite_never_expire', env('DEFAULT_NEVER_EXPIRE'))
'invite_force' => (int)config('v2board.invite_force', env('V2BOARD_INVITE_FORCE')),
'invite_commission' => config('v2board.invite_commission', env('V2BOARD_INVITE_COMMISSION')),
'invite_gen_limit' => config('v2board.invite_gen_limit', env('V2BOARD_INVITE_GEN_LIMIT')),
'invite_never_expire' => config('v2board.invite_never_expire', env('V2BOARD_NEVER_EXPIRE'))
],
'site' => [
'stop_register' => (int)config('v2board.stop_register', env('DEFAULT_STOP_REGISTER')),
'email_verify' => (int)config('v2board.email_verify', env('DEFAULT_EMAIL_VERIFY')),
'stop_register' => (int)config('v2board.stop_register', env('V2BOARD_STOP_REGISTER')),
'email_verify' => (int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY')),
'app_name' => config('v2board.app_name', env('APP_NAME')),
'app_url' => config('v2board.app_url', env('APP_URL'))
],

2
app/Http/Controllers/OrderController.php
View File

@ -72,7 +72,7 @@ class OrderController extends Controller
$order->total_amount = $plan[$request->input('cycle')];
if ($user->invite_user_id) {
$order->invite_user_id = $user->invite_user_id;
$order->commission_balance = $order->total_amount * (config('v2board.invite_commission', env('DEFAULT_INVITE_COMMISSION')) / 100);
$order->commission_balance = $order->total_amount * (config('v2board.invite_commission', env('V2BOARD_INVITE_COMMISSION')) / 100);
}
if (!$order->save()) {
abort(500, '订单创建失败');

2
app/Http/Controllers/Passport/CommController.php
View File

@ -13,7 +13,7 @@ class CommController extends Controller
{
public function isEmailVerify () {
return response([
'data' => (int)config('v2board.email_verify', env('DEFAULT_EMAIL_VERIFY')) ? 1 : 0
'data' => (int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY')) ? 1 : 0
]);
}

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

@ -15,15 +15,15 @@ use App\Models\InviteCode;
class RegisterController extends Controller
{
public function index (RegisterIndex $request) {
if ((int)config('v2board.stop_register', env('DEFAULT_STOP_REGISTER'))) {
if ((int)config('v2board.stop_register', env('V2BOARD_STOP_REGISTER'))) {
abort(500, '本站已关闭注册');
}
if ((int)config('v2board.invite_force', env('DEFAULT_INVITE_FOCE'))) {
if ((int)config('v2board.invite_force', env('V2BOARD_INVITE_FOCE'))) {
if (empty($request->input('invite_code'))) {
abort(500, '必须使用邀请码才可以注册');
}
}
if ((int)config('v2board.email_verify', env('DEFAULT_EMAIL_VERIFY'))) {
if ((int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY'))) {
$redisKey = 'sendEmailVerify:' . $request->input('email');
if (empty($request->input('email_code'))) {
abort(500, '邮箱验证码不能为空');
@ -49,12 +49,12 @@ class RegisterController extends Controller
->where('status', 0)
->first();
if (!$inviteCode) {
if ((int)config('v2board.invite_force', env('DEFAULT_INVITE_FOCE'))) {
if ((int)config('v2board.invite_force', env('V2BOARD_INVITE_FOCE'))) {
abort(500, '邀请码无效');
}
}
$user->invite_user_id = $inviteCode->user_id ? $inviteCode->user_id : null;
if (!(int)config('v2board.invite_never_expire', env('DEFAULT_INVITE_NEVER_EXPIRE'))) {
if (!(int)config('v2board.invite_never_expire', env('V2BOARD_INVITE_NEVER_EXPIRE'))) {
$inviteCode->status = 1;
$inviteCode->save();
}
@ -63,7 +63,7 @@ class RegisterController extends Controller
if (!$user->save()) {
abort(500, '注册失败');
}
if ((int)config('v2board.email_verify', env('DEFAULT_EMAIL_VERIFY'))) {
if ((int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY'))) {
Redis::del($redisKey);
}
return response()->json([