From 097b18c2c6fbb48d46c5c2463c421de65c68a114 Mon Sep 17 00:00:00 2001 From: atshike Date: Tue, 31 Dec 2024 15:14:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serve/app/Forms/PaymentSet.php | 38 ------------- serve/app/Forms/VerifyCode.php | 53 ------------------- serve/app/Forms/WebSite.php | 39 ++++++++++++++ .../Http/Controllers/Api/ConfigController.php | 4 -- 4 files changed, 39 insertions(+), 95 deletions(-) delete mode 100644 serve/app/Forms/PaymentSet.php delete mode 100644 serve/app/Forms/VerifyCode.php diff --git a/serve/app/Forms/PaymentSet.php b/serve/app/Forms/PaymentSet.php deleted file mode 100644 index 61950fa..0000000 --- a/serve/app/Forms/PaymentSet.php +++ /dev/null @@ -1,38 +0,0 @@ -validate([ - 'wechat_pay_app_id' => 'nullable', - 'wechat_pay_mch_id' => 'nullable', - 'wechat_pay_secret_key' => 'nullable', - 'wechat_pay_private_cert' => 'nullable', - 'wechat_pay_certificate' => 'nullable', - ]); - } - - // 保存 - public function handle(array $input): void - { - SystemConfig::set($input); - } - - public function default(): array - { - return [ - 'wechat_pay_app_id' => SystemConfig::get('wechat_pay_app_id'), - 'wechat_pay_mch_id' => SystemConfig::get('wechat_pay_mch_id'), - 'wechat_pay_secret_key' => SystemConfig::get('wechat_pay_secret_key'), - 'wechat_pay_private_cert' => SystemConfig::get('wechat_pay_secret_key'), // 私钥证书 - 'wechat_pay_certificate' => SystemConfig::get('wechat_pay_certificate'), // 公钥证书 - ]; - } -} diff --git a/serve/app/Forms/VerifyCode.php b/serve/app/Forms/VerifyCode.php deleted file mode 100644 index 4e9aec5..0000000 --- a/serve/app/Forms/VerifyCode.php +++ /dev/null @@ -1,53 +0,0 @@ -validate([ - 'verify_code_is_open' => 'required|boolen', - 'send_code_mode' => 'nullable|integer|in:1,2', // 1短信2邮箱 - 'ali_sms_key' => 'nullable', - 'ali_sms_secret' => 'nullable', - 'ali_sms_sign_name' => 'nullable', - - 'mail_from_name' => 'nullable', - 'mail_host' => 'nullable', - 'mail_port' => 'nullable', - 'mail_from_address' => 'nullable', - 'mail_username' => 'nullable', - 'mail_password' => 'nullable', - ]); - } - - // 保存 - public function handle(array $input): void - { - SystemConfig::set($input); - } - - public function default(): array - { - return [ - 'verify_code_is_open' => SystemConfig::get('verify_code_is_open'), // 开启 - 'send_code_mode' => SystemConfig::get('send_code_mode'), // - - 'ali_sms_key' => SystemConfig::get('ali_sms_key'), - 'ali_sms_secret' => SystemConfig::get('ali_sms_secret'), - 'ali_sms_sign_name' => SystemConfig::get('ali_sms_sign_name'), - - 'mail_from_name' => SystemConfig::get('mail_from_name'), - 'mail_host' => SystemConfig::get('mail_host'), - 'mail_port' => SystemConfig::get('mail_port'), - 'mail_from_address' => SystemConfig::get('mail_from_address'), - 'mail_username' => SystemConfig::get('mail_username'), - 'mail_password' => SystemConfig::get('mail_password'), - ]; - } -} diff --git a/serve/app/Forms/WebSite.php b/serve/app/Forms/WebSite.php index e259b64..60ac16b 100644 --- a/serve/app/Forms/WebSite.php +++ b/serve/app/Forms/WebSite.php @@ -15,6 +15,25 @@ class WebSite implements SimpleForm 'web_site_title' => 'nullable', 'web_site_logo' => 'nullable', 'web_site_bottom_logo' => 'nullable', + + 'verify_code_is_open' => 'required|boolean', + 'send_code_mode' => 'nullable|integer|in:1,2', // 1短信2邮箱 + 'ali_sms_key' => 'nullable', + 'ali_sms_secret' => 'nullable', + 'ali_sms_sign_name' => 'nullable', + + 'mail_from_name' => 'nullable', + 'mail_host' => 'nullable', + 'mail_port' => 'nullable', + 'mail_from_address' => 'nullable', + 'mail_username' => 'nullable', + 'mail_password' => 'nullable', + + 'wechat_pay_app_id' => 'nullable', + 'wechat_pay_mch_id' => 'nullable', + 'wechat_pay_secret_key' => 'nullable', + 'wechat_pay_private_cert' => 'nullable', + 'wechat_pay_certificate' => 'nullable', ]); } @@ -31,6 +50,26 @@ class WebSite implements SimpleForm 'web_site_title' => SystemConfig::get('web_site_title'), 'web_site_logo' => SystemConfig::get('web_site_logo'), 'web_site_bottom_logo' => SystemConfig::get('web_site_bottom_logo'), + + 'verify_code_is_open' => SystemConfig::get('verify_code_is_open'), // 开启 + 'send_code_mode' => SystemConfig::get('send_code_mode'), // + + 'ali_sms_key' => SystemConfig::get('ali_sms_key'), + 'ali_sms_secret' => SystemConfig::get('ali_sms_secret'), + 'ali_sms_sign_name' => SystemConfig::get('ali_sms_sign_name'), + + 'mail_from_name' => SystemConfig::get('mail_from_name'), + 'mail_host' => SystemConfig::get('mail_host'), + 'mail_port' => SystemConfig::get('mail_port'), + 'mail_from_address' => SystemConfig::get('mail_from_address'), + 'mail_username' => SystemConfig::get('mail_username'), + 'mail_password' => SystemConfig::get('mail_password'), + + 'wechat_pay_app_id' => SystemConfig::get('wechat_pay_app_id'), + 'wechat_pay_mch_id' => SystemConfig::get('wechat_pay_mch_id'), + 'wechat_pay_secret_key' => SystemConfig::get('wechat_pay_secret_key'), + 'wechat_pay_private_cert' => SystemConfig::get('wechat_pay_secret_key'), // 私钥证书 + 'wechat_pay_certificate' => SystemConfig::get('wechat_pay_certificate'), // 公钥证书 ]; } } diff --git a/serve/app/Http/Controllers/Api/ConfigController.php b/serve/app/Http/Controllers/Api/ConfigController.php index d8ee380..92f555b 100644 --- a/serve/app/Http/Controllers/Api/ConfigController.php +++ b/serve/app/Http/Controllers/Api/ConfigController.php @@ -3,8 +3,6 @@ namespace App\Http\Controllers\Api; use App\Forms\BaseConfig; -use App\Forms\PaymentSet; -use App\Forms\VerifyCode; use App\Forms\WebSite; use Ugly\Base\Http\Controllers\SimpleFormController; @@ -13,7 +11,5 @@ class ConfigController extends SimpleFormController protected array $form = [ 'base' => BaseConfig::class, 'web_site' => WebSite::class, - 'payment' => PaymentSet::class, - 'verify_code' => VerifyCode::class, ]; }