diff --git a/app/Enums/Mail/SmtpOption.php b/app/Enums/Mail/SmtpOption.php
index f252f658..6fbeb16f 100644
--- a/app/Enums/Mail/SmtpOption.php
+++ b/app/Enums/Mail/SmtpOption.php
@@ -23,4 +23,10 @@ final class SmtpOption
 
     /** @var string 超时时间 */
     const Timeout = 'timeout';
+
+    /** @var string 发件人地址 */
+    const FromAddress = 'from_address';
+
+    /** @var string 发件人名称 */
+    const FromName = 'from_name';
 }
diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php
index 62ff2486..a7cf2746 100644
--- a/app/Http/Controllers/Admin/SettingController.php
+++ b/app/Http/Controllers/Admin/SettingController.php
@@ -3,18 +3,27 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Models\Config;
+use App\Utils;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\View\View;
 
 class SettingController extends Controller
 {
     public function index(): View
     {
-        return view('admin.setting.index');
+        $configs = Utils::config();
+        return view('admin.setting.index', compact('configs'));
     }
 
-    public function save(): Response
+    public function save(Request $request): Response
     {
+        foreach ($request->all() as $key => $value) {
+            Config::query()->where('name', $key)->update(['value' => $value]);
+        }
+        Cache::flush();
         return $this->success('保存成功');
     }
 }
diff --git a/resources/views/admin/setting/index.blade.php b/resources/views/admin/setting/index.blade.php
index 6b6e8c95..5cc9abef 100644
--- a/resources/views/admin/setting/index.blade.php
+++ b/resources/views/admin/setting/index.blade.php
@@ -7,19 +7,19 @@
             <div class="relative p-4 rounded-md bg-white mb-8 space-y-4">
                 <div>
                     <label for="site_name" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>网站名称</label>
-                    <x-input type="text" name="site_name" id="site_name" value="" placeholder="请输入网站名称"/>
+                    <x-input type="text" name="site_name" id="site_name" value="{{ $configs['site_name'] }}" placeholder="请输入网站名称"/>
                 </div>
                 <div>
                     <label for="site_keywords" class="block text-sm font-medium text-gray-700">网站关键字</label>
-                    <x-textarea type="text" name="site_keywords" id="site_keywords" value="" placeholder="请输入网站关键字"></x-textarea>
+                    <x-textarea type="text" name="site_keywords" id="site_keywords" placeholder="请输入网站关键字">{{ $configs['site_keywords'] }}</x-textarea>
                 </div>
                 <div>
                     <label for="site_description" class="block text-sm font-medium text-gray-700">网站描述</label>
-                    <x-textarea type="text" name="site_description" id="site_description" value="" placeholder="请输入网站描述"></x-textarea>
+                    <x-textarea type="text" name="site_description" id="site_description" placeholder="请输入网站描述">{{ $configs['site_description'] }}</x-textarea>
                 </div>
                 <div>
                     <label for="icp_no" class="block text-sm font-medium text-gray-700">备案号</label>
-                    <x-input type="text" name="icp_no" id="icp_no" value="" placeholder="请输入备案号"/>
+                    <x-input type="text" name="icp_no" id="icp_no" value="{{ $configs['icp_no'] }}" placeholder="请输入备案号"/>
                 </div>
 
                 <div class="text-right">
@@ -33,16 +33,20 @@
         <form action="{{ route('admin.settings.save') }}">
             <div class="relative p-4 rounded-md bg-white mb-8 space-y-4">
                 <x-fieldset title="是否启用注册" faq="启用或关闭系统注册功能">
-                    <x-switch name="is_enable_registration" />
+                    <input type="hidden" name="is_enable_registration" value="0">
+                    <x-switch name="is_enable_registration" value="1" :checked="(bool) $configs['is_enable_registration']" />
                 </x-fieldset>
                 <x-fieldset title="是否启用画廊" faq="启用或关闭画廊功能，画廊只有已登录的用户可见，画廊中的图片均为所有用户公开的图片。">
