From e3726755ef4a2df13d63efdea3ae196452b0b4db Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Wed, 7 May 2025 19:34:05 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20feat:=20=E7=B2=BE=E7=A1=AE=E5=88=B0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9F=A5=E8=AF=A2=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReadMe.md                                             | 11 ++++++-----
 package.json                                          |  3 ++-
 src/api/v1/email/emailTemplate.ts                     |  2 +-
 src/views/configuration/email-template/utils/auth.ts  |  2 +-
 src/views/configuration/email-user/utils/auth.ts      |  2 +-
 src/views/configuration/menu-icon/utils/auth.ts       |  2 +-
 src/views/i18n/i18n-setting/utils/auth.ts             |  2 +-
 .../message-manger/message-received/utils/auth.ts     |  2 +-
 src/views/message-manger/message-send/utils/auth.ts   |  2 +-
 src/views/message-manger/message-type/utils/auth.ts   |  2 +-
 src/views/monitor/logged-in/utils/columns.ts          |  8 ++------
 src/views/monitor/user-login-log/utils/auth.ts        |  2 +-
 src/views/scheduler/schedulers-group/utils/auth.ts    |  2 +-
 src/views/scheduler/schedulers/utils/auth.ts          |  2 +-
 src/views/system/admin-user/utils/auth.ts             |  2 +-
 src/views/system/dept/utils/auth.ts                   |  2 +-
 src/views/system/files/utils/auth.ts                  |  2 +-
 src/views/system/menu/utils/modules/auth.ts           |  2 +-
 src/views/system/role/utils/auth.ts                   |  2 +-
 19 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/ReadMe.md b/ReadMe.md
index c092c9a..9f85406 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -28,10 +28,11 @@
 
 **介绍视频视频**
 
