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

update

Browse Source
This commit is contained in:
root 2019-11-18 19:52:30 +08:00
parent 58d1711150
commit c373becd78
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,16 +19,16 @@ class ConfigController extends Controller
return response([ return response([
'data' => [ 'data' => [
'invite' => [ 'invite' => [
'invite_force' => (int)config('v2board.invite_force', env('V2BOARD_INVITE_FORCE')), 'invite_force' => (int)config('v2board.invite_force', 0),
'invite_commission' => config('v2board.invite_commission', env('V2BOARD_INVITE_COMMISSION')), 'invite_commission' => config('v2board.invite_commission', 10),
'invite_gen_limit' => config('v2board.invite_gen_limit', env('V2BOARD_INVITE_GEN_LIMIT')), 'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
'invite_never_expire' => config('v2board.invite_never_expire', env('V2BOARD_NEVER_EXPIRE')) 'invite_never_expire' => config('v2board.invite_never_expire', 0)
], ],
'site' => [ 'site' => [
'stop_register' => (int)config('v2board.stop_register', env('V2BOARD_STOP_REGISTER')), 'stop_register' => (int)config('v2board.stop_register', 0),
'email_verify' => (int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY')), 'email_verify' => (int)config('v2board.email_verify', 0),
'app_name' => config('v2board.app_name', env('APP_NAME')), 'app_name' => config('v2board.app_name', 'V2Board'),
'app_url' => config('v2board.app_url', env('APP_URL')) 'app_url' => config('v2board.app_url')
], ],
'pay' => [ 'pay' => [
// alipay // alipay

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

@ -72,7 +72,7 @@ class OrderController extends Controller
$order->total_amount = $plan[$request->input('cycle')]; $order->total_amount = $plan[$request->input('cycle')];
if ($user->invite_user_id) { if ($user->invite_user_id) {
$order->invite_user_id = $user->invite_user_id; $order->invite_user_id = $user->invite_user_id;
$order->commission_balance = $order->total_amount * (config('v2board.invite_commission', env('V2BOARD_INVITE_COMMISSION')) / 100); $order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100);
} }
if (!$order->save()) { if (!$order->save()) {
abort(500, '订单创建失败'); abort(500, '订单创建失败');
@ -180,7 +180,7 @@ class OrderController extends Controller
$gateway->setNotifyUrl(config('v2board.app_url', env('APP_URL')) . '/api/v1/guest/order/alipayNotify'); $gateway->setNotifyUrl(config('v2board.app_url', env('APP_URL')) . '/api/v1/guest/order/alipayNotify');
$request = $gateway->purchase(); $request = $gateway->purchase();
$request->setBizContent([ $request->setBizContent([
'subject' => config('v2board.app_name') . ' - 订阅', 'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
'out_trade_no' => $tradeNo, 'out_trade_no' => $tradeNo,
'total_amount' => $totalAmount / 100 'total_amount' => $totalAmount / 100
]); ]);

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

@ -13,7 +13,7 @@ class CommController extends Controller
{ {
public function isEmailVerify () { public function isEmailVerify () {
return response([ return response([
'data' => (int)config('v2board.email_verify', env('V2BOARD_EMAIL_VERIFY')) ? 1 : 0 'data' => (int)config('v2board.email_verify', 0) ? 1 : 0
]); ]);
} }
@ -24,12 +24,12 @@ class CommController extends Controller
abort(500, '验证码已发送，请过一会在请求'); abort(500, '验证码已发送，请过一会在请求');
} }
$code = rand(100000, 999999); $code = rand(100000, 999999);
$subject = config('v2board.app_name', 'V2Panel') . '邮箱验证码'; $subject = config('v2board.app_name', 'V2Board') . '邮箱验证码';
Mail::send( Mail::send(
'mail.sendEmailVerify', 'mail.sendEmailVerify',
[ [
'code' => $code, 'code' => $code,
'name' => config('v2board.app_name', 'V2Panel') 'name' => config('v2board.app_name', 'V2Board')
], ],
function ($message) use($email, $subject) { function ($message) use($email, $subject) {
$message->to($email)->subject($subject); $message->to($email)->subject($subject);

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

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

4
routes/web.php
View File

@ -13,7 +13,7 @@
Route::get('/', function () { Route::get('/', function () {
return view('app', [ return view('app', [
'title' => config('v2board.app_name', env('APP_NAME')), 'title' => config('v2board.app_name', 'V2Board'),
'theme' => config('v2board.app_theme', env('V2BOARD_APP_THEME')) 'theme' => config('v2board.app_theme', 1)
]); ]);
}); });