-                    <x-switch name="is_enable_gallery" />
+                    <input type="hidden" name="is_enable_gallery" value="0">
+                    <x-switch name="is_enable_gallery" value="1" :checked="(bool) $configs['is_enable_gallery']" />
                 </x-fieldset>
                 <x-fieldset title="是否允许游客上传" faq="启用或关闭游客上传功能，游客上传受「系统默认组」控制。">
-                    <x-switch name="is_allow_guest_upload" />
+                    <input type="hidden" name="is_allow_guest_upload" value="0">
+                    <x-switch name="is_allow_guest_upload" value="1" :checked="(bool) $configs['is_allow_guest_upload']" />
                 </x-fieldset>
                 <x-fieldset title="账号验证" faq="是否强制用户验证邮箱，开启后用户必须经过验证邮箱后才能上传图片，请确保邮件配置正常。">
-                    <x-switch name="is_user_need_verify" />
+                    <input type="hidden" name="is_user_need_verify" value="0">
+                    <x-switch name="is_user_need_verify" value="1" :checked="(bool) $configs['is_user_need_verify']" />
                 </x-fieldset>
 
                 <div class="text-right">
@@ -56,7 +60,7 @@
             <div class="relative p-4 rounded-md bg-white mb-8 space-y-4">
                 <div>
                     <label for="user_initial_capacity" class="block text-sm font-medium text-gray-700">用户初始容量(kb)</label>
-                    <x-input type="number" name="user_initial_capacity" id="user_initial_capacity" step="0.01" value="" placeholder="请输入用户初始容量(kb)"/>
+                    <x-input type="number" name="user_initial_capacity" id="user_initial_capacity" step="0.01" value="{{ $configs['user_initial_capacity'] }}" placeholder="请输入用户初始容量(kb)"/>
                 </div>
 
                 <div class="text-right">
@@ -66,46 +70,55 @@
         </form>
 
         <p class="mb-3 font-semibold text-lg text-gray-700">邮件配置</p>
-        <form action="{{ route('admin.settings.save') }}">
-            <div class="relative p-4 rounded-md bg-white mb-8 space-y-4">
-                <x-fieldset title="发信驱动">
-                    <x-fieldset-radio id="mail_configs[default]" name="mail_configs[default]" data-select="mailer" value="smtp" checked>SMTP</x-fieldset-radio>
-                </x-fieldset>
+        <div class="relative p-4 rounded-md bg-white mb-8 space-y-4">
+            <x-fieldset title="发信驱动">
+                <x-fieldset-radio id="mail_configs[default]" name="mail_configs[default]" data-select="mailer" value="smtp" checked>SMTP</x-fieldset-radio>
+            </x-fieldset>
 
-                <div class="mb-4 hidden space-y-4" data-mailer-driver="smtp">
+            <div class="mb-4 hidden" data-mailer-driver="smtp">
+                <form action="{{ route('admin.settings.save') }}" class="space-y-4">
                     <div>
                         <label for="mail_configs[mailers][smtp][host]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>主机地址</label>
-                        <x-input type="text" name="mail_configs[mailers][smtp][transport][host]" id="mail_configs[mailers][smtp][host]" value="" placeholder="请输入 SMTP 主机地址"/>
+                        <x-input type="text" name="mail_configs[mailers][smtp][host]" id="mail_configs[mailers][smtp][host]" value="{{ $configs['mail_configs']['mailers']['smtp']['host'] }}" placeholder="请输入 SMTP 主机地址"/>
                     </div>
                     <div>
                         <label for="mail_configs[mailers][smtp][port]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>连接端口</label>
-                        <x-input type="number" name="mail_configs[mailers][smtp][port]" id="mail_configs[mailers][smtp][port]" value="" placeholder="请输入 SMTP 主机连接端口"/>
-                    </div>
-                    <div>
-                        <label for="mail_configs[mailers][smtp][encryption]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>加密方式</label>
-                        <x-input type="number" name="mail_configs[mailers][smtp][port]" id="mail_configs[mailers][smtp][encryption]" value="" placeholder="请输入加密方式(ssl, tls)"/>
+                        <x-input type="number" name="mail_configs[mailers][smtp][port]" id="mail_configs[mailers][smtp][port]" value="{{ $configs['mail_configs']['mailers']['smtp']['port'] }}" placeholder="请输入 SMTP 主机连接端口"/>
                     </div>
                     <div>
                         <label for="mail_configs[mailers][smtp][username]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>用户名</label>
