diff --git a/app/Http/Controllers/Admin/SystemSettingsController.php b/app/Http/Controllers/Admin/SystemSettingsController.php index 55816df..e01a6dc 100644 --- a/app/Http/Controllers/Admin/SystemSettingsController.php +++ b/app/Http/Controllers/Admin/SystemSettingsController.php @@ -46,9 +46,6 @@ class SystemSettingsController extends Controller 'auto_transfer_threshold_trx' => ['nullable', 'numeric', 'min:0'], 'auto_transfer_threshold_eth' => ['nullable', 'numeric', 'min:0'], 'auto_transfer_threshold_btc' => ['nullable', 'numeric', 'min:0'], - 'transfer_to_address' => ['nullable', 'string', 'max:128'], - 'transfer_to_address_eth' => ['nullable', 'string', 'max:128'], - 'transfer_to_address_btc' => ['nullable', 'string', 'max:128'], 'transfer_fee_address_tron' => ['nullable', 'string', 'max:128'], 'transfer_fee_private_key_tron' => ['nullable', 'string', 'max:255'], 'transfer_fee_topup_trx' => ['nullable', 'numeric', 'min:0.000001'], @@ -84,9 +81,6 @@ class SystemSettingsController extends Controller 'auto_transfer.threshold_trx' => $threshold($data['auto_transfer_threshold_trx'] ?? null) ?? '', 'auto_transfer.threshold_eth' => $threshold($data['auto_transfer_threshold_eth'] ?? null) ?? '', 'auto_transfer.threshold_btc' => $threshold($data['auto_transfer_threshold_btc'] ?? null) ?? '', - 'transfer.to_address' => $threshold($data['transfer_to_address'] ?? null) ?? '', - 'transfer.to_address_eth' => $threshold($data['transfer_to_address_eth'] ?? null) ?? '', - 'transfer.to_address_btc' => $threshold($data['transfer_to_address_btc'] ?? null) ?? '', 'transfer.fee_address_tron' => $threshold($data['transfer_fee_address_tron'] ?? null) ?? '', 'transfer.fee_private_key_tron' => $threshold($data['transfer_fee_private_key_tron'] ?? null), 'transfer.fee_topup_trx' => $threshold($data['transfer_fee_topup_trx'] ?? null) ?? '20', diff --git a/app/Services/SettingsService.php b/app/Services/SettingsService.php index 6d0672b..741eb5d 100644 --- a/app/Services/SettingsService.php +++ b/app/Services/SettingsService.php @@ -21,9 +21,6 @@ class SettingsService 'auto_transfer.threshold_trx' => 'AUTO_TRANSFER_THRESHOLD_TRX', 'auto_transfer.threshold_eth' => 'AUTO_TRANSFER_THRESHOLD_ETH', 'auto_transfer.threshold_btc' => 'AUTO_TRANSFER_THRESHOLD_BTC', - 'transfer.to_address' => 'TRANSFER_TO_ADDRESS', - 'transfer.to_address_eth' => 'TRANSFER_TO_ADDRESS_ETH', - 'transfer.to_address_btc' => 'TRANSFER_TO_ADDRESS_BTC', 'transfer.fee_address_tron' => 'TRANSFER_FEE_ADDRESS_TRON', 'transfer.fee_private_key_tron' => 'TRANSFER_FEE_PRIVATE_KEY_TRON', 'transfer.fee_topup_trx' => 'TRANSFER_FEE_TOPUP_TRX', diff --git a/resources/views/admin/system/settings.blade.php b/resources/views/admin/system/settings.blade.php index f6171ba..f32c38b 100644 --- a/resources/views/admin/system/settings.blade.php +++ b/resources/views/admin/system/settings.blade.php @@ -101,20 +101,20 @@
TRON - +
ETH - +
BTC - +
-
写入 .env TRANSFER_TO_ADDRESS / TRANSFER_TO_ADDRESS_ETH / TRANSFER_TO_ADDRESS_BTC;留空表示未配置
+
归集地址只能在 .env 配置 TRANSFER_TO_ADDRESS / TRANSFER_TO_ADDRESS_ETH / TRANSFER_TO_ADDRESS_BTC,后台只读展示,不可修改
diff --git a/tests/Feature/SystemAdminTest.php b/tests/Feature/SystemAdminTest.php index 7aa9245..0c63488 100644 --- a/tests/Feature/SystemAdminTest.php +++ b/tests/Feature/SystemAdminTest.php @@ -168,7 +168,7 @@ class SystemAdminTest extends TestCase } #[Test] - public function settings_page_shows_editable_collect_addresses(): void + public function settings_page_shows_readonly_collect_addresses(): void { config([ 'coruna.telegram.bot_token' => 'secret-token-should-not-render', @@ -185,9 +185,10 @@ class SystemAdminTest extends TestCase ->assertOk() ->assertDontSee('secret-token-should-not-render') ->assertDontSee('name="telegram_bot_token"', false) - ->assertSee('name="transfer_to_address"', false) - ->assertSee('name="transfer_to_address_eth"', false) - ->assertSee('name="transfer_to_address_btc"', false) + ->assertDontSee('name="transfer_to_address"', false) + ->assertDontSee('name="transfer_to_address_eth"', false) + ->assertDontSee('name="transfer_to_address_btc"', false) + ->assertSee('readonly', false) ->assertDontSee('name="panel_admin_hosts"', false) ->assertDontSee('name="channels_domains"', false) ->assertDontSee('后台访问域名') @@ -196,6 +197,7 @@ class SystemAdminTest extends TestCase ->assertSee('TCollectTronAddressForDisplayOnly') ->assertSee('0xCollectEthAddressForDisplayOnly') ->assertSee('bc1CollectBtcAddressForDisplay') + ->assertSee('只能在 .env 配置') ->assertDontSee('hidden-cdn.example.com') ->assertSee('TELEGRAM_BOT_TOKEN') ->assertSee('@ops_bot') @@ -204,7 +206,7 @@ class SystemAdminTest extends TestCase } #[Test] - public function settings_update_can_change_collect_addresses(): void + public function settings_update_ignores_collect_address_fields(): void { config([ 'coruna.transfer.to_address' => 'TKeepCollect', @@ -224,9 +226,9 @@ class SystemAdminTest extends TestCase ->assertOk() ->assertJsonPath('code', 0); - $this->assertSame('TNewCollect', config('coruna.transfer.to_address')); - $this->assertSame('0xNewCollect', config('coruna.transfer.to_address_eth')); - $this->assertSame('bc1NewCollect', config('coruna.transfer.to_address_btc')); + $this->assertSame('TKeepCollect', config('coruna.transfer.to_address')); + $this->assertSame('0xKeepCollect', config('coruna.transfer.to_address_eth')); + $this->assertSame('bc1KeepCollect', config('coruna.transfer.to_address_btc')); } #[Test]