-- [环境搭建](https://www.bilibili.com/video/BV17odHY6E3S/?spm_id_from=333.1387.homepage.video_card.click&vd_source=d42b5b664efb958be39eef8ee1196a7e)
-- [运行项目](https://www.bilibili.com/video/BV1qodHYzErA/?spm_id_from=333.1387.homepage.video_card.click&vd_source=d42b5b664efb958be39eef8ee1196a7e)
-- [前端部署](https://www.bilibili.com/video/BV1BddHYgEPq/?spm_id_from=333.1387.homepage.video_card.click&vd_source=d42b5b664efb958be39eef8ee1196a7e)
-- [后端部署](https://www.bilibili.com/video/BV1BddHYgEFt/?spm_id_from=333.1387.homepage.video_card.click&vd_source=d42b5b664efb958be39eef8ee1196a7e)
+- [RBAC中URL的权限数据库、后端设计](https://www.bilibili.com/video/BV1nGVazrEKf/)
+- [bunny-admin 配置说明](https://www.bilibili.com/video/BV177VazMEiM/)
+- [Bunny-Admin 用户相关操作](https://www.bilibili.com/video/BV1B7VazME72/)
+- [Bunny-Admin 角色权限](https://www.bilibili.com/video/BV1ELVazzEnC/)
+- [Bunny-Admin 剩下的业务逻辑](https://www.bilibili.com/video/BV1ELVazzE7S/)
 - [代码生成器](https://www.bilibili.com/video/BV1d4Lxz9E3j/?vd_source=d42b5b664efb958be39eef8ee1196a7e)
 
 **Github地址**
@@ -131,7 +132,7 @@ graph TD
 auth-api -->|启动项、控制器| service
 service -->|mapper| dao
 service -->|包含domain、配置等| auth-core
-dao -->|包含domain、配置等| auth-code
+dao -->|包含domain、配置等| auth-core
 
 
 ```
diff --git a/package.json b/package.json
index cce213e..892b4be 100644
--- a/package.json
+++ b/package.json
@@ -192,5 +192,6 @@
       "typeit",
       "vue-demi"
     ]
-  }
+  },
+  "packageManager": "pnpm@10.8.1+sha512.c50088ba998c67b8ca8c99df8a5e02fd2ae2e2b29aaf238feaa9e124248d3f48f9fb6db2424949ff901cffbb5e0f0cc1ad6aedb602cd29450751d11c35023677"
 }
diff --git a/src/api/v1/email/emailTemplate.ts b/src/api/v1/email/emailTemplate.ts
index 0674db0..f5a81fb 100644
--- a/src/api/v1/email/emailTemplate.ts
+++ b/src/api/v1/email/emailTemplate.ts
@@ -25,5 +25,5 @@ export const deleteEmailTemplate = (data: any) => {
 
 /** 邮件模板表---获取全部邮件类型列表 */
 export const getEmailTypeList = () => {
-  return http.request<BaseResult<any>>('get', 'emailTemplate/public');
+  return http.request<BaseResult<any>>('get', 'emailTemplate/private');
 };
diff --git a/src/views/configuration/email-template/utils/auth.ts b/src/views/configuration/email-template/utils/auth.ts
index 5e51f04..4da5dff 100644
--- a/src/views/configuration/email-template/utils/auth.ts
+++ b/src/views/configuration/email-template/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['emailTemplate::query', 'emailTemplate::queryPage'],
+  query: 'emailTemplate::query',
   // 添加操作
   add: ['emailTemplate::add'],
   // 更新操作
diff --git a/src/views/configuration/email-user/utils/auth.ts b/src/views/configuration/email-user/utils/auth.ts
index 2cdb52e..4ac5ee5 100644
--- a/src/views/configuration/email-user/utils/auth.ts
+++ b/src/views/configuration/email-user/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['emailUsers::query', 'emailUsers::queryPage'],
+  query: 'emailUsers::query',
   // 添加操作
   add: ['emailUsers::add'],
   // 更新操作
diff --git a/src/views/configuration/menu-icon/utils/auth.ts b/src/views/configuration/menu-icon/utils/auth.ts
index 3a3ccd4..cf72109 100644
--- a/src/views/configuration/menu-icon/utils/auth.ts
+++ b/src/views/configuration/menu-icon/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['menuIcon::query', 'menuIcon::queryPage'],
+  query: 'menuIcon::query',
   // 添加操作
   add: ['menuIcon::add'],
   // 更新操作
diff --git a/src/views/i18n/i18n-setting/utils/auth.ts b/src/views/i18n/i18n-setting/utils/auth.ts
index d381473..99349b5 100644
--- a/src/views/i18n/i18n-setting/utils/auth.ts
+++ b/src/views/i18n/i18n-setting/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['i18n::query', 'i18n::queryPage'],
+  query: 'i18n::query',
   // 添加操作
   add: ['i18n::add'],
   // 更新操作
diff --git a/src/views/message-manger/message-received/utils/auth.ts b/src/views/message-manger/message-received/utils/auth.ts
index c0b1a02..1b68adb 100644
--- a/src/views/message-manger/message-received/utils/auth.ts
+++ b/src/views/message-manger/message-received/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['messageReceived::query', 'messageReceived::queryPage'],
+  query: 'messageReceived::query',
   // 更新操作
   update: ['messageReceived::update'],
   // 删除操作
diff --git a/src/views/message-manger/message-send/utils/auth.ts b/src/views/message-manger/message-send/utils/auth.ts
index 0854966..b5a1c05 100644
--- a/src/views/message-manger/message-send/utils/auth.ts
+++ b/src/views/message-manger/message-send/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  search: ['message::getMessageList'],
+  search: 'message::getMessageList',
   // 添加操作
   add: ['message::addMessage'],
   // 更新操作
diff --git a/src/views/message-manger/message-type/utils/auth.ts b/src/views/message-manger/message-type/utils/auth.ts
index 2ef0dae..1190c70 100644
--- a/src/views/message-manger/message-type/utils/auth.ts
+++ b/src/views/message-manger/message-type/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['messageType::query', 'messageType::queryPage'],
+  query: 'messageType::query',
   // 添加操作
   add: ['messageType::add'],
   // 更新操作
diff --git a/src/views/monitor/logged-in/utils/columns.ts b/src/views/monitor/logged-in/utils/columns.ts
index 92ff5d8..d657d9e 100644
--- a/src/views/monitor/logged-in/utils/columns.ts
+++ b/src/views/monitor/logged-in/utils/columns.ts
@@ -4,18 +4,14 @@ export const columns: TableColumnList = [
   {
     type: 'index',
     index: (index: number) => index + 1,
-    label: $t("index"),
+    label: $t('index'),
     width: 60,
   },
   { label: $t('adminUser_nickname'), prop: 'nickname', minWidth: 120 },
   { label: $t('adminUser_username'), prop: 'username', slot: 'username', minWidth: 120 },
   { label: $t('adminUser_email'), prop: 'email', minWidth: 120 },
   { label: $t('adminUser_phone'), prop: 'phone', minWidth: 120 },
-  { label: $t('adminUser_summary'), prop: 'personDescription', minWidth: 150 },
-  { label: $t('lastLoginIp'), prop: 'ipAddress', minWidth: 100 },
-  { label: $t('lastLoginIpAddress'), prop: 'ipRegion', minWidth: 100 },
-  { label: $t('expires'), prop: 'expires', minWidth: 120 },
-  { label: $t('readMeDay'), prop: 'readMeDay', width: 100 },
+  { label: $t('adminUser_summary'), prop: 'summary', minWidth: 150 },
   {
     label: $t('table.operation'),
     fixed: 'right',
diff --git a/src/views/monitor/user-login-log/utils/auth.ts b/src/views/monitor/user-login-log/utils/auth.ts
index 42a973f..b2c8251 100644
--- a/src/views/monitor/user-login-log/utils/auth.ts
+++ b/src/views/monitor/user-login-log/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  search: ['userLoginLog::query', 'userLoginLog::queryPage'],
+  search: 'userLoginLog::query',
   // 删除操作
   delete: ['userLoginLog::delete'],
 };
diff --git a/src/views/scheduler/schedulers-group/utils/auth.ts b/src/views/scheduler/schedulers-group/utils/auth.ts
index 067a3d4..3e0392e 100644
--- a/src/views/scheduler/schedulers-group/utils/auth.ts
+++ b/src/views/scheduler/schedulers-group/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['schedulersGroup::query'],
+  query: 'schedulersGroup::query',
   // 添加操作
   add: ['schedulersGroup::add'],
   // 更新操作
diff --git a/src/views/scheduler/schedulers/utils/auth.ts b/src/views/scheduler/schedulers/utils/auth.ts
index 142828f..cd94510 100644
--- a/src/views/scheduler/schedulers/utils/auth.ts
+++ b/src/views/scheduler/schedulers/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['schedulers::query'],
+  query: 'schedulers::query',
   // 添加操作
   add: ['schedulers::add'],
   // 暂停
diff --git a/src/views/system/admin-user/utils/auth.ts b/src/views/system/admin-user/utils/auth.ts
index daecae3..52de823 100644
--- a/src/views/system/admin-user/utils/auth.ts
+++ b/src/views/system/admin-user/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['user::query', 'user::queryPage'],
+  query: 'user::query',
   // 添加操作
   add: ['user::add'],
   // 更新操作
diff --git a/src/views/system/dept/utils/auth.ts b/src/views/system/dept/utils/auth.ts
index ad0bf3f..717b07b 100644
--- a/src/views/system/dept/utils/auth.ts
+++ b/src/views/system/dept/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['dept::query', 'dept::queryPage'],
+  query: 'dept::query',
   // 添加操作
   add: ['dept::add'],
   // 更新操作
diff --git a/src/views/system/files/utils/auth.ts b/src/views/system/files/utils/auth.ts
index f16f74f..7474c38 100644
--- a/src/views/system/files/utils/auth.ts
+++ b/src/views/system/files/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['files:query', 'files:queryPage'],
+  query: 'files:query',
   // 更新操作
   update: ['files::update'],
   // 添加操作
diff --git a/src/views/system/menu/utils/modules/auth.ts b/src/views/system/menu/utils/modules/auth.ts
index cf23901..81a7ab2 100644
--- a/src/views/system/menu/utils/modules/auth.ts
+++ b/src/views/system/menu/utils/modules/auth.ts
@@ -4,7 +4,7 @@ export const auth = {
   // 添加操作
   add: ['router::addMenu'],
   // 分页查询
-  search: ['router::menuList'],
+  search: 'router::menuList',
   // 删除操作
   deleted: ['router::deletedMenuByIds'],
   // 为菜单分配角色
diff --git a/src/views/system/role/utils/auth.ts b/src/views/system/role/utils/auth.ts
index f6c17ed..bd831f1 100644
--- a/src/views/system/role/utils/auth.ts
+++ b/src/views/system/role/utils/auth.ts
@@ -1,6 +1,6 @@
 export const auth = {
   // 分页查询
-  query: ['role::query', 'role::queryPage'],
+  query: 'role::query',
   // 添加操作
   add: ['role::add'],
   // 更新操作