-                        <x-input type="text" name="mail_configs[mailers][smtp][username]" id="mail_configs[mailers][smtp][username]" value="" placeholder="请输入用户名"/>
+                        <x-input type="text" name="mail_configs[mailers][smtp][username]" id="mail_configs[mailers][smtp][username]" value="{{ $configs['mail_configs']['mailers']['smtp']['username'] }}" placeholder="请输入用户名"/>
                     </div>
                     <div>
                         <label for="mail_configs[mailers][smtp][password]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>密码</label>
-                        <x-input type="text" name="mail_configs[mailers][smtp][username]" id="mail_configs[mailers][smtp][password]" value="" placeholder="请输入密码"/>
+                        <x-input type="text" name="mail_configs[mailers][smtp][password]" id="mail_configs[mailers][smtp][password]" value="{{ $configs['mail_configs']['mailers']['smtp']['password'] }}" placeholder="请输入密码"/>
+                    </div>
+                    <div>
+                        <label for="mail_configs[mailers][smtp][encryption]" class="block text-sm font-medium text-gray-700">加密方式</label>
+                        <x-input type="text" name="mail_configs[mailers][smtp][encryption]" id="mail_configs[mailers][smtp][encryption]" value="{{ $configs['mail_configs']['mailers']['smtp']['encryption'] }}" placeholder="请输入加密方式(ssl, tls)"/>
                     </div>
                     <div>
                         <label for="mail_configs[mailers][smtp][timeout]" class="block text-sm font-medium text-gray-700">连接超时时间(秒)</label>
-                        <x-input type="number" name="mail_configs[mailers][smtp][timeout]" id="mail_configs[mailers][smtp][timeout]" value="" placeholder="请输入连接超时时间(秒)"/>
+                        <x-input type="number" name="mail_configs[mailers][smtp][timeout]" id="mail_configs[mailers][smtp][timeout]" value="{{ $configs['mail_configs']['mailers']['smtp']['timeout'] }}" placeholder="请输入连接超时时间(秒)"/>
+                    </div>
+                    <div>
+                        <label for="mail_configs[mailers][smtp][from_address]" class="block text-sm font-medium text-gray-700">发件人地址</label>
+                        <x-input type="email" name="mail_configs[mailers][smtp][from_address]" id="mail_configs[mailers][smtp][from_address]" value="{{ $configs['mail_configs']['mailers']['smtp']['from_address'] ?? '' }}" placeholder="请输入发件人邮箱地址"/>
+                    </div>
+                    <div>
+                        <label for="mail_configs[mailers][smtp][from_name]" class="block text-sm font-medium text-gray-700">发件人名称</label>
+                        <x-input type="text" name="mail_configs[mailers][smtp][from_name]" id="mail_configs[mailers][smtp][from_name]" value="{{ $configs['mail_configs']['mailers']['smtp']['from_name'] ?? '' }}" placeholder="请输入发件人名称"/>
                     </div>
 
+                    <input type="hidden" name="mail_configs[default]" value="smtp">
                     <input type="hidden" name="mail_configs[mailers][smtp][transport]" value="smtp">
 
                     <div class="text-right">
                         <x-button type="submit">保存更改</x-button>
                     </div>
-                </div>
+                </form>
             </div>
-        </form>
+        </div>
     </div>
 
     @push('scripts')
@@ -122,6 +135,13 @@
             $('[data-select]').click(function () {
                 setSelected();
             });
+
+            $('form').submit(function (e) {
+                e.preventDefault();
+                axios.put(this.action, $(this).serialize()).then(function (response) {
+                    toastr[response.data.status ? 'success' : 'error'](response.data.message)
+                });
+            });
         </script>
     @endpush