From 234724abb65a5f1ea13ca8743b96d46493009136 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 17 May 2023 09:02:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/Login.php | 8 +++++++-
 crmeb/app/adminapi/route/route.php      | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/adminapi/controller/Login.php b/crmeb/app/adminapi/controller/Login.php
index 2239de764..12325a2f3 100644
--- a/crmeb/app/adminapi/controller/Login.php
+++ b/crmeb/app/adminapi/controller/Login.php
@@ -104,7 +104,13 @@ class Login extends AuthController
         }
 
         $this->validate(['account' => $account, 'pwd' => $password], \app\adminapi\validate\setting\SystemAdminValidata::class, 'get');
-        $password = $rsa->privateDecrypt($password);
+
+        try {
+            $password = $rsa->privateDecrypt($password);
+        } catch (\Throwable $e) {
+            return app('json')->fail($e->getMessage());
+        }
+        
         $result = $this->services->login($account, $password, 'admin', $key);
         if (!$result) {
             $num = CacheService::get('login_captcha', 1);
diff --git a/crmeb/app/adminapi/route/route.php b/crmeb/app/adminapi/route/route.php
index bcb82d491..b67a58968 100644
--- a/crmeb/app/adminapi/route/route.php
+++ b/crmeb/app/adminapi/route/route.php
@@ -24,6 +24,8 @@ Route::group(function () {
     Route::post('login', 'Login/login')->name('AdminLogin')->option(['real_name' => '下载表备份记录']);
     //后台登录页面数据
     Route::get('login/info', 'Login/info')->option(['real_name' => '登录信息']);
+    //获取公钥证书信息
+    Route::get('login/key', 'Login/key')->option(['real_name' => '获取公钥证书信息']);
     //下载文件
     Route::get('download/:key', 'PublicController/download')->option(['real_name' => '下载文件']);
     //验证码