From c13380e80fc84aecc80586a35e046ab8eb3013ea Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Wed, 1 May 2024 20:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/AuthController.php       | 3 +++
 app/Admin/Services/System/AdminUserService.php | 4 ++--
 app/Admin/routes.php                           | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/AuthController.php b/app/Admin/Controllers/AuthController.php
index 56e9e31..5117cd2 100644
--- a/app/Admin/Controllers/AuthController.php
+++ b/app/Admin/Controllers/AuthController.php
@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Services\System\AdminUserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -11,6 +12,8 @@ use Symfony\Component\HttpFoundation\Response;
 
 class AuthController extends AdminAuthController
 {
+    protected string $serviceName = AdminUserService::class;
+
     public function login(Request $request)
     {
         if (Admin::config('admin.auth.login_captcha')) {
diff --git a/app/Admin/Services/System/AdminUserService.php b/app/Admin/Services/System/AdminUserService.php
index 9918855..115bf13 100644
--- a/app/Admin/Services/System/AdminUserService.php
+++ b/app/Admin/Services/System/AdminUserService.php
@@ -117,12 +117,12 @@ class AdminUserService extends BaseService
             }
 
             if (strlen($password) < 6) {
-                admin_abort(__('admin.admin_user.password_confirmation'));
+                admin_abort('密码长度至少6个字符');
             }
 
             if ($id) {
                 if (! Arr::get($data, 'old_password')) {
-                    admin_abort('密码长度至少6个字符');
+                    admin_abort(__('admin.admin_user.old_password_required'));
                 }
 
                 $oldPassword = $this->query()->where('id', $id)->value('password');
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index 315943f..d207bf5 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -2,6 +2,7 @@
 
 use App\Admin\Controllers\AgreementController;
 use App\Admin\Controllers\AppVersionController;
+use App\Admin\Controllers\AuthController;
 use App\Admin\Controllers\BaseKeywordController;
 use App\Admin\Controllers\CockpitController;
 use App\Admin\Controllers\Complaint\ComplaintController;
@@ -43,7 +44,8 @@ Route::group([
     'middleware' => config('admin.route.middleware'),
     'as' => 'admin.',
 ], function (Router $router) {
-    $router->post('login', [App\Admin\Controllers\AuthController::class, 'login']);
+    $router->post('login', [AuthController::class, 'login']);
+    $router->put('user_setting', [AuthController::class, 'saveUserSetting']);
 
     $router->resource('index', \App\Admin\Controllers\HomeController::class);