Refactor ConfigController to use ConfigService

app/Http/Controllers/V1/Admin/ConfigController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\V1\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\ConfigSave;
 use App\Jobs\SendEmailJob;
+use App\Services\ConfigService;
 use App\Services\TelegramService;
 use App\Utils\Dict;
 use Illuminate\Http\Request;
@@ -68,97 +69,7 @@ class ConfigController extends Controller
     public function fetch(Request $request)
     {
         $key = $request->input('key');
-        $data = [
-            'invite' => [
-                'invite_force' => (int)config('v2board.invite_force', 0),
-                'invite_commission' => config('v2board.invite_commission', 10),
-                'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
-                'invite_never_expire' => config('v2board.invite_never_expire', 0),
-                'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
-                'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
-                'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
-                'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
-                'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
-                'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
-                'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
-                'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
-                'commission_distribution_l3' => config('v2board.commission_distribution_l3')
-            ],
-            'site' => [
-                'logo' => config('v2board.logo'),
-                'force_https' => (int)config('v2board.force_https', 0),
-                'stop_register' => (int)config('v2board.stop_register', 0),
-                'app_name' => config('v2board.app_name', 'V2Board'),
-                'app_description' => config('v2board.app_description', 'V2Board is best!'),
-                'app_url' => config('v2board.app_url'),
-                'subscribe_url' => config('v2board.subscribe_url'),
-                'subscribe_path' => config('v2board.subscribe_path'),
-                'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
-                'try_out_hour' => (int)config('v2board.try_out_hour', 1),
-                'tos_url' => config('v2board.tos_url'),
-                'currency' => config('v2board.currency', 'CNY'),
-                'currency_symbol' => config('v2board.currency_symbol', '¥'),
-            ],
-            'subscribe' => [
-                'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
-                'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
-                'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
-                'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
-                'show_info_to_server_enable' => (int)config('v2board.show_info_to_server_enable', 0)
-            ],
-            'frontend' => [
-                'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
-                'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
-                'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
-                'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
-                'frontend_background_url' => config('v2board.frontend_background_url'),
-            ],
-            'server' => [
-                'server_token' => config('v2board.server_token'),
-                'server_pull_interval' => config('v2board.server_pull_interval', 60),
-                'server_push_interval' => config('v2board.server_push_interval', 60),
-            ],
-            'email' => [
-                'email_template' => config('v2board.email_template', 'default'),
-                'email_host' => config('v2board.email_host'),
-                'email_port' => config('v2board.email_port'),
-                'email_username' => config('v2board.email_username'),
-                'email_password' => config('v2board.email_password'),
-                'email_encryption' => config('v2board.email_encryption'),
-                'email_from_address' => config('v2board.email_from_address')
-            ],
-            'telegram' => [
-                'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
-                'telegram_bot_token' => config('v2board.telegram_bot_token'),
-                'telegram_discuss_link' => config('v2board.telegram_discuss_link')
-            ],
-            'app' => [
-                'windows_version' => config('v2board.windows_version'),
-                'windows_download_url' => config('v2board.windows_download_url'),
-                'macos_version' => config('v2board.macos_version'),
-                'macos_download_url' => config('v2board.macos_download_url'),
-                'android_version' => config('v2board.android_version'),
-                'android_download_url' => config('v2board.android_download_url')
-            ],
-            'safe' => [
-                'email_verify' => (int)config('v2board.email_verify', 0),
-                'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
-                'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
-                'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
-                'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
-                'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
-                'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
-                'recaptcha_key' => config('v2board.recaptcha_key'),
-                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
-                'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
-                'register_limit_count' => config('v2board.register_limit_count', 3),
-                'register_limit_expire' => config('v2board.register_limit_expire', 60),
-                'password_limit_enable' => (int)config('v2board.password_limit_enable', 1),
-                'password_limit_count' => config('v2board.password_limit_count', 5),
-                'password_limit_expire' => config('v2board.password_limit_expire', 60)
-            ]
-        ];
+        $data = (new ConfigService)->getDefaultConfig();
         if ($key && isset($data[$key])) {
             return response([
                 'data' => [

app/Services/ConfigService.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Services;
+
+use App\Utils\Dict;
+
+class ConfigService {
+    public function get($key) {
+        $config = $this->getDefaultConfig();
+        return \Arr::get($config, $key);
+    }
+    public function getDefaultConfig() {
+        return [
+            'invite' => [
+                'invite_force' => (int)config('v2board.invite_force', 0),
+                'invite_commission' => config('v2board.invite_commission', 10),
+                'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
+                'invite_never_expire' => config('v2board.invite_never_expire', 0),
+                'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
+                'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
+                'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
+                'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
+                'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
+                'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                'commission_distribution_l3' => config('v2board.commission_distribution_l3')
+            ],
+            'site' => [
+                'logo' => config('v2board.logo'),
+                'force_https' => (int)config('v2board.force_https', 0),
+                'stop_register' => (int)config('v2board.stop_register', 0),
+                'app_name' => config('v2board.app_name', 'V2Board'),
+                'app_description' => config('v2board.app_description', 'V2Board is best!'),
+                'app_url' => config('v2board.app_url'),
+                'subscribe_url' => config('v2board.subscribe_url'),
+                'subscribe_path' => config('v2board.subscribe_path', '/client/subscribe'),
+                'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
+                'try_out_hour' => (int)config('v2board.try_out_hour', 1),
+                'tos_url' => config('v2board.tos_url'),
+                'currency' => config('v2board.currency', 'CNY'),
+                'currency_symbol' => config('v2board.currency_symbol', '¥'),
+            ],
+            'subscribe' => [
+                'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
+                'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
+                'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
+                'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
+                'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
+                'show_info_to_server_enable' => (int)config('v2board.show_info_to_server_enable', 0)
+            ],
+            'frontend' => [
+                'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
+                'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
+                'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
+                'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
+                'frontend_background_url' => config('v2board.frontend_background_url'),
+            ],
+            'server' => [
+                'server_token' => config('v2board.server_token'),
+                'server_pull_interval' => config('v2board.server_pull_interval', 60),
+                'server_push_interval' => config('v2board.server_push_interval', 60),
+            ],
+            'email' => [
+                'email_template' => config('v2board.email_template', 'default'),
+                'email_host' => config('v2board.email_host'),
+                'email_port' => config('v2board.email_port'),
+                'email_username' => config('v2board.email_username'),
+                'email_password' => config('v2board.email_password'),
+                'email_encryption' => config('v2board.email_encryption'),
+                'email_from_address' => config('v2board.email_from_address')
+            ],
+            'telegram' => [
+                'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
+                'telegram_bot_token' => config('v2board.telegram_bot_token'),
+                'telegram_discuss_link' => config('v2board.telegram_discuss_link')
+            ],
+            'app' => [
+                'windows_version' => config('v2board.windows_version'),
+                'windows_download_url' => config('v2board.windows_download_url'),
+                'macos_version' => config('v2board.macos_version'),
+                'macos_download_url' => config('v2board.macos_download_url'),
+                'android_version' => config('v2board.android_version'),
+                'android_download_url' => config('v2board.android_download_url')
+            ],
+            'safe' => [
+                'email_verify' => (int)config('v2board.email_verify', 0),
+                'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
+                'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
+                'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
+                'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
+                'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
+                'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
+                'recaptcha_key' => config('v2board.recaptcha_key'),
+                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
+                'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
+                'register_limit_count' => config('v2board.register_limit_count', 3),
+                'register_limit_expire' => config('v2board.register_limit_expire', 60),
+                'password_limit_enable' => (int)config('v2board.password_limit_enable', 1),
+                'password_limit_count' => config('v2board.password_limit_count', 5),
+                'password_limit_expire' => config('v2board.password_limit_expire', 60)
+            ]
+        ];
+    }
+}

app/Utils/Helper.php

@@ -110,9 +110,10 @@ class Helper
 
     public static function getSubscribeUrl($token)
     {
-        $path = config('v2board.subscribe_path', '/client/subscribe');
+        $c = new \App\Services\ConfigService();
+        $path = $c->get('site.subscribe_path');
         $path = "/api/v1{$path}?token={$token}";
-        $subscribeUrls = explode(',', config('v2board.subscribe_url'));
+        $subscribeUrls = explode(',', config('v2board.subscribe_url', '/client/subscribe'));
         $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
         if ($subscribeUrl) return $subscribeUrl . $path;
         return url($path);