Tokumeikoi 5 жил өмнө
parent
commit
a9eff7bea9
2 өөрчлөгдсөн 8 нэмэгдсэн , 60 устгасан
  1. 8 8
      config/mail.php
  2. 0 52
      config/v2board.php

+ 8 - 8
config/mail.php

@@ -16,7 +16,7 @@ return [
     |
     */
 
-    'driver' => config('v2board.mail_driver', env('MAIL_DRIVER', 'smtp')),
+    'driver' => env('MAIL_DRIVER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
@@ -29,7 +29,7 @@ return [
     |
     */
 
-    'host' => config('v2board.mail_host', env('MAIL_HOST', 'smtp.mailgun.org')),
+    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
 
     /*
     |--------------------------------------------------------------------------
@@ -42,7 +42,7 @@ return [
     |
     */
 
-    'port' => config('v2board.mail_port', env('MAIL_PORT', 587)),
+    'port' => env('MAIL_PORT', 587),
 
     /*
     |--------------------------------------------------------------------------
@@ -56,8 +56,8 @@ return [
     */
 
     'from' => [
-        'address' => config('v2board.mail_from_address', env('MAIL_FROM_ADDRESS', 'hello@example.com')),
-        'name' => config('v2board.mail_from_name', env('MAIL_FROM_NAME', 'Example')),
+        'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
     /*
@@ -71,7 +71,7 @@ return [
     |
     */
 
-    'encryption' => config('v2board.mail_encryption', env('MAIL_ENCRYPTION', 'tls')),
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
 
     /*
     |--------------------------------------------------------------------------
@@ -84,9 +84,9 @@ return [
     |
     */
 
-    'username' => config('v2board.mail_username', env('MAIL_USERNAME')),
+    'username' => env('MAIL_USERNAME'),
 
-    'password' => config('v2board.mail_password', env('MAIL_PASSWORD')),
+    'password' => env('MAIL_PASSWORD'),
 
     /*
     |--------------------------------------------------------------------------

+ 0 - 52
config/v2board.php

@@ -1,52 +0,0 @@
-<?php
-return [
-    'invite' => [
-        'invite_force' => 0,
-        'invite_commission' => 10,
-        'invite_gen_limit' => 5,
-        'invite_never_expire' => 0
-    ],
-    'site' => [
-        'stop_register' => 0,
-        'email_verify' => 0,
-        'app_name' => 'V2Board',
-        'app_url' => '',
-        'subscribe_url' => '',
-        'plan_change_enable' => 1,
-        'plan_transfer_hour' => 12,
-        'try_out_enable' => 0,
-        'try_out_plan_id' => '',
-        'try_out_hour' => 1
-    ],
-    'pay' => [
-        // alipay
-        'alipay_enable' => '',
-        'alipay_appid' => '',
-        'alipay_pubkey' => '',
-        'alipay_privkey' => '',
-        // stripe
-        'stripe_sk_live' => '',
-        'stripe_pk_live' => '',
-        'stripe_alipay_enable' => 0,
-        'stripe_wepay_enable' => 0,
-        'stripe_webhook_key' => '',
-        // bitpayx
-        'bitpayx_enable' => '',
-        'bitpayx_appsecret' => '',
-        // paytaro
-        'paytaro_enable' => 0,
-        'paytaro_app_id' => '',
-        'paytaro_app_secret' => ''
-    ],
-    'frontend' => [
-        'frontend_theme' => 1,
-        'frontend_background_url' => ''
-    ],
-    'server' => [
-        'server_token' => '',
-        'server_license' => ''
-    ],
-    'tutorial' => [
-        'apple_id' => ''
-    ]
-];