diff --git a/.env.example b/.env.example index b87e7c26..e7cf0e96 100755 --- a/.env.example +++ b/.env.example @@ -45,9 +45,10 @@ PUSHER_APP_CLUSTER=mt1 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" -DEFAULT_INVITE_FORCE=0 -DEFAULT_INVITE_COMMISSION=10 -DEFAULT_INVITE_GEN_LIMIT=5 -DEFAULT_STOP_REGISTER=0 -DEFAULT_EMAIL_VERIFY=0 -DEFAULT_INVITE_NEVER_EXPIRE=0 \ No newline at end of file +V2BOARD_INVITE_FORCE=0 +V2BOARD_INVITE_COMMISSION=10 +V2BOARD_INVITE_GEN_LIMIT=5 +V2BOARD_STOP_REGISTER=0 +V2BOARD_EMAIL_VERIFY=0 +V2BOARD_INVITE_NEVER_EXPIRE=0 +V2BOARD_APP_THEME=1 \ No newline at end of file diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index 5c53a03c..0270762e 100755 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -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')) ], diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index d6729b1b..920fd82b 100755 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -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, '订单创建失败'); diff --git a/app/Http/Controllers/Passport/CommController.php b/app/Http/Controllers/Passport/CommController.php index c6b70a9c..ec8b6f43 100644 --- a/app/Http/Controllers/Passport/CommController.php +++ b/app/Http/Controllers/Passport/CommController.php @@ -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 ]); } diff --git a/app/Http/Controllers/Passport/RegisterController.php b/app/Http/Controllers/Passport/RegisterController.php index 0407180c..7984d4ef 100755 --- a/app/Http/Controllers/Passport/RegisterController.php +++ b/app/Http/Controllers/Passport/RegisterController.php @@ -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([ diff --git a/config/cache.php b/config/cache.php index 46751e62..81640bf2 100755 --- a/config/cache.php +++ b/config/cache.php @@ -80,7 +80,7 @@ return [ 'driver' => 'dynamodb', 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'region' => env('AWS_V2BOARD_REGION', 'us-east-1'), 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), 'endpoint' => env('DYNAMODB_ENDPOINT'), ], diff --git a/config/filesystems.php b/config/filesystems.php index ec6a7cec..71d87eb8 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -59,7 +59,7 @@ return [ 'driver' => 's3', 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION'), + 'region' => env('AWS_V2BOARD_REGION'), 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), ], diff --git a/config/queue.php b/config/queue.php index 3a30d6c6..495c858e 100755 --- a/config/queue.php +++ b/config/queue.php @@ -55,7 +55,7 @@ return [ 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), 'queue' => env('SQS_QUEUE', 'your-queue-name'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'region' => env('AWS_V2BOARD_REGION', 'us-east-1'), ], 'redis' => [ diff --git a/config/services.php b/config/services.php index 2a1d616c..950dc99a 100755 --- a/config/services.php +++ b/config/services.php @@ -27,7 +27,7 @@ return [ 'ses' => [ 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'region' => env('AWS_V2BOARD_REGION', 'us-east-1'), ], ]; diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 4ab72c77..721ad1e0 100755 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -11,7 +11,7 @@ diff --git a/routes/web.php b/routes/web.php index c79e66ff..325048f0 100755 --- a/routes/web.php +++ b/routes/web.php @@ -13,6 +13,7 @@ Route::get('/', function () { return view('app', [ - 'title' => config('v2board.app_name', env('APP_NAME')) + 'title' => config('v2board.app_name', env('APP_NAME')), + 'theme' => config('v2board.app_theme', env('V2BOARD_APP_THEME')) ]); });