diff --git a/cutejava-front/package.json b/cutejava-front/package.json
index 706b3bee..a43f9315 100644
--- a/cutejava-front/package.json
+++ b/cutejava-front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cutejava-front",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "CuteJava 前端源码",
   "author": "Odboy",
   "license": "Apache-2.0",
@@ -38,7 +38,7 @@
     "@riophae/vue-treeselect": "^0.4.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",
-    "axios": "1.8.2",
+    "axios": "1.12.0",
     "clipboard": "2.0.4",
     "codemirror": "^5.49.2",
     "core-js": "^2.6.12",
diff --git a/cutejava-front/src/api/login.js b/cutejava-front/src/api/login.js
index d8309e9e..3a612948 100644
--- a/cutejava-front/src/api/login.js
+++ b/cutejava-front/src/api/login.js
@@ -15,14 +15,14 @@ export function login(username, password, code, uuid) {
 
 export function getInfo() {
   return request({
-    url: 'auth/info',
+    url: 'api/user/getCurrentUserInfo',
     method: 'post'
   })
 }
 
 export function getCodeImg() {
   return request({
-    url: 'auth/captcha/getImage',
+    url: 'captcha/getCode',
     method: 'post'
   })
 }
diff --git a/cutejava-front/src/api/system/code.js b/cutejava-front/src/api/system/code.js
index d122c406..a5b5b3cd 100644
--- a/cutejava-front/src/api/system/code.js
+++ b/cutejava-front/src/api/system/code.js
@@ -1,27 +1,27 @@
 import request from '@/utils/request'
 
-export function sendResetEmailCaptcha(email) {
+export function sendResetEmailCode(email) {
   return request({
-    url: 'api/captcha/sendResetEmailCaptcha?email=' + email,
+    url: 'api/captcha/sendResetEmailCode?email=' + email,
     method: 'post'
   })
 }
 
-export function sendResetPasswordCaptcha(email) {
+export function sendResetPasswordCode(email) {
   return request({
-    url: 'api/captcha/sendResetPasswordCaptcha?email=' + email,
+    url: 'api/captcha/sendResetPasswordCode?email=' + email,
     method: 'post'
   })
 }
 
-export function checkEmailCaptcha(email, code, bizCode) {
+export function verifyCode(email, code, bizCode) {
   const params = {
     email: email,
     code: code,
     bizCode: bizCode
   }
   return request({
-    url: 'api/captcha/checkEmailCaptcha',
+    url: 'api/captcha/verifyCode',
     method: 'post',
     data: params
   })
diff --git a/cutejava-front/src/api/system/component.js b/cutejava-front/src/api/system/component.js
index a17661f2..c48b7a91 100644
--- a/cutejava-front/src/api/system/component.js
+++ b/cutejava-front/src/api/system/component.js
@@ -1,15 +1,15 @@
 import request from '@/utils/request'
 
-export function queryDeptSelectDataSource() {
+export function listDeptSelectDataSource() {
   return request({
-    url: 'api/component/queryDeptSelectDataSource',
+    url: 'api/component/listDeptSelectDataSource',
     method: 'post'
   })
 }
 
-export function queryDeptSelectProDataSource() {
+export function listDeptSelectProDataSource() {
   return request({
-    url: 'api/component/queryDeptSelectProDataSource',
+    url: 'api/component/listDeptSelectProDataSource',
     method: 'post'
   })
 }
diff --git a/cutejava-front/src/api/system/dept.js b/cutejava-front/src/api/system/dept.js
index 278ff12b..99a58c75 100644
--- a/cutejava-front/src/api/system/dept.js
+++ b/cutejava-front/src/api/system/dept.js
@@ -1,23 +1,8 @@
 import request from '@/utils/request'
 
-export function queryDeptList(params) {
-  return request({
-    url: 'api/dept',
-    method: 'post',
-    data: params
-  })
-}
-
-export function queryDeptSuperiorTree(ids, exclude) {
-  exclude = exclude !== undefined ? exclude : false
-  const data = Array.isArray(ids) ? ids : [ids]
-  return request({
-    url: 'api/dept/queryDeptSuperiorTree?exclude=' + exclude,
-    method: 'post',
-    data: data
-  })
-}
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/dept/saveDept',
@@ -28,7 +13,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/dept/removeDeptByIds',
+    url: 'api/dept/deleteDeptByIds',
     method: 'post',
     data: ids
   })
@@ -36,10 +21,28 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/dept/modifyDept',
+    url: 'api/dept/updateDeptById',
     method: 'post',
     data: data
   })
 }
 
-export default { add, edit, del, queryDeptList, queryDeptSuperiorTree }
+export function searchDept(params) {
+  return request({
+    url: 'api/dept/searchDept',
+    method: 'post',
+    data: params
+  })
+}
+
+export function searchDeptTree(ids, exclude) {
+  exclude = exclude !== undefined ? exclude : false
+  const data = Array.isArray(ids) ? ids : [ids]
+  return request({
+    url: 'api/dept/searchDeptTree?exclude=' + exclude,
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, searchDept, searchDeptTree }
diff --git a/cutejava-front/src/api/system/dict.js b/cutejava-front/src/api/system/dict.js
index 5dc359b0..6576e87f 100644
--- a/cutejava-front/src/api/system/dict.js
+++ b/cutejava-front/src/api/system/dict.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/dict/saveDict',
@@ -10,7 +12,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/dict/removeDictByIds',
+    url: 'api/dict/deleteDictByIds',
     method: 'post',
     data: ids
   })
@@ -18,18 +20,18 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/dict/modifyDictById',
+    url: 'api/dict/updateDictById',
     method: 'post',
     data: data
   })
 }
 
-export function queryPageDict(data) {
+export function searchDict(data) {
   return request({
-    url: 'api/dict',
+    url: 'api/dict/searchDict',
     method: 'post',
     data: data
   })
 }
 
-export default { add, edit, del, queryPageDict }
+export default { add, edit, del, searchDict }
diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js
index 6b77d5f7..de08ad19 100644
--- a/cutejava-front/src/api/system/dictDetail.js
+++ b/cutejava-front/src/api/system/dictDetail.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function get(dictName) {
   const params = {
     page: 1,
@@ -9,7 +11,7 @@ export function get(dictName) {
     }
   }
   return request({
-    url: 'api/dictDetail/queryDictDetailByArgs',
+    url: 'api/dictDetail/searchDictDetail',
     method: 'post',
     data: params
   })
@@ -25,7 +27,7 @@ export function add(data) {
 
 export function del(id) {
   return request({
-    url: 'api/dictDetail/removeDictDetailById',
+    url: 'api/dictDetail/deleteDictDetailById',
     method: 'post',
     data: { id: id }
   })
@@ -33,7 +35,7 @@ export function del(id) {
 
 export function edit(data) {
   return request({
-    url: 'api/dictDetail/modifyDictDetailById',
+    url: 'api/dictDetail/updateDictDetailById',
     method: 'post',
     data: data
   })
diff --git a/cutejava-front/src/api/system/email.js b/cutejava-front/src/api/system/email.js
index fb193340..522c5684 100644
--- a/cutejava-front/src/api/system/email.js
+++ b/cutejava-front/src/api/system/email.js
@@ -7,17 +7,17 @@ export function getLastEmailConfig() {
   })
 }
 
-export function modifyEmailConfig(data) {
+export function updateEmailConfigById(data) {
   return request({
-    url: 'api/email/modifyEmailConfig',
+    url: 'api/email/updateEmailConfigById',
     method: 'post',
     data: data
   })
 }
 
-export function sendEmail(data) {
+export function send(data) {
   return request({
-    url: 'api/email/sendEmail',
+    url: 'api/email/send',
     method: 'post',
     data: data
   })
diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js
index 4fc34241..3f48d48b 100644
--- a/cutejava-front/src/api/system/job.js
+++ b/cutejava-front/src/api/system/job.js
@@ -1,20 +1,7 @@
 import request from '@/utils/request'
-
-export function queryAllEnableJob() {
-  const params = {
-    page: 1,
-    size: 9999999,
-    args: {
-      enabled: true
-    }
-  }
-  return request({
-    url: 'api/job/queryAllEnableJob',
-    method: 'post',
-    data: params
-  })
-}
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/job/saveJob',
@@ -25,7 +12,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/job/removeJobByIds',
+    url: 'api/job/deleteJobByIds',
     method: 'post',
     data: ids
   })
@@ -33,10 +20,24 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/job/modifyJobById',
+    url: 'api/job/updateJobById',
     method: 'post',
     data: data
   })
 }
+export function searchJob() {
+  const params = {
+    page: 1,
+    size: 9999999,
+    args: {
+      enabled: true
+    }
+  }
+  return request({
+    url: 'api/job/searchJob',
+    method: 'post',
+    data: params
+  })
+}
 
 export default { add, edit, del }
diff --git a/cutejava-front/src/api/system/localStorage.js b/cutejava-front/src/api/system/localStorage.js
index e64c9440..0fe39f44 100644
--- a/cutejava-front/src/api/system/localStorage.js
+++ b/cutejava-front/src/api/system/localStorage.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/localStorage/uploadFile',
@@ -10,7 +12,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/localStorage/removeFileByIds',
+    url: 'api/localStorage/deleteFileByIds',
     method: 'post',
     data: ids
   })
@@ -18,7 +20,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/localStorage/modifyLocalStorageById',
+    url: 'api/localStorage/updateLocalStorageById',
     method: 'post',
     data: data
   })
diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js
index f7b5bdd3..8a888e68 100644
--- a/cutejava-front/src/api/system/menu.js
+++ b/cutejava-front/src/api/system/menu.js
@@ -1,15 +1,42 @@
 import request from '@/utils/request'
 
-export function queryMenuListByPid(pid) {
+/**
+ * 默认入口：add、del、edit、get
+ */
+export function add(data) {
   return request({
-    url: 'api/menu/queryMenuListByPid?pid=' + pid,
+    url: 'api/menu/saveMenu',
+    method: 'post',
+    data: data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/menu/deleteMenuByIds',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/menu/updateMenuById',
+    method: 'post',
+    data: data
+  })
+}
+
+export function listMenuByPid(pid) {
+  return request({
+    url: 'api/menu/listMenuByPid?pid=' + pid,
     method: 'post'
   })
 }
 
-export function queryMenuByArgs(params) {
+export function searchMenu(params) {
   return request({
-    url: 'api/menu/queryMenuByArgs',
+    url: 'api/menu/searchMenu',
     method: 'post',
     data: params
   })
@@ -24,9 +51,9 @@ export function queryMenuSuperior(ids) {
   })
 }
 
-export function queryChildMenuSet(id) {
+export function listChildMenuSetByMenuId(id) {
   return request({
-    url: 'api/menu/queryChildMenuSet?id=' + id,
+    url: 'api/menu/listChildMenuSetByMenuId?id=' + id,
     method: 'post'
   })
 }
@@ -38,28 +65,4 @@ export function buildMenus() {
   })
 }
 
-export function add(data) {
-  return request({
-    url: 'api/menu/saveMenu',
-    method: 'post',
-    data: data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/menu/removeMenuByIds',
-    method: 'post',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/menu/modifyMenuById',
-    method: 'post',
-    data: data
-  })
-}
-
-export default { add, edit, del, queryMenuListByPid, queryMenuSuperior, queryMenuByArgs, queryChildMenuSet }
+export default { add, edit, del, listMenuByPid, queryMenuSuperior, searchMenu, listChildMenuSetByMenuId }
diff --git a/cutejava-front/src/api/system/ossStorage.js b/cutejava-front/src/api/system/ossStorage.js
index 9ebb1754..3fa3bd72 100644
--- a/cutejava-front/src/api/system/ossStorage.js
+++ b/cutejava-front/src/api/system/ossStorage.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/ossStorage/uploadFile',
@@ -10,7 +12,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/ossStorage/removeFileByIds',
+    url: 'api/ossStorage/deleteFileByIds',
     method: 'post',
     data: ids
   })
diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js
index 073e62ef..62b3cafb 100644
--- a/cutejava-front/src/api/system/quartzJob.js
+++ b/cutejava-front/src/api/system/quartzJob.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/quartzJob/createQuartzJob',
@@ -10,7 +12,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/quartzJob/removeJobByIds',
+    url: 'api/quartzJob/deleteJobByIds',
     method: 'post',
     data: ids
   })
@@ -18,8 +20,8 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/quartzJob',
-    method: 'put',
+    url: 'api/quartzJob/updateQuartzJobResumeCron',
+    method: 'post',
     data: data
   })
 }
diff --git a/cutejava-front/src/api/system/role.js b/cutejava-front/src/api/system/role.js
index 6320c14b..c136aea3 100644
--- a/cutejava-front/src/api/system/role.js
+++ b/cutejava-front/src/api/system/role.js
@@ -1,13 +1,7 @@
 import request from '@/utils/request'
-
-// 获取所有的Role
-export function queryRoleList() {
-  return request({
-    url: 'api/role/queryRoleList',
-    method: 'post'
-  })
-}
-
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/role/saveRole',
@@ -18,22 +12,15 @@ export function add(data) {
 
 export function get(id) {
   return request({
-    url: 'api/role/queryRoleById',
+    url: 'api/role/getRoleById',
     method: 'post',
     data: { id: id }
   })
 }
 
-export function getLevel() {
-  return request({
-    url: 'api/role/queryRoleLevel',
-    method: 'post'
-  })
-}
-
 export function del(ids) {
   return request({
-    url: 'api/role/removeRoleByIds',
+    url: 'api/role/deleteRoleByIds',
     method: 'post',
     data: ids
   })
@@ -41,18 +28,33 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/role/modifyRoleById',
+    url: 'api/role/updateRoleById',
     method: 'post',
     data: data
   })
 }
 
+// 获取所有的Role
+export function listAllRole() {
+  return request({
+    url: 'api/role/listAllRole',
+    method: 'post'
+  })
+}
+
+export function getCurrentUserRoleLevel() {
+  return request({
+    url: 'api/role/getCurrentUserRoleLevel',
+    method: 'post'
+  })
+}
+
 export function editMenu(data) {
   return request({
-    url: 'api/role/modifyBindMenuById',
+    url: 'api/role/updateBindMenuById',
     method: 'post',
     data
   })
 }
 
-export default { add, edit, del, get, editMenu, getLevel }
+export default { add, edit, del, get, editMenu, getCurrentUserRoleLevel }
diff --git a/cutejava-front/src/api/system/user.js b/cutejava-front/src/api/system/user.js
index 3364d7df..e96962d3 100644
--- a/cutejava-front/src/api/system/user.js
+++ b/cutejava-front/src/api/system/user.js
@@ -1,6 +1,9 @@
 import request from '@/utils/request'
 import { encrypt } from '@/utils/CsRsaUtil'
 
+/**
+ * 默认入口：add、del、edit、get
+ */
 export function add(data) {
   return request({
     url: 'api/user/saveUser',
@@ -11,15 +14,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/user/removeUserByIds',
-    method: 'post',
-    data: ids
-  })
-}
-
-export function resetPwd(ids) {
-  return request({
-    url: 'api/user/resetUserPasswordByIds',
+    url: 'api/user/deleteUserByIds',
     method: 'post',
     data: ids
   })
@@ -27,45 +22,53 @@ export function resetPwd(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/user/modifyUserById',
+    url: 'api/user/updateUserById',
     method: 'post',
     data: data
   })
 }
 
-export function editUser(data) {
+export function resetUserPasswordByIds(ids) {
   return request({
-    url: 'api/user/modifyUserCenterInfoById',
+    url: 'api/user/resetUserPasswordByIds',
+    method: 'post',
+    data: ids
+  })
+}
+
+export function updateUserCenterInfoById(data) {
+  return request({
+    url: 'api/user/updateUserCenterInfoById',
     method: 'post',
     data: data
   })
 }
 
-export function updatePass(user) {
+export function updateUserPasswordByUsername(user) {
   const data = {
     oldPass: encrypt(user.oldPass),
     newPass: encrypt(user.newPass)
   }
   return request({
-    url: 'api/user/modifyUserPasswordByUsername',
+    url: 'api/user/updateUserPasswordByUsername',
     method: 'post',
     data: data
   })
 }
 
-export function updateEmail(form) {
+export function updateUserEmailByUsername(form) {
   const data = {
     password: encrypt(form.pass),
     email: form.email
   }
   return request({
-    url: 'api/user/modifyUserEmailByUsername/' + form.code,
+    url: 'api/user/updateUserEmailByUsername/' + form.code,
     method: 'post',
     data: data
   })
 }
 
-export function queryUserMetaPage(query) {
+export function queryUserMetadataOptions(query) {
   const params = {
     page: 1,
     size: 50,
@@ -80,5 +83,5 @@ export function queryUserMetaPage(query) {
   })
 }
 
-export default { add, edit, del, resetPwd, queryUserMetaPage }
+export default { add, edit, del, resetUserPasswordByIds, queryUserMetadataOptions }
 
diff --git a/cutejava-front/src/components/Crud/crud.js b/cutejava-front/src/components/Crud/crud.js
index 5350fd85..1c482dc6 100644
--- a/cutejava-front/src/components/Crud/crud.js
+++ b/cutejava-front/src/components/Crud/crud.js
@@ -17,8 +17,10 @@ function CRUD(options) {
     idField: 'id',
     // 标题
     title: '',
-    // 请求数据的url
+    // 请求数据的url, @Controller注解的路径
     url: '',
+    // 分页查询路由，@PostMapping注解的路径
+    searchRouter: '',
     // 表格数据
     data: [],
     // 选择项
@@ -134,7 +136,7 @@ function CRUD(options) {
       return new Promise((resolve, reject) => {
         crud.loading = true
         // 请求数据
-        initData(crud.url, crud.getQueryParams()).then(data => {
+        initData(crud.url + crud.searchRouter, crud.getQueryParams()).then(data => {
           const table = crud.getTable()
           if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据
             table.store.states.treeData = {}
diff --git a/cutejava-front/src/store/modules/api.js b/cutejava-front/src/store/modules/api.js
index c447056d..8e981d6a 100644
--- a/cutejava-front/src/store/modules/api.js
+++ b/cutejava-front/src/store/modules/api.js
@@ -5,7 +5,7 @@ const api = {
     // 图片上传
     imagesUploadApi: baseUrl + '/api/localStorage/uploadPicture',
     // 修改头像
-    updateAvatarApi: baseUrl + '/api/user/modifyUserAvatar',
+    updateAvatarApi: baseUrl + '/api/user/updateUserAvatar',
     // Sql 监控
     druidSqlApi: baseUrl + '/druid/index.html',
     // websocket
diff --git a/cutejava-front/src/utils/CsRsaUtil.js b/cutejava-front/src/utils/CsRsaUtil.js
index 288921e5..b53a3af6 100644
--- a/cutejava-front/src/utils/CsRsaUtil.js
+++ b/cutejava-front/src/utils/CsRsaUtil.js
@@ -2,8 +2,11 @@ import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
 
 // 密钥对生成 http://web.chacuo.net/netrsakeypair
 
-const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD\n' +
-  '2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ=='
+const publicKey = 'MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAg975XAOL1zg5EOcSSGPIcxwx5DxcvPD2rBRQa0/o1HTF25cnsU9uSHfzP+qohkDG76kDk+1FA/cuQda4CDAmK2fWW' +
+  'q7KgglKd08hRkByjLuRsXu5WVApAAG15ItNM0CrXI7P47aOan+6YPU0Ni1+4WYQnwxfRYdUaKgY5G5gb3S+hx6VO1iN1KuRMBJ7y5FMh1WNJOM9bQb3X1pvaJ73drTpy1wJHAvfP80iG2+sSh0FfcOxCoRNEff' +
+  'CUsU2bYNH6dG6mXIDvo6XZStspwUfSitfgOER207uvBCCVyFlas+2Xs09yyAoJNjaWmeCPfA7uJvJrXUft/SMy8JNIXBY40vlwk4d4FE6OKOG9Wn0oRlofRKZ7NGvpUxEA5zOW6g2LsHKUUXpgOfu59M6ZHxviGM' +
+  't26WxJiq/ifVKJE3yVgx0MVIGEFTrG+spOCVsDYMSHnVsPEUdL6g5FV2YLyqNHljBqUqwyOEfUinp7hPRxrLJDMyX6GWy7y48Djg0wyh2hXro/ygVrZ6jcSd7MUAd2lYueUKK8Bey7OzIcOJ6GveHdLzGrspbbkn' +
+  'DuRsbcInR5bD6l7YA4vpnLsbiOH2wbKJWXNnxRwN5KuWSpwHDHhARB8f4wWrewUKIOxcFI/eJ6ke6D52JMOKhiGeZKn+2/giHwrPGkTREe47Ose6UvTMCAwEAAQ=='
 
 // 加密
 export function encrypt(txt) {
diff --git a/cutejava-front/src/views/components/business/CuteDeptTree.vue b/cutejava-front/src/views/components/business/CuteDeptTree.vue
index 8486bc60..7cc461cb 100644
--- a/cutejava-front/src/views/components/business/CuteDeptTree.vue
+++ b/cutejava-front/src/views/components/business/CuteDeptTree.vue
@@ -30,7 +30,7 @@
 
 <script>
 
-import { queryDeptList } from '@/api/system/dept'
+import { searchDept } from '@/api/system/dept'
 
 export default {
   name: 'CuteDeptTree',
@@ -61,7 +61,7 @@ export default {
         params['pid'] = node.data.id
       }
       setTimeout(() => {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: params
diff --git a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue
index be0e5ea2..5b4fb7fc 100644
--- a/cutejava-front/src/views/components/business/CuteProductLineSelect.vue
+++ b/cutejava-front/src/views/components/business/CuteProductLineSelect.vue
@@ -25,7 +25,7 @@
 
 <script>
 
-import { queryDeptSelectDataSource } from '@/api/system/component'
+import { listDeptSelectDataSource } from '@/api/system/component'
 import CsMessage from '@/utils/elementui/CsMessage'
 
 export default {
@@ -56,7 +56,7 @@ export default {
   },
   methods: {
     fetchDeptData() {
-      queryDeptSelectDataSource().then(data => {
+      listDeptSelectDataSource().then(data => {
         this.deptOptions = data
       }).catch(error => {
         console.error('获取部门数据失败:', error)
diff --git a/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue b/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue
index 98f951f0..d43aa80f 100644
--- a/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue
+++ b/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue
@@ -17,7 +17,7 @@
 
 <script>
 
-import { queryDeptSelectProDataSource } from '@/api/system/component'
+import { listDeptSelectProDataSource } from '@/api/system/component'
 import CsMessage from '@/utils/elementui/CsMessage'
 
 export default {
@@ -62,7 +62,7 @@ export default {
       })
     },
     fetchDeptData() {
-      queryDeptSelectProDataSource().then(data => {
+      listDeptSelectProDataSource().then(data => {
         this.deptOptions = this.cleanEmptyChildren(data)
         // console.error('deptOptions', this.deptOptions)
       }).catch(error => {
diff --git a/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue b/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue
index 336cd080..773c3c43 100644
--- a/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue
+++ b/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue
@@ -57,15 +57,15 @@ export default {
         this.loading = true
         setTimeout(() => {
           this.loading = false
-          this.queryUserMetaPage(query)
+          this.queryUserMetadataOptions(query)
         }, 200)
       } else {
         this.options = []
       }
     },
-    queryUserMetaPage(query, options) {
+    queryUserMetadataOptions(query, options) {
       const that = this
-      UserService.queryUserMetaPage(query).then(res => {
+      UserService.queryUserMetadataOptions(query).then(res => {
         that.options = res
       })
     },
diff --git a/cutejava-front/src/views/components/business/CuteUserSelect.vue b/cutejava-front/src/views/components/business/CuteUserSelect.vue
index 0cc71713..526fb92d 100644
--- a/cutejava-front/src/views/components/business/CuteUserSelect.vue
+++ b/cutejava-front/src/views/components/business/CuteUserSelect.vue
@@ -67,15 +67,15 @@ export default {
         this.loading = true
         setTimeout(() => {
           this.loading = false
-          this.queryUserMetaPage(query)
+          this.queryUserMetadataOptions(query)
         }, 200)
       } else {
         this.options = []
       }
     },
-    queryUserMetaPage(query, options) {
+    queryUserMetadataOptions(query, options) {
       const that = this
-      UserService.queryUserMetaPage(query).then(res => {
+      UserService.queryUserMetadataOptions(query).then(res => {
         that.options = res
       })
     },
diff --git a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
index 6a59d5e0..2cddea96 100644
--- a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
@@ -78,7 +78,7 @@ export default {
           }
         },
         fetch: async(queryParams) => {
-          return DictService.queryPageDict(queryParams)
+          return DictService.searchDict(queryParams)
         },
         pageProps: {
           current: 1,
diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
index eaa5ac0a..de662333 100644
--- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
@@ -105,7 +105,7 @@ export default {
           }
         },
         fetch: async(queryParams) => {
-          return DictService.queryPageDict(queryParams)
+          return DictService.searchDict(queryParams)
         },
         columns: [
           { prop: 'name', label: '名称' },
diff --git a/cutejava-front/src/views/system/dept/index.vue b/cutejava-front/src/views/system/dept/index.vue
index 5a29edb5..e45dddf0 100644
--- a/cutejava-front/src/views/system/dept/index.vue
+++ b/cutejava-front/src/views/system/dept/index.vue
@@ -140,7 +140,7 @@ export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', url: 'api/dept', searchRouter: '/searchDept', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典
@@ -175,7 +175,7 @@ export default {
         args: { pid: tree.id }
       }
       setTimeout(() => {
-        crudDept.queryDeptList(params).then(res => {
+        crudDept.searchDept(params).then(res => {
           resolve(res.content)
         })
       }, 100)
@@ -195,7 +195,7 @@ export default {
       }
     },
     getSupDepts(id) {
-      crudDept.queryDeptSuperiorTree(id, true).then(res => {
+      crudDept.searchDeptTree(id, true).then(res => {
         const data = res.content
         this.buildDepts(data)
         this.depts = data
@@ -212,7 +212,7 @@ export default {
       })
     },
     getDepts() {
-      crudDept.queryDeptList({
+      crudDept.searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -228,7 +228,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudDept.queryDeptList({
+        crudDept.searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }
diff --git a/cutejava-front/src/views/system/dict/dictDetail.vue b/cutejava-front/src/views/system/dict/dictDetail.vue
index c9681a12..1085cf28 100644
--- a/cutejava-front/src/views/system/dict/dictDetail.vue
+++ b/cutejava-front/src/views/system/dict/dictDetail.vue
@@ -84,7 +84,7 @@ export default {
   cruds() {
     return [
       CRUD({
-        title: '字典详情', url: 'api/dictDetail', query: { dictName: '' },
+        title: '字典详情', url: 'api/dictDetail', searchRouter: '/searchDictDetail', query: { dictName: '' },
         crudMethod: { ...crudDictDetail },
         optShow: {
           add: true,
diff --git a/cutejava-front/src/views/system/dict/index.vue b/cutejava-front/src/views/system/dict/index.vue
index a1f5a129..7750f37b 100644
--- a/cutejava-front/src/views/system/dict/index.vue
+++ b/cutejava-front/src/views/system/dict/index.vue
@@ -114,7 +114,7 @@ export default {
   components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
   cruds() {
     return [
-      CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }})
+      CRUD({ title: '字典', url: 'api/dict', searchRouter: '/searchDict', crudMethod: { ...crudDict }})
     ]
   },
   mixins: [presenter(), header(), form(defaultForm)],
diff --git a/cutejava-front/src/views/system/email/config.vue b/cutejava-front/src/views/system/email/config.vue
index 4380442b..2257f588 100644
--- a/cutejava-front/src/views/system/email/config.vue
+++ b/cutejava-front/src/views/system/email/config.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { getLastEmailConfig, modifyEmailConfig } from '@/api/system/email'
+import { getLastEmailConfig, updateEmailConfigById } from '@/api/system/email'
 
 export default {
   name: 'Config',
@@ -67,7 +67,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          modifyEmailConfig(this.form).then(res => {
+          updateEmailConfigById(this.form).then(res => {
             this.$notify({
               title: '修改成功',
               type: 'success',
diff --git a/cutejava-front/src/views/system/email/send.vue b/cutejava-front/src/views/system/email/send.vue
index d3a20e95..0545145f 100644
--- a/cutejava-front/src/views/system/email/send.vue
+++ b/cutejava-front/src/views/system/email/send.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { sendEmail } from '@/api/system/email'
+import { send } from '@/api/system/email'
 import { mapGetters } from 'vuex'
 import E from 'wangeditor'
 import { UploadFile } from '@/utils/CsDomUtil'
@@ -74,7 +74,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          sendEmail(this.form).then(res => {
+          send(this.form).then(res => {
             this.$notify({
               title: '发送成功',
               type: 'success',
diff --git a/cutejava-front/src/views/system/job/index.vue b/cutejava-front/src/views/system/job/index.vue
index 74fcc7ba..55be1980 100644
--- a/cutejava-front/src/views/system/job/index.vue
+++ b/cutejava-front/src/views/system/job/index.vue
@@ -70,6 +70,7 @@ export default {
     return CRUD({
       title: '岗位',
       url: 'api/job',
+      searchRouter: '/searchJob',
       crudMethod: { ...crudJob }
     })
   },
diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue
index 75900be1..3b9f8d4e 100644
--- a/cutejava-front/src/views/system/menu/index.vue
+++ b/cutejava-front/src/views/system/menu/index.vue
@@ -137,7 +137,7 @@
       ref="table"
       v-loading="crud.loading"
       lazy
-      :load="queryMenuByArgs"
+      :load="searchMenu"
       :data="crud.data"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       row-key="id"
@@ -239,7 +239,7 @@ export default {
   name: 'Menu',
   components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '菜单', url: 'api/menu', crudMethod: { ...crudMenu }})
+    return CRUD({ title: '菜单', url: 'api/menu', searchRouter: '/searchMenu', crudMethod: { ...crudMenu }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -273,14 +273,14 @@ export default {
         this.menus.push({ id: 0, label: '顶级类目', children: null })
       }
     },
-    queryMenuByArgs(tree, treeNode, resolve) {
+    searchMenu(tree, treeNode, resolve) {
       const params = {
         page: 1,
         size: 9999999,
         args: { pid: tree.id }
       }
       setTimeout(() => {
-        crudMenu.queryMenuByArgs(params).then(res => {
+        crudMenu.searchMenu(params).then(res => {
           resolve(res.content)
         })
       }, 100)
@@ -298,7 +298,7 @@ export default {
     },
     loadMenus({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudMenu.queryMenuListByPid(parentNode.id).then(res => {
+        crudMenu.listMenuByPid(parentNode.id).then(res => {
           parentNode.children = res.map(function(obj) {
             if (!obj.leaf) {
               obj.children = null
diff --git a/cutejava-front/src/views/system/online/index.vue b/cutejava-front/src/views/system/online/index.vue
index 16146dce..05db9e31 100644
--- a/cutejava-front/src/views/system/online/index.vue
+++ b/cutejava-front/src/views/system/online/index.vue
@@ -85,7 +85,7 @@ export default {
   name: 'OnlineUser',
   components: { pagination, crudOperation, rrOperation },
   cruds() {
-    return CRUD({ url: 'api/user/online', title: '在线用户' })
+    return CRUD({ url: 'api/user/online', searchRouter: '/searchOnlineUser', title: '在线用户' })
   },
   mixins: [presenter(), header(), crud()],
   data() {
diff --git a/cutejava-front/src/views/system/quartzJob/index.vue b/cutejava-front/src/views/system/quartzJob/index.vue
index 4726e6e8..5881f689 100644
--- a/cutejava-front/src/views/system/quartzJob/index.vue
+++ b/cutejava-front/src/views/system/quartzJob/index.vue
@@ -192,7 +192,7 @@ export default {
   name: 'QuartzJob',
   components: { Log, pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '定时任务', url: 'api/quartzJob', crudMethod: { ...crudJob }})
+    return CRUD({ title: '定时任务', url: 'api/quartzJob', searchRouter: '/searchQuartzJob', crudMethod: { ...crudJob }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
diff --git a/cutejava-front/src/views/system/quartzJob/log.vue b/cutejava-front/src/views/system/quartzJob/log.vue
index 7a93d57a..e4f9c6c2 100644
--- a/cutejava-front/src/views/system/quartzJob/log.vue
+++ b/cutejava-front/src/views/system/quartzJob/log.vue
@@ -109,7 +109,7 @@ export default {
     },
     // 获取数据前设置好接口地址
     beforeInit() {
-      this.url = 'api/quartzJob/logs'
+      this.url = 'api/quartzJob/searchQuartzLog'
       this.size = 6
       return true
     },
diff --git a/cutejava-front/src/views/system/role/index.vue b/cutejava-front/src/views/system/role/index.vue
index 13fc7c0b..2ab5e760 100644
--- a/cutejava-front/src/views/system/role/index.vue
+++ b/cutejava-front/src/views/system/role/index.vue
@@ -151,9 +151,9 @@
 </template>
 
 <script>
-import crudRoles from '@/api/system/role'
-import { queryDeptList, queryDeptSuperiorTree } from '@/api/system/dept'
-import { queryChildMenuSet, queryMenuListByPid } from '@/api/system/menu'
+import crudRoles, {getCurrentUserRoleLevel} from '@/api/system/role'
+import { searchDept, searchDeptTree } from '@/api/system/dept'
+import { listChildMenuSetByMenuId, listMenuByPid } from '@/api/system/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -168,7 +168,7 @@ export default {
   name: 'Role',
   components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '角色', url: 'api/role', crudMethod: { ...crudRoles }})
+    return CRUD({ title: '角色', url: 'api/role', searchRouter: '/searchRole', crudMethod: { ...crudRoles }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -190,14 +190,14 @@ export default {
     }
   },
   created() {
-    crudRoles.getLevel().then(data => {
+    crudRoles.getCurrentUserRoleLevel().then(data => {
       this.level = data.level
     })
   },
   methods: {
     getMenuDatas(node, resolve) {
       setTimeout(() => {
-        queryMenuListByPid(node.data.id ? node.data.id : 0).then(res => {
+        listMenuByPid(node.data.id ? node.data.id : 0).then(res => {
           resolve(res)
         })
       }, 100)
@@ -261,7 +261,7 @@ export default {
     },
     menuChange(menu) {
       // 获取该节点的所有子节点，id 包含自身
-      queryChildMenuSet(menu.id).then(childIds => {
+      listChildMenuSetByMenuId(menu.id).then(childIds => {
         // 判断是否在 menuIds 中，如果存在则删除，否则添加
         if (this.menuIds.indexOf(menu.id) !== -1) {
           for (let i = 0; i < childIds.length; i++) {
@@ -313,7 +313,7 @@ export default {
     },
     // 获取部门数据
     getDepts() {
-      queryDeptList({
+      searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -331,7 +331,7 @@ export default {
       depts.forEach(dept => {
         ids.push(dept.id)
       })
-      queryDeptSuperiorTree(ids).then(res => {
+      searchDeptTree(ids).then(res => {
         const date = res.content
         this.buildDepts(date)
         this.depts = date
@@ -350,7 +350,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }
diff --git a/cutejava-front/src/views/system/server/index.vue b/cutejava-front/src/views/system/server/index.vue
index e0038da3..5522e377 100644
--- a/cutejava-front/src/views/system/server/index.vue
+++ b/cutejava-front/src/views/system/server/index.vue
@@ -154,7 +154,7 @@ export default {
     return {
       show: false,
       monitor: null,
-      url: 'api/monitor/queryServerMonitorInfo',
+      url: 'api/monitor/getServerMonitorInfo',
       data: {},
       cpuInfo: {
         tooltip: {
diff --git a/cutejava-front/src/views/system/storage/local/index.vue b/cutejava-front/src/views/system/storage/local/index.vue
index 71313729..720b87d4 100644
--- a/cutejava-front/src/views/system/storage/local/index.vue
+++ b/cutejava-front/src/views/system/storage/local/index.vue
@@ -136,7 +136,7 @@ const defaultForm = { id: null, name: '' }
 export default {
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
+    return CRUD({ title: '文件', url: 'api/localStorage', searchRouter: '/searchLocalStorage', crudMethod: { ...crudFile }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
diff --git a/cutejava-front/src/views/system/storage/oss/index.vue b/cutejava-front/src/views/system/storage/oss/index.vue
index 47a23524..f23aec87 100644
--- a/cutejava-front/src/views/system/storage/oss/index.vue
+++ b/cutejava-front/src/views/system/storage/oss/index.vue
@@ -107,7 +107,7 @@ const defaultForm = { id: null }
 export default {
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
   cruds() {
-    return CRUD({ title: '文件', url: 'api/ossStorage', crudMethod: { ...crudFile }})
+    return CRUD({ title: '文件', url: 'api/ossStorage', searchRouter: '/searchOssStorage', crudMethod: { ...crudFile }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
diff --git a/cutejava-front/src/views/system/user/center.vue b/cutejava-front/src/views/system/user/center.vue
index 531ed2a9..417f2d6e 100644
--- a/cutejava-front/src/views/system/user/center.vue
+++ b/cutejava-front/src/views/system/user/center.vue
@@ -98,15 +98,15 @@
             <!--    操作日志    -->
             <el-tab-pane label="操作日志" name="second">
               <el-table v-loading="loading" :data="data" style="width: 100%;">
-                <el-table-column prop="description" label="行为" />
+                <el-table-column prop="bizName" label="业务名称" />
                 <el-table-column prop="requestIp" label="IP" />
                 <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-                <el-table-column prop="browser" label="浏览器" />
-                <el-table-column prop="time" label="请求耗时" align="center">
+                <el-table-column prop="browserInfo" label="浏览器" />
+                <el-table-column prop="executeTime" label="请求耗时" align="center">
                   <template slot-scope="scope">
-                    <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
-                    <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
-                    <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
+                    <el-tag v-if="scope.row.executeTime <= 300">{{ scope.row.time }}ms</el-tag>
+                    <el-tag v-else-if="scope.row.executeTime <= 1000" type="warning">{{ scope.row.executeTime }}ms</el-tag>
+                    <el-tag v-else type="danger">{{ scope.row.executeTime }}ms</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -151,7 +151,7 @@ import { getToken } from '@/utils/auth'
 import store from '@/store'
 import { IsValidPhone } from '@/utils/CsValidateUtil'
 import crud from '@/mixins/crud'
-import { editUser } from '@/api/system/user'
+import { updateUserCenterInfoById } from '@/api/system/user'
 import Avatar from '@/assets/images/avatar.png'
 
 export default {
@@ -211,7 +211,7 @@ export default {
       }
     },
     beforeInit() {
-      this.url = 'api/logs/user'
+      this.url = 'api/logs/searchUserLog'
       return true
     },
     cropUploadSuccess(jsonData, field) {
@@ -223,7 +223,7 @@ export default {
         this.$refs['form'].validate((valid) => {
           if (valid) {
             this.saveLoading = true
-            editUser(this.form).then(() => {
+            updateUserCenterInfoById(this.form).then(() => {
               this.editSuccessNotify()
               store.dispatch('GetInfo').then(() => {
               })
diff --git a/cutejava-front/src/views/system/user/center/updateEmail.vue b/cutejava-front/src/views/system/user/center/updateEmail.vue
index f3bb5c88..306aefa5 100644
--- a/cutejava-front/src/views/system/user/center/updateEmail.vue
+++ b/cutejava-front/src/views/system/user/center/updateEmail.vue
@@ -34,9 +34,9 @@
 
 <script>
 import store from '@/store'
-import { validEmail } from '@/utils/CsValidateUtil'
-import { updateEmail } from '@/api/system/user'
-import { sendResetEmailCaptcha } from '@/api/system/code'
+import { IsValidEmail } from '@/utils/CsValidateUtil'
+import { updateUserEmailByUsername } from '@/api/system/user'
+import { sendResetEmailCode } from '@/api/system/code'
 
 export default {
   props: {
@@ -51,7 +51,7 @@ export default {
         callback(new Error('新邮箱不能为空'))
       } else if (value === this.email) {
         callback(new Error('新邮箱不能与旧邮箱相同'))
-      } else if (validEmail(value)) {
+      } else if (IsValidEmail(value)) {
         callback()
       } else {
         callback(new Error('邮箱格式错误'))
@@ -83,7 +83,7 @@ export default {
         this.codeLoading = true
         this.buttonName = '验证码发送中'
         const _this = this
-        sendResetEmailCaptcha(this.form.email).then(res => {
+        sendResetEmailCode(this.form.email).then(res => {
           this.$message({
             showClose: true,
             message: '发送成功，验证码有效期5分钟',
@@ -113,7 +113,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          updateEmail(this.form).then(res => {
+          updateUserEmailByUsername(this.form).then(res => {
             this.loading = false
             this.resetForm()
             this.$notify({
diff --git a/cutejava-front/src/views/system/user/center/updatePass.vue b/cutejava-front/src/views/system/user/center/updatePass.vue
index 3231fac3..3d1fa57d 100644
--- a/cutejava-front/src/views/system/user/center/updatePass.vue
+++ b/cutejava-front/src/views/system/user/center/updatePass.vue
@@ -30,7 +30,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/api/system/user'
+import { updateUserPasswordByUsername } from '@/api/system/user'
 
 export default {
   data() {
@@ -69,7 +69,7 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           this.loading = true
-          updatePass(this.form).then(res => {
+          updateUserPasswordByUsername(this.form).then(res => {
             this.resetForm()
             this.$notify({
               title: '密码修改成功，请重新登录',
diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue
index 272bbd4a..78069015 100644
--- a/cutejava-front/src/views/system/user/index.vue
+++ b/cutejava-front/src/views/system/user/index.vue
@@ -196,9 +196,9 @@
 <script>
 import crudUser from '@/api/system/user'
 import { IsValidPhone } from '@/utils/CsValidateUtil'
-import { queryDeptList, queryDeptSuperiorTree } from '@/api/system/dept'
-import { getLevel, queryRoleList } from '@/api/system/role'
-import { queryAllEnableJob } from '@/api/system/job'
+import { searchDept, searchDeptTree } from '@/api/system/dept'
+import { getCurrentUserRoleLevel, listAllRole } from '@/api/system/role'
+import { searchJob } from '@/api/system/job'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -228,7 +228,7 @@ export default {
   name: 'User',
   components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
   cruds() {
-    return CRUD({ title: '用户', url: 'api/user', crudMethod: { ...crudUser }})
+    return CRUD({ title: '用户', url: 'api/user', searchRouter: '/aggregationSearchUser', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
@@ -401,7 +401,7 @@ export default {
       this.crud.toQuery()
     },
     getDepts() {
-      queryDeptList({
+      searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -415,7 +415,7 @@ export default {
       })
     },
     getSupDepts(deptId) {
-      queryDeptSuperiorTree(deptId).then(res => {
+      searchDeptTree(deptId).then(res => {
         const date = res.content
         this.buildDepts(date)
         this.depts = date
@@ -434,7 +434,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }
@@ -469,21 +469,21 @@ export default {
     },
     // 获取弹窗内角色数据
     getRoles() {
-      queryRoleList().then(res => {
+      listAllRole().then(res => {
         this.roles = res
       }).catch(() => {
       })
     },
     // 获取弹窗内岗位数据
     getJobs() {
-      queryAllEnableJob().then(res => {
+      searchJob().then(res => {
         this.jobs = res.content
       }).catch(() => {
       })
     },
     // 获取权限级别
     getRoleLevel() {
-      getLevel().then(res => {
+      getCurrentUserRoleLevel().then(res => {
         this.level = res.level
       }).catch(() => {
       })
@@ -502,7 +502,7 @@ export default {
           ids.push(val.id)
         })
         console.log(ids)
-        crudUser.resetPwd(ids).then(() => {
+        crudUser.resetUserPasswordByIds(ids).then(() => {
           this.crud.notify('重置成功, 用户新密码:123456', CRUD.NOTIFICATION_TYPE.SUCCESS)
         }).catch(() => {
         })
diff --git a/cutejava-front/vue.config.js b/cutejava-front/vue.config.js
index f9454fe7..acc83dd0 100644
--- a/cutejava-front/vue.config.js
+++ b/cutejava-front/vue.config.js
@@ -41,6 +41,13 @@ module.exports = {
         pathRewrite: {
           '^/auth': 'auth'
         }
+      },
+      '/captcha': {
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/captcha': 'captcha'
+        }
       }
     }
   },
diff --git a/cutejava-springboot3/cutejava-framework/pom.xml b/cutejava-springboot3/cutejava-framework/pom.xml
index 4436151b..cf0ff935 100644
--- a/cutejava-springboot3/cutejava-framework/pom.xml
+++ b/cutejava-springboot3/cutejava-framework/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-framework</artifactId>
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
index 1f37e198..4a6fedb3 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.context;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
@@ -28,7 +28,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 @Slf4j
-@SuppressWarnings({"unchecked", "all"})
 public class KitSpringBeanHolder implements ApplicationContextAware, DisposableBean {
 
   private static final List<CallBack> CALL_BACKS = new ArrayList<>();
@@ -136,7 +135,7 @@ public class KitSpringBeanHolder implements ApplicationContextAware, DisposableB
   }
 
   @Override
-  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+  public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
     if (KitSpringBeanHolder.applicationContext != null) {
       log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" +
           KitSpringBeanHolder.applicationContext);
@@ -151,7 +150,7 @@ public class KitSpringBeanHolder implements ApplicationContextAware, DisposableB
     KitSpringBeanHolder.addCallback = false;
   }
 
-  interface CallBack {
+  public interface CallBack {
 
     /**
      * 回调执行方法
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
index 6ca60f2f..4570e3ae 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.logging;
 
 import java.lang.annotation.Documented;
@@ -24,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 统计执行时长
+ * 统计执行时长（仅对代理方法有效）
  *
  * @author odboy
  */
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
index 0be67ff2..18968b1c 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.config;
 
 import cn.odboy.framework.exception.BadRequestException;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-/**
- * @author /
- */
+@Getter
 @Slf4j
-@SuppressWarnings({"unchecked", "all"})
 public enum DataTypeEnum {
   /**
    * mysql
@@ -86,13 +83,13 @@ public enum DataTypeEnum {
    */
   IMPALA("impala", "impala", "com.cloudera.impala.jdbc41.Driver", "", "", "'", "'");
   private static final String JDBC_URL_PREFIX = "jdbc:";
-  private String feature;
-  private String desc;
-  private String driver;
-  private String keywordPrefix;
-  private String keywordSuffix;
-  private String aliasPrefix;
-  private String aliasSuffix;
+  private final String feature;
+  private final String desc;
+  private final String driver;
+  private final String keywordPrefix;
+  private final String keywordSuffix;
+  private final String aliasPrefix;
+  private final String aliasSuffix;
 
   DataTypeEnum(String feature, String desc, String driver, String keywordPrefix, String keywordSuffix,
       String aliasPrefix, String aliasSuffix) {
@@ -110,10 +107,7 @@ public enum DataTypeEnum {
     for (DataTypeEnum dataTypeEnum : values()) {
       if (url.startsWith(JDBC_URL_PREFIX + dataTypeEnum.feature)) {
         try {
-          Class<?> aClass = Class.forName(dataTypeEnum.getDriver());
-          if (null == aClass) {
-            throw new BadRequestException("Unable to get driver instance for jdbcUrl: " + jdbcUrl);
-          }
+          Class.forName(dataTypeEnum.getDriver());
         } catch (ClassNotFoundException e) {
           throw new BadRequestException("Unable to get driver instance: " + jdbcUrl);
         }
@@ -123,31 +117,4 @@ public enum DataTypeEnum {
     return null;
   }
 
-  public String getFeature() {
-    return feature;
-  }
-
-  public String getDesc() {
-    return desc;
-  }
-
-  public String getDriver() {
-    return driver;
-  }
-
-  public String getKeywordPrefix() {
-    return keywordPrefix;
-  }
-
-  public String getKeywordSuffix() {
-    return keywordSuffix;
-  }
-
-  public String getAliasPrefix() {
-    return aliasPrefix;
-  }
-
-  public String getAliasSuffix() {
-    return aliasSuffix;
-  }
 }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
index 9521cb12..92275c9f 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
@@ -36,7 +36,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@SuppressWarnings({"unchecked", "all"})
 @ConditionalOnWebApplication
 @AutoConfigureAfter(DruidDataSourceAutoConfigure.class)
 @ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true",
@@ -50,7 +49,7 @@ public class RemoveDruidAdConfig {
    * @return org.springframework.boot.web.servlet.FilterRegistrationBean
    */
   @Bean
-  public FilterRegistrationBean removeDruidAdFilterRegistrationBean(DruidStatProperties properties) {
+  public FilterRegistrationBean<Filter> removeDruidAdFilterRegistrationBean(DruidStatProperties properties) {
 
     // 获取web监控页面的参数
     DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
@@ -89,7 +88,7 @@ public class RemoveDruidAdConfig {
       public void destroy() {
       }
     };
-    FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+    FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean();
     registrationBean.setFilter(filter);
     registrationBean.addUrlPatterns(commonJsPattern);
     return registrationBean;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
index c920fd78..efa02dd6 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core;
 
-import cn.hutool.core.bean.BeanUtil;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,7 +41,7 @@ public class KitMpAnyQUtil {
     if (mapperTarget == null) {
       return null;
     }
-    return BeanUtil.copyProperties(mapperTarget, mapperClazz);
+    return KitBeanUtil.copyToClass(mapperTarget, mapperClazz);
   }
 
   public static <T> List<T> selectList(BaseMapper<T> baseMapper, Object queryParams) {
@@ -56,7 +55,7 @@ public class KitMpAnyQUtil {
     if (mapperTarget == null) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(mapperTarget, mapperClazz);
+    return KitBeanUtil.copyToList(mapperTarget, mapperClazz);
   }
 
   public static <T> Long selectCount(BaseMapper<T> baseMapper, Object queryParams) {
@@ -74,7 +73,7 @@ public class KitMpAnyQUtil {
     QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
     Page<T> tPage = baseMapper.selectPage(page, queryWrapper);
     Page<M> mapperTarget = new Page<>();
-    mapperTarget.setRecords(BeanUtil.copyToList(tPage.getRecords(), mapperClazz));
+    mapperTarget.setRecords(KitBeanUtil.copyToList(tPage.getRecords(), mapperClazz));
     mapperTarget.setTotal(tPage.getTotal());
     mapperTarget.setSize(tPage.getSize());
     mapperTarget.setCurrent(tPage.getCurrent());
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpCmdGenUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpCmdGenUtil.java
index 4ce8be51..c24f1b46 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpCmdGenUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpCmdGenUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core;
 
 import cn.hutool.core.util.StrUtil;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpQUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpQUtil.java
index 3e1a6522..80553c5f 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpQUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpQUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -27,14 +26,15 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -84,21 +84,47 @@ public class KitMpQUtil {
   private static <R> void handleWrapper(KitMpQuery q, QueryWrapper<R> queryWrapper, String attributeName,
       Object fieldVal) {
     switch (q.type()) {
-      case EQUAL -> queryWrapper.eq(attributeName, fieldVal);
-      case GREATER_THAN -> queryWrapper.ge(attributeName, fieldVal);
-      case LESS_THAN -> queryWrapper.le(attributeName, fieldVal);
-      case LESS_THAN_NQ -> queryWrapper.lt(attributeName, fieldVal);
-      case INNER_LIKE -> queryWrapper.like(attributeName, fieldVal);
-      case LEFT_LIKE -> queryWrapper.likeLeft(attributeName, fieldVal);
-      case RIGHT_LIKE -> queryWrapper.likeRight(attributeName, fieldVal);
-      case IN -> handleInOrNotQuery(true, queryWrapper, attributeName, fieldVal);
-      case NOT_IN -> handleInOrNotQuery(false, queryWrapper, attributeName, fieldVal);
-      case NOT_EQUAL -> queryWrapper.ne(attributeName, fieldVal);
-      case NOT_NULL -> queryWrapper.isNotNull(attributeName);
-      case IS_NULL -> queryWrapper.isNull(attributeName);
-      case BETWEEN -> handleBetweenQuery(queryWrapper, fieldVal, attributeName);
-      default -> {
-      }
+      case EQUAL:
+        queryWrapper.eq(attributeName, fieldVal);
+        break;
+      case GREATER_THAN:
+        queryWrapper.ge(attributeName, fieldVal);
+        break;
+      case LESS_THAN:
+        queryWrapper.le(attributeName, fieldVal);
+        break;
+      case LESS_THAN_NQ:
+        queryWrapper.lt(attributeName, fieldVal);
+        break;
+      case INNER_LIKE:
+        queryWrapper.like(attributeName, fieldVal);
+        break;
+      case LEFT_LIKE:
+        queryWrapper.likeLeft(attributeName, fieldVal);
+        break;
+      case RIGHT_LIKE:
+        queryWrapper.likeRight(attributeName, fieldVal);
+        break;
+      case IN:
+        handleInOrNotQuery(true, queryWrapper, attributeName, fieldVal);
+        break;
+      case NOT_IN:
+        handleInOrNotQuery(false, queryWrapper, attributeName, fieldVal);
+        break;
+      case NOT_EQUAL:
+        queryWrapper.ne(attributeName, fieldVal);
+        break;
+      case NOT_NULL:
+        queryWrapper.isNotNull(attributeName);
+        break;
+      case IS_NULL:
+        queryWrapper.isNull(attributeName);
+        break;
+      case BETWEEN:
+        handleBetweenQuery(queryWrapper, fieldVal, attributeName);
+        break;
+      default:
+        break;
     }
   }
 
@@ -152,7 +178,8 @@ public class KitMpQUtil {
    * @param <R>          /
    */
   private static <R> void handleBlurryQuery(QueryWrapper<R> queryWrapper, String blurry, Object fieldVal) {
-    List<String> blurryList = Arrays.stream(blurry.split(",")).filter(StrUtil::isNotBlank).distinct().toList();
+    List<String> blurryList =
+        Arrays.stream(blurry.split(",")).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
     queryWrapper.and(wrapper -> {
       for (String blurryItem : blurryList) {
         String column = StrUtil.toUnderlineCase(blurryItem);
@@ -171,7 +198,7 @@ public class KitMpQUtil {
   }
 
   public static void main(String[] args) {
-    QueryWrapper<TestDomain> query = new QueryWrapper<>();
+    QueryWrapper<TestDomain> query = new QueryWrapper<TestDomain>();
     query.or(wrapper -> wrapper.eq("username", 1).or().eq("nickname", 2));
     query.eq("id", 1);
     query.orderByDesc("id");
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
index f0ed545b..2bd4a2c9 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.odboy.base.KitPageResult;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -111,7 +110,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(list)) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(list, clazz);
+    return KitBeanUtil.copyToList(list, clazz);
   }
 
   /**
@@ -126,7 +125,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(list)) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(list, clazz);
+    return KitBeanUtil.copyToList(list, clazz);
   }
 
   /**
@@ -147,7 +146,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(pageInfo.getRecords())) {
       return new KitPageResult<>(new ArrayList<>(), pageInfo.getTotal());
     }
-    return new KitPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+    return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
   }
 
   /**
@@ -166,9 +165,9 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     pageSize = pageSize <= 0 ? 10 : pageSize;
     IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize));
     if (CollUtil.isEmpty(pageInfo.getRecords())) {
-      return KitPageUtil.emptyListData();
+      return KitPageUtil.emptyData();
     }
-    return new KitPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+    return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
   }
 
   /**
@@ -183,6 +182,6 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (e == null) {
       return null;
     }
-    return BeanUtil.copyProperties(e, clazz);
+    return KitBeanUtil.copyToClass(e, clazz);
   }
 }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java
index dedb70d6..5610b2f5 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpService.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
 import cn.odboy.base.KitPageResult;
@@ -49,11 +48,11 @@ public interface KitMpService<T> extends IService<T> {
 
   <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz);
 
-  <Q> List<T> queryClazzListByArgs(Q criteria);
+  <Q> List<T> queryClazzListByArgs(Q args);
 
   List<T> queryClazzListByArgs(LambdaQueryWrapper<T> wrapper);
 
-  <G, Q> List<G> queryFeatureClazzListByArgs(Q criteria, Class<G> targetClazz);
+  <G, Q> List<G> queryFeatureClazzListByArgs(Q args, Class<G> targetClazz);
 
   <G> List<G> queryFeatureClazzListByArgs(LambdaQueryWrapper<T> wrapper, Class<G> targetClazz);
 
@@ -62,9 +61,9 @@ public interface KitMpService<T> extends IService<T> {
   <G> KitPageResult<G> queryFeatureClazzPageByArgs(LambdaQueryWrapper<T> wrapper, IPage<T> pageable,
       Class<G> targetClazz);
 
-  <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz);
+  <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q args, IPage<T> pageable, Class<G> targetClazz);
 
-  <Q> KitPageResult<T> queryClazzPageByArgs(Q criteria, IPage<T> pageable);
+  <Q> KitPageResult<T> queryClazzPageByArgs(Q args, IPage<T> pageable);
 
   int modifyClazzByArgs(LambdaQueryWrapper<T> wrapper, T entity);
 
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
index 07b1ce5e..9be39c97 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.mybatisplus.core.KitMpQUtil;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
@@ -46,7 +45,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int saveFeatureClazz(G resources) {
-    return getBaseMapper().insert(BeanUtil.copyProperties(resources, this.getEntityClass()));
+    return getBaseMapper().insert(KitBeanUtil.copyToClass(resources, this.getEntityClass()));
   }
 
   /**
@@ -55,7 +54,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int saveFeatureClazzList(List<G> resources) {
-    return getBaseMapper().insertBatchSomeColumn(BeanUtil.copyToList(resources, this.getEntityClass()));
+    return getBaseMapper().insertBatchSomeColumn(KitBeanUtil.copyToList(resources, this.getEntityClass()));
   }
 
   /**
@@ -64,7 +63,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int modifyFeatureClazzById(G resources) {
-    return getBaseMapper().updateById(BeanUtil.copyProperties(resources, this.getEntityClass()));
+    return getBaseMapper().updateById(KitBeanUtil.copyToClass(resources, this.getEntityClass()));
   }
 
   /**
@@ -77,7 +76,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     String sqlStatement = this.getSqlStatement(SqlMethod.UPDATE_BY_ID);
     return this.executeBatch(resources, batchSize, (sqlSession, entity) -> {
       MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
-      param.put("et", BeanUtil.copyProperties(entity, this.getEntityClass()));
+      param.put("et", KitBeanUtil.copyToClass(entity, this.getEntityClass()));
       sqlSession.update(sqlStatement, param);
     });
   }
@@ -90,7 +89,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    */
   public <G> G queryFeatureClazzById(Serializable id, Class<G> targetClazz) {
     T entity = this.getById(id);
-    return entity == null ? null : BeanUtil.copyProperties(entity, targetClazz);
+    return entity == null ? null : KitBeanUtil.copyToClass(entity, targetClazz);
   }
 
   /**
@@ -127,7 +126,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     if (ts.isEmpty()) {
       return null;
     }
-    return BeanUtil.copyProperties(ts.stream().findFirst().get(), clazz);
+    return KitBeanUtil.copyToClass(ts.stream().findFirst().get(), clazz);
   }
 
   /**
@@ -138,17 +137,16 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    */
   public <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz) {
     List<T> entitys = this.listByIds(ids);
-    return entitys == null || entitys.isEmpty() ? CollUtil.newArrayList()
-        : BeanUtil.copyToList(entitys, targetClazz);
+    return entitys == null || entitys.isEmpty() ? CollUtil.newArrayList() : KitBeanUtil.copyToList(entitys, targetClazz);
   }
 
   /**
    * 查有关的数据
    *
-   * @param criteria 动态条件
+   * @param args 动态条件
    */
-  public <Q> List<T> queryClazzListByArgs(Q criteria) {
-    QueryWrapper<T> predicate = KitMpQUtil.build(criteria);
+  public <Q> List<T> queryClazzListByArgs(Q args) {
+    QueryWrapper<T> predicate = KitMpQUtil.build(args);
     return baseMapper.selectList(predicate);
   }
 
@@ -167,13 +165,13 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
   /**
    * 查有关的数据并转成目标类型的数据
    *
-   * @param criteria    动态条件
+   * @param args        动态条件
    * @param targetClazz 目标类型
    */
-  public <G, Q> List<G> queryFeatureClazzListByArgs(Q criteria, Class<G> targetClazz) {
-    QueryWrapper<T> predicate = KitMpQUtil.build(criteria);
+  public <G, Q> List<G> queryFeatureClazzListByArgs(Q args, Class<G> targetClazz) {
+    QueryWrapper<T> predicate = KitMpQUtil.build(args);
     List<T> data = baseMapper.selectList(predicate);
-    return BeanUtil.copyToList(data, targetClazz);
+    return KitBeanUtil.copyToList(data, targetClazz);
   }
 
   /**
@@ -186,7 +184,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     if (wrapper == null) {
       wrapper = new LambdaQueryWrapper<>();
     }
-    return BeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz);
+    return KitBeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz);
   }
 
   /**
@@ -216,19 +214,19 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
       wrapper = new LambdaQueryWrapper<>();
     }
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-    return new KitPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz),
+    return new KitPageResult<>(KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz),
         originPageData.getTotal());
   }
 
-  public <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q criteria, IPage<T> pageable, Class<G> targetClazz) {
-    QueryWrapper<T> wrapper = KitMpQUtil.build(criteria);
+  public <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q args, IPage<T> pageable, Class<G> targetClazz) {
+    QueryWrapper<T> wrapper = KitMpQUtil.build(args);
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-    return new KitPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz),
+    return new KitPageResult<>(KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz),
         originPageData.getTotal());
   }
 
-  public <Q> KitPageResult<T> queryClazzPageByArgs(Q criteria, IPage<T> pageable) {
-    QueryWrapper<T> wrapper = KitMpQUtil.build(criteria);
+  public <Q> KitPageResult<T> queryClazzPageByArgs(Q args, IPage<T> pageable) {
+    QueryWrapper<T> wrapper = KitMpQUtil.build(args);
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
     return new KitPageResult<>(originPageData.getRecords(), originPageData.getTotal());
   }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
index 9d14781e..1a04912d 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.quartz.core;
 
 import cn.odboy.framework.context.KitSpringBeanHolder;
@@ -45,13 +44,12 @@ public class QuartzRunnable implements Callable<Object> {
   }
 
   @Override
-  @SuppressWarnings({"unchecked", "all"})
   public Object call() throws Exception {
     ReflectionUtils.makeAccessible(method);
     if (StringUtils.isNotBlank(params)) {
       return method.invoke(target, params);
     } else {
-      return method.invoke(target);
+      return method.invoke(target, "");
     }
   }
 }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
index e8fc210e..8778c4ff 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.framework.redis;
 
 import cn.hutool.core.util.ObjUtil;
@@ -29,13 +28,13 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.ConvertingCursor;
 import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisConnectionUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ScanOptions;
@@ -43,12 +42,10 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 
 @Component
-@SuppressWarnings({"unchecked", "all"})
 public class KitRedisHelper {
 
   private static final Logger log = LoggerFactory.getLogger(KitRedisHelper.class);
-
-  private RedisTemplate<Object, Object> redisTemplate;
+  private final RedisTemplate<Object, Object> redisTemplate;
 
   public KitRedisHelper(RedisTemplate<Object, Object> redisTemplate) {
     this.redisTemplate = redisTemplate;
@@ -99,7 +96,7 @@ public class KitRedisHelper {
    * @param key 键 不能为null
    * @return 时间(秒) 返回0代表为永久有效
    */
-  public long getExpire(Object key) {
+  public Long getExpire(Object key) {
     return redisTemplate.getExpire(key, TimeUnit.SECONDS);
   }
 
@@ -113,10 +110,12 @@ public class KitRedisHelper {
     ScanOptions options = ScanOptions.scanOptions().match(pattern).build();
     RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
     RedisConnection rc = Objects.requireNonNull(factory).getConnection();
-    Cursor<byte[]> cursor = rc.scan(options);
-    List<String> result = new ArrayList<>();
-    while (cursor.hasNext()) {
-      result.add(new String(cursor.next()));
+    List<String> result;
+    try (Cursor<byte[]> cursor = rc.scan(options)) {
+      result = new ArrayList<>();
+      while (cursor.hasNext()) {
+        result.add(new String(cursor.next()));
+      }
     }
     try {
       RedisConnectionUtils.releaseConnection(rc, factory);
@@ -172,7 +171,7 @@ public class KitRedisHelper {
    */
   public boolean hasKey(String key) {
     try {
-      return redisTemplate.hasKey(key);
+      return Boolean.TRUE.equals(redisTemplate.hasKey(key));
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return false;
@@ -182,27 +181,23 @@ public class KitRedisHelper {
   /**
    * 删除缓存
    *
-   * @param key 可以传一个值 或多个
+   * @param keys 可以传一个值 或多个
    */
   public void del(String... keys) {
     if (keys != null && keys.length > 0) {
       if (keys.length == 1) {
-        boolean result = redisTemplate.delete(keys[0]);
-        log.debug("--------------------------------------------");
-        log.debug(new StringBuilder("删除缓存：").append(keys[0]).append(", 结果：").append(result).toString());
-        log.debug("--------------------------------------------");
+        boolean result = Boolean.TRUE.equals(redisTemplate.delete(keys[0]));
+        log.debug("删除缓存：{}, 结果：{}", keys[0], result);
       } else {
         Set<Object> keySet = new HashSet<>();
         for (String key : keys) {
-          if (redisTemplate.hasKey(key)) {
+          if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
             keySet.add(key);
           }
         }
-        long count = redisTemplate.delete(keySet);
-        log.debug("--------------------------------------------");
-        log.debug("成功删除缓存：" + keySet.toString());
-        log.debug("缓存删除数量：" + count + "个");
-        log.debug("--------------------------------------------");
+        Long count = redisTemplate.delete(keySet);
+        log.debug("成功删除缓存：{}", keySet);
+        log.debug("缓存删除数量：{}个", count);
       }
     }
   }
@@ -210,19 +205,36 @@ public class KitRedisHelper {
   /**
    * 批量模糊删除key
    *
-   * @param pattern
+   * @param pattern /
    */
   public void scanDel(String pattern) {
-    ScanOptions options = ScanOptions.scanOptions().match(pattern).build();
-    try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(
-        (RedisCallback<Cursor<byte[]>>) connection -> (Cursor<byte[]>) new ConvertingCursor<>(
-            connection.scan(options), redisTemplate.getKeySerializer()::deserialize))) {
-      while (cursor.hasNext()) {
-        redisTemplate.delete(cursor.next());
+    ScanOptions options = ScanOptions.scanOptions().match(pattern).count(100).build();
+    try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(connection -> {
+      try {
+        return (Cursor<byte[]>) new ConvertingCursor<>(
+            connection.scan(options), redisTemplate.getKeySerializer()::deserialize);
+      } catch (Exception e) {
+        throw new RuntimeException("Redis scan operation failed", e);
       }
+    })) {
+      List<Object> keysToDelete = new ArrayList<>();
+      while (cursor.hasNext()) {
+        Object key = cursor.next();
+        keysToDelete.add(key);
+        // 批量删除，避免一次性删除过多key
+        if (keysToDelete.size() >= 100) {
+          redisTemplate.delete(keysToDelete);
+          keysToDelete.clear();
+        }
+      }
+      // 删除剩余的key
+      if (!keysToDelete.isEmpty()) {
+        redisTemplate.delete(keysToDelete);
+      }
+    } catch (Exception e) {
+      throw new RuntimeException("Error during scan and delete operation", e);
     }
   }
-
   // ============================String=============================
 
   /**
@@ -246,7 +258,7 @@ public class KitRedisHelper {
     if (value == null) {
       return null;
     }
-    // 如果 value 不是目标类型, 则尝试将其反序列化为 clazz 类型 by
+    // 如果 value 不是目标类型, 则尝试将其反序列化为 clazz 类型
     if (!clazz.isInstance(value)) {
       return JSON.parseObject(value.toString(), clazz);
     } else if (clazz.isInstance(value)) {
@@ -268,10 +280,11 @@ public class KitRedisHelper {
     if (value == null) {
       return null;
     }
-    if (value instanceof List<?> list) {
+    if (value instanceof List<?>) {
+      List<?> list = (List<?>) value;
       // 检查每个元素是否为指定类型
       if (list.stream().allMatch(clazz::isInstance)) {
-        return list.stream().map(clazz::cast).toList();
+        return list.stream().map(clazz::cast).collect(Collectors.toList());
       }
     }
     return null;
@@ -302,8 +315,8 @@ public class KitRedisHelper {
    * @return
    */
   public List<Object> multiGet(List<String> keys) {
-    List list = redisTemplate.opsForValue().multiGet(Sets.newHashSet(keys));
-    List resultList = Lists.newArrayList();
+    List<Object> list = redisTemplate.opsForValue().multiGet(Sets.newHashSet(keys));
+    List<Object> resultList = Lists.newArrayList();
     Optional.ofNullable(list)
         .ifPresent(e -> list.forEach(ele -> Optional.ofNullable(ele).ifPresent(resultList::add)));
     return resultList;
@@ -374,7 +387,6 @@ public class KitRedisHelper {
       return false;
     }
   }
-
   // ================================Map=================================
 
   /**
@@ -520,7 +532,6 @@ public class KitRedisHelper {
   public double hdecr(String key, String item, double by) {
     return redisTemplate.opsForHash().increment(key, item, -by);
   }
-
   // ============================set=============================
 
   /**
@@ -547,7 +558,7 @@ public class KitRedisHelper {
    */
   public boolean sHasKey(String key, Object value) {
     try {
-      return redisTemplate.opsForSet().isMember(key, value);
+      return Boolean.TRUE.equals(redisTemplate.opsForSet().isMember(key, value));
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return false;
@@ -563,10 +574,11 @@ public class KitRedisHelper {
    */
   public long sSet(String key, Object... values) {
     try {
-      return redisTemplate.opsForSet().add(key, values);
+      Long add = redisTemplate.opsForSet().add(key, values);
+      return add == null ? 0L : add;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
-      return 0;
+      return 0L;
     }
   }
 
@@ -584,7 +596,7 @@ public class KitRedisHelper {
       if (time > 0) {
         expire(key, time);
       }
-      return count;
+      return count == null ? 0 : count;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return 0;
@@ -599,7 +611,8 @@ public class KitRedisHelper {
    */
   public long sGetSetSize(String key) {
     try {
-      return redisTemplate.opsForSet().size(key);
+      Long size = redisTemplate.opsForSet().size(key);
+      return size == null ? 0 : size;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return 0;
@@ -622,7 +635,6 @@ public class KitRedisHelper {
       return 0;
     }
   }
-
   // ===============================list=================================
 
   /**
@@ -795,7 +807,6 @@ public class KitRedisHelper {
     }
     long count = redisTemplate.delete(keys);
   }
-
   // ============================incr=============================
 
   /**
@@ -838,7 +849,7 @@ public class KitRedisHelper {
    * @param unit    时间单位
    * @return 如果设置成功返回true，否则返回false
    */
-  public Boolean setIfAbsent(String key, Object value, long timeout, TimeUnit unit) {
+  public boolean setIfAbsent(String key, Object value, long timeout, TimeUnit unit) {
     try {
       String stringValue = ObjUtil.toString(value);
       // 使用Redis的SETNX命令实现原子性操作
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
index 4b36f312..9eff808a 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.MurmurHash3;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -130,25 +131,25 @@ public class RedisConfiguration {
   public CacheErrorHandler errorHandler() {
     return new SimpleCacheErrorHandler() {
       @Override
-      public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
+      public void handleCacheGetError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key) {
         // 处理缓存读取错误
         log.error("Cache Get Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCachePutError(RuntimeException exception, Cache cache, Object key, Object value) {
+      public void handleCachePutError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key, @NonNull Object value) {
         // 处理缓存写入错误
         log.error("Cache Put Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCacheEvictError(RuntimeException exception, Cache cache, Object key) {
+      public void handleCacheEvictError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key) {
         // 处理缓存删除错误
         log.error("Cache Evict Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCacheClearError(RuntimeException exception, Cache cache) {
+      public void handleCacheClearError(@NonNull RuntimeException exception, @NonNull Cache cache) {
         // 处理缓存清除错误
         log.error("Cache Clear Error: {}", exception.getMessage());
       }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitAnonTagUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitAnonTagUtil.java
index a2dde622..719df015 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitAnonTagUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitAnonTagUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.odboy.annotation.AnonymousAccess;
@@ -30,7 +28,7 @@ import lombok.experimental.UtilityClass;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
+import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
@@ -48,9 +46,9 @@ public class KitAnonTagUtil {
    */
   public static Map<String, Set<String>> getAnonymousUrl(final ApplicationContext applicationContext) {
     RequestMappingHandlerMapping requestMappingHandlerMapping =
-        applicationContext.getBean(RequestMappingHandlerMapping.class);
+        (RequestMappingHandlerMapping) applicationContext.getBean("requestMappingHandlerMapping");
     Map<RequestMappingInfo, HandlerMethod> handlerMethodMap = requestMappingHandlerMapping.getHandlerMethods();
-    Map<String, java.util.Set<String>> anonymousUrls = new HashMap<>(8);
+    Map<String, Set<String>> anonymousUrls = new HashMap<>(8);
     // 获取匿名标记
     Set<String> get = new HashSet<>();
     Set<String> post = new HashSet<>();
@@ -66,15 +64,27 @@ public class KitAnonTagUtil {
             new ArrayList<>(infoEntry.getKey().getMethodsCondition().getMethods());
         RequestMethodEnum request = RequestMethodEnum.find(
             requestMethods.isEmpty() ? RequestMethodEnum.ALL.getType() : requestMethods.get(0).name());
-        PathPatternsRequestCondition pathPatternsCondition = infoEntry.getKey().getPathPatternsCondition();
-        if (pathPatternsCondition != null) {
+        PatternsRequestCondition patternsCondition = infoEntry.getKey().getPatternsCondition();
+        if (patternsCondition != null) {
           switch (Objects.requireNonNull(request)) {
-            case GET -> get.addAll(pathPatternsCondition.getPatternValues());
-            case POST -> post.addAll(pathPatternsCondition.getPatternValues());
-            case PUT -> put.addAll(pathPatternsCondition.getPatternValues());
-            case PATCH -> patch.addAll(pathPatternsCondition.getPatternValues());
-            case DELETE -> delete.addAll(pathPatternsCondition.getPatternValues());
-            default -> all.addAll(pathPatternsCondition.getPatternValues());
+            case GET:
+              get.addAll(patternsCondition.getPatterns());
+              break;
+            case POST:
+              post.addAll(patternsCondition.getPatterns());
+              break;
+            case PUT:
+              put.addAll(patternsCondition.getPatterns());
+              break;
+            case PATCH:
+              patch.addAll(patternsCondition.getPatterns());
+              break;
+            case DELETE:
+              delete.addAll(patternsCondition.getPatterns());
+              break;
+            default:
+              all.addAll(patternsCondition.getPatterns());
+              break;
           }
         }
       }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBase64SecretUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBase64SecretUtil.java
index 95aef732..3947e7a9 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBase64SecretUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBase64SecretUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.hutool.core.codec.Base64Encoder;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java
new file mode 100644
index 00000000..090657d4
--- /dev/null
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java
@@ -0,0 +1,34 @@
+package cn.odboy.util;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import lombok.experimental.UtilityClass;
+
+/**
+ * Bean拷贝相关
+ *
+ * @author odboy
+ * @date 2026-01-06
+ */
+@UtilityClass
+public class KitBeanUtil {
+
+  public static <T> T copyToClass(Object source, Class<T> tClass) {
+    return BeanUtil.copyProperties(source, tClass);
+  }
+
+  public static void copyToTarget(Object source, Object target) {
+    BeanUtil.copyProperties(source, target, CopyOptions.create().setIgnoreNullValue(true));
+  }
+
+  public static <T> List<T> copyToList(Collection<?> collection, Class<T> targetType) {
+    List<T> ts = BeanUtil.copyToList(collection, targetType);
+    if (ts == null) {
+      return new ArrayList<>(0);
+    }
+    return ts;
+  }
+}
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
index f195e33f..bc215343 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.math.BigDecimal;
@@ -34,14 +32,14 @@ public final class KitBigDecimalUtil {
    * @return 转换后的 BigDecimal
    */
   private static BigDecimal toBigDecimal(Object obj) {
-    if (obj instanceof BigDecimal b) {
-      return b;
-    } else if (obj instanceof Long l) {
-      return BigDecimal.valueOf(l);
-    } else if (obj instanceof Integer i) {
-      return BigDecimal.valueOf(i);
-    } else if (obj instanceof Double d) {
-      return new BigDecimal(d);
+    if (obj instanceof BigDecimal) {
+      return (BigDecimal) obj;
+    } else if (obj instanceof Long) {
+      return BigDecimal.valueOf((Long) obj);
+    } else if (obj instanceof Integer) {
+      return BigDecimal.valueOf((Integer) obj);
+    } else if (obj instanceof Double) {
+      return new BigDecimal(String.valueOf(obj));
     } else {
       throw new IllegalArgumentException("Unsupported type");
     }
@@ -78,12 +76,12 @@ public final class KitBigDecimalUtil {
    *
    * @param a 乘数
    * @param b 乘数
-   * @return 两个乘数的积, 保留两位小数
+   * @return 两个乘数的积, 保留6位小数
    */
   public static BigDecimal multiply(Object a, Object b) {
     BigDecimal bdA = toBigDecimal(a);
     BigDecimal bdB = toBigDecimal(b);
-    return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP);
+    return bdA.multiply(bdB).setScale(6, RoundingMode.HALF_UP);
   }
 
   /**
@@ -96,7 +94,7 @@ public final class KitBigDecimalUtil {
   public static BigDecimal divide(Object a, Object b) {
     BigDecimal bdA = toBigDecimal(a);
     BigDecimal bdB = toBigDecimal(b);
-    return bdA.divide(bdB, 2, RoundingMode.HALF_UP);
+    return bdA.divide(bdB, 6, RoundingMode.HALF_UP);
   }
 
   /**
@@ -138,15 +136,12 @@ public final class KitBigDecimalUtil {
   public static void main(String[] args) {
     BigDecimal num1 = new BigDecimal("10.123");
     BigDecimal num2 = new BigDecimal("2.456");
-
     System.out.println("加法结果: " + add(num1, num2));
     System.out.println("减法结果: " + subtract(num1, num2));
     System.out.println("乘法结果: " + multiply(num1, num2));
     System.out.println("除法结果: " + divide(num1, num2));
-
     Long cents = 12345L;
     System.out.println("分转元结果: " + centsToYuan(cents));
-
     BigDecimal yuan = new BigDecimal("123.45");
     System.out.println("元转分结果: " + yuanToCents(yuan));
   }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBrowserUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBrowserUtil.java
index e0f7c582..ef003570 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBrowserUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitBrowserUtil.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
-import jakarta.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
index 45ae37a0..b08340a6 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.lang.reflect.Field;
@@ -28,8 +26,7 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public final class KitClassUtil {
 
-  @SuppressWarnings({"unchecked", "all"})
-  public static List<Field> getAllFields(Class clazz, List<Field> fields) {
+  public static List<Field> getAllFields(Class<?> clazz, List<Field> fields) {
     if (clazz != null) {
       fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
       getAllFields(clazz.getSuperclass(), fields);
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCloseUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCloseUtil.java
index 3f31a2d0..41351658 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCloseUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCloseUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.io.Closeable;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
index ddeaa676..82548e83 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.odboy.base.KitSelectOptionVo;
 import com.alibaba.fastjson2.JSON;
 import java.lang.reflect.Field;
@@ -39,7 +39,7 @@ import lombok.experimental.UtilityClass;
  * @date 2022-11-09
  */
 @UtilityClass
-public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
+public final class KitCollUtil extends CollUtil {
 
   private static <T, K> Predicate<T> distinctPredicate(Function<? super T, ? extends K> keyMapper) {
     Map<Object, Boolean> map = new HashMap<>(3);
@@ -52,7 +52,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
    * 使用方式: list = CollUtil.streamDistinct(list, Object::getXXX)
    */
   public static <T, K> List<T> streamDistinct(List<T> data, Function<? super T, ? extends K> keyMapper) {
-    return data.stream().filter(distinctPredicate(keyMapper)).toList();
+    return data.stream().filter(distinctPredicate(keyMapper)).collect(Collectors.toList());
   }
 
   /**
@@ -68,7 +68,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
    */
   public static <T, U extends Comparable<? super U>> List<T> streamAscSort(List<T> data,
       Function<? super T, ? extends U> keyExtractor) {
-    return data.stream().sorted(Comparator.comparing(keyExtractor)).toList();
+    return data.stream().sorted(Comparator.comparing(keyExtractor)).collect(Collectors.toList());
   }
 
   /**
@@ -84,7 +84,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
    */
   public static <T, U extends Comparable<? super U>> List<T> streamDescSort(List<T> data,
       Function<? super T, ? extends U> keyExtractor) {
-    return data.stream().sorted(Comparator.comparing(keyExtractor).reversed()).toList();
+    return data.stream().sorted(Comparator.comparing(keyExtractor).reversed()).collect(Collectors.toList());
   }
 
   /**
@@ -193,6 +193,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
    * @return /
    */
   public static BigDecimal streamBigDecimalAvg(List<BigDecimal> data) {
+    KitValidUtil.notEmpty(data, "data");
     return data.stream().filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
         .divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR);
   }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
index 69d9c198..139d006e 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.hutool.core.date.DatePattern;
@@ -31,7 +30,7 @@ import lombok.experimental.UtilityClass;
 public class KitDateUtil {
 
   /**
-   * 获取当前时间毫秒数
+   * 获取当前时间毫秒数 yyyyMMddHHmmssSSS
    *
    * @return /
    */
@@ -40,7 +39,7 @@ public class KitDateUtil {
   }
 
   /**
-   * 获取当前时间,但不包括毫秒数
+   * 获取当前时间,但不包括毫秒数 yyyyMMddHHmmss
    *
    * @return /
    */
@@ -49,7 +48,7 @@ public class KitDateUtil {
   }
 
   /**
-   * 获取当前时间,但不包括毫秒数
+   * 获取当前时间,但不包括毫秒数 yyyyMMdd
    *
    * @return /
    */
@@ -62,39 +61,31 @@ public class KitDateUtil {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @return 格式化后的时间，X天X时X分X秒X毫秒
+   * @return 格式化后的时间，X天X时X分X秒
    */
   public static String formatMillsDuration(Date startTime, Date endTime) {
     if (startTime == null || endTime == null) {
       // 什么都不返回
       return "";
     }
-
     long betweenSeconds = DateUtil.between(startTime, endTime, cn.hutool.core.date.DateUnit.SECOND);
-
     long days = betweenSeconds / (24 * 60 * 60);
     long hours = (betweenSeconds % (24 * 60 * 60)) / (60 * 60);
     long minutes = (betweenSeconds % (60 * 60)) / 60;
     long seconds = betweenSeconds % 60;
-
     StringBuilder result = new StringBuilder();
-
     if (days > 0) {
       result.append(days).append("天");
     }
-
     if (hours > 0) {
       result.append(hours).append("时");
     }
-
     if (minutes > 0) {
       result.append(minutes).append("分");
     }
-
-    if (seconds > 0 || result.isEmpty()) {
+    if (seconds > 0 || result.length() == 0) {
       result.append(seconds).append("秒");
     }
-
     return result.toString();
   }
 
@@ -110,41 +101,32 @@ public class KitDateUtil {
       // 什么都不返回
       return "";
     }
-
     long betweenMs = DateUtil.betweenMs(startTime, endTime);
     long days = betweenMs / (24 * 60 * 60 * 1000);
     long hours = (betweenMs % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000);
     long minutes = (betweenMs % (60 * 60 * 1000)) / (60 * 1000);
     long seconds = (betweenMs % (60 * 1000)) / 1000;
     long milliseconds = betweenMs % 1000;
-
     StringBuilder result = new StringBuilder();
-
     if (days > 0) {
       result.append(days).append("天");
     }
-
     if (hours > 0) {
       result.append(hours).append("时");
     }
-
     if (minutes > 0) {
       result.append(minutes).append("分");
     }
-
     if (seconds > 0) {
       result.append(seconds).append("秒");
     }
-
     if (milliseconds > 0) {
       result.append(milliseconds).append("毫秒");
     }
-
     // 如果所有单位都是0，则显示0毫秒
-    if (result.isEmpty()) {
+    if (result.length() == 0) {
       result.append("0毫秒");
     }
-
     return result.toString();
   }
 }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDesEncryptUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDesEncryptUtil.java
index 655b87af..a2c975ee 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDesEncryptUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDesEncryptUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.nio.charset.StandardCharsets;
@@ -93,4 +92,3 @@ public final class KitDesEncryptUtil {
     return b2;
   }
 }
-
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
index fadc4a27..82f5ec29 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.odboy.framework.exception.BadRequestException;
@@ -25,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * @author odboy
  * @date 2025-04-05
  */
+@Deprecated
 public final class KitDistributedIdUtil {
 
   /**
@@ -43,7 +43,6 @@ public final class KitDistributedIdUtil {
    * 序列号所占位数
    */
   private final long sequenceBits;
-
   /**
    * 数据中心 ID 最大值
    */
@@ -56,7 +55,6 @@ public final class KitDistributedIdUtil {
    * 序列号最大值
    */
   private final long sequenceMask;
-
   /**
    * 机器 ID 向左移位数
    */
@@ -69,7 +67,6 @@ public final class KitDistributedIdUtil {
    * 时间戳向左移位数
    */
   private final long timestampLeftShift;
-
   /**
    * 数据中心 ID
    */
@@ -101,15 +98,12 @@ public final class KitDistributedIdUtil {
     this.dataCenterIdBits = dataCenterIdBits;
     this.workerIdBits = workerIdBits;
     this.sequenceBits = sequenceBits;
-
     this.maxDataCenterId = ~(-1L << dataCenterIdBits);
     this.maxWorkerId = ~(-1L << workerIdBits);
     this.sequenceMask = ~(-1L << sequenceBits);
-
     this.workerIdShift = sequenceBits;
     this.dataCenterIdShift = sequenceBits + workerIdBits;
     this.timestampLeftShift = sequenceBits + workerIdBits + dataCenterIdBits;
-
     if (dataCenterId > maxDataCenterId || dataCenterId < 0) {
       throw new IllegalArgumentException(
           "Data center ID can't be greater than " + maxDataCenterId + " or less than 0");
@@ -153,14 +147,12 @@ public final class KitDistributedIdUtil {
    */
   public long nextId() {
     long currentTimestamp = System.currentTimeMillis();
-
     // 如果当前时间戳小于上一次生成 ID 的时间戳, 说明时钟回拨，抛出异常
     if (currentTimestamp < lastTimestamp.get()) {
       throw new BadRequestException(
           "Clock moved backwards. Refusing to generate id for " + (lastTimestamp.get() - currentTimestamp) +
               " milliseconds");
     }
-
     long lastTimestampValue = lastTimestamp.get();
     if (currentTimestamp == lastTimestampValue) {
       // 同一毫秒内，序列号自增
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
index 9ca0dd15..d69de63a 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
@@ -20,6 +20,7 @@ import static cn.odboy.constant.SystemConst.SYMBOL_AT;
 import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
 import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
@@ -55,7 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @Slf4j
 @UtilityClass
-public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
+public final class KitFileUtil extends FileUtil {
 
   /**
    * 系统临时目录
@@ -80,10 +81,6 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
    * 定义KB的计算常量
    */
   private static final int KB = 1024;
-  /**
-   * 格式化小数
-   */
-  private static final DecimalFormat DF = new DecimalFormat("0.00");
 
   /**
    * MultipartFile转File
@@ -112,13 +109,13 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
     String resultSize;
     if (size / GB >= 1) {
       //如果当前Byte的值大于等于1GB
-      resultSize = DF.format(size / (float) GB) + " GB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) GB) + " GB";
     } else if (size / MB >= 1) {
       //如果当前Byte的值大于等于1MB
-      resultSize = DF.format(size / (float) MB) + " MB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) MB) + " MB";
     } else if (size / KB >= 1) {
       //如果当前Byte的值大于等于1KB
-      resultSize = DF.format(size / (float) KB) + " KB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) KB) + " KB";
     } else {
       resultSize = size + " B";
     }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitIPUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitIPUtil.java
index 4514d61e..6d651fe3 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitIPUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitIPUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.odboy.framework.context.KitSpringBeanHolder;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitJsonUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitJsonUtil.java
index 1ef25569..8b8fc9d5 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitJsonUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitJsonUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import com.alibaba.fastjson2.JSON;
@@ -32,12 +31,12 @@ import lombok.experimental.UtilityClass;
 public final class KitJsonUtil {
 
   public static <K, V> Map<K, V> toMap(String jsonStr, Class<K> kClass, Class<V> vClass) {
-    return JSON.parseObject(jsonStr, new TypeReference<>() {
+    return JSON.parseObject(jsonStr, new TypeReference<Map<K, V>>() {
     });
   }
 
   public static <V> List<V> toList(String jsonStr, Class<V> vClass) {
-    return JSON.parseObject(jsonStr, new TypeReference<>() {
+    return JSON.parseObject(jsonStr, new TypeReference<List<V>>() {
     });
   }
 
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitListUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitListUtil.java
index 9164bdaf..ca212ef4 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitListUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitListUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.hutool.core.date.DateTime;
@@ -41,7 +40,7 @@ public final class KitListUtil {
    */
   public static <T, K> List<T> distinctByArgs(List<T> items, Function<? super T, ? extends K> classifier) {
     return items.stream().collect(Collectors.groupingBy(classifier)).values().stream()
-        .map(monitorItem -> monitorItem.iterator().next()).toList();
+        .map(monitorItem -> monitorItem.iterator().next()).collect(Collectors.toList());
   }
 
   /**
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitLogFmtUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitLogFmtUtil.java
index 6137775c..022b77c6 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitLogFmtUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitLogFmtUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import lombok.experimental.UtilityClass;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
index 26e3e701..abb3cdcf 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
@@ -13,14 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.odboy.base.KitPageResult;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import lombok.experimental.UtilityClass;
@@ -63,13 +59,6 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
     return new KitPageResult<>(list, list.size());
   }
 
-  /**
-   * 返回空数据
-   */
-  public static <T> KitPageResult<T> emptyListData() {
-    return new KitPageResult<>(new ArrayList<>(), 0);
-  }
-
   /**
    * 返回空数据
    */
@@ -83,8 +72,4 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
   public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) {
     return new KitPageResult<>(list, totalElements);
   }
-
-  public static <T> Page<T> getCount(BaseMapper<T> baseMapper) {
-    return new Page<>(1, baseMapper.selectCount(null));
-  }
 }
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitResourceTemplateUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitResourceTemplateUtil.java
index adc96b47..66b5b4d2 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitResourceTemplateUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitResourceTemplateUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import cn.hutool.core.lang.Dict;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitReturnValueHandleUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitReturnValueHandleUtil.java
index 02f9ef3e..73dfaaef 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitReturnValueHandleUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitReturnValueHandleUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.lang.reflect.Method;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
index 2abd829d..9384956d 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.io.ByteArrayOutputStream;
@@ -185,7 +184,7 @@ public final class KitRsaEncryptUtil {
    */
   public static RsaKeyPair generateKeyPair() throws NoSuchAlgorithmException {
     KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(1024);
+    keyPairGenerator.initialize(4096);
     KeyPair keyPair = keyPairGenerator.generateKeyPair();
     RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic();
     RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate();
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitStringUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitStringUtil.java
index 61702164..059cbd47 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitStringUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitStringUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import java.util.Calendar;
@@ -40,14 +38,11 @@ public final class KitStringUtil {
     if (s == null) {
       return null;
     }
-
     s = s.toLowerCase();
-
     StringBuilder sb = new StringBuilder(s.length());
     boolean upperCase = false;
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
-
       if (c == SEPARATOR) {
         upperCase = true;
       } else if (upperCase) {
@@ -57,7 +52,6 @@ public final class KitStringUtil {
         sb.append(c);
       }
     }
-
     return sb.toString();
   }
 
@@ -83,18 +77,14 @@ public final class KitStringUtil {
     if (s == null) {
       return null;
     }
-
     StringBuilder sb = new StringBuilder();
     boolean upperCase = false;
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
-
       boolean nextUpperCase = true;
-
       if (i < (s.length() - 1)) {
         nextUpperCase = Character.isUpperCase(s.charAt(i + 1));
       }
-
       if ((i > 0) && Character.isUpperCase(c)) {
         if (!upperCase || !nextUpperCase) {
           sb.append(SEPARATOR);
@@ -103,10 +93,8 @@ public final class KitStringUtil {
       } else {
         upperCase = false;
       }
-
       sb.append(Character.toLowerCase(c));
     }
-
     return sb.toString();
   }
 
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
index c008d938..fd967556 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitSystemUtil.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021-2025 Odboy
  *
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
 import oshi.SystemInfo;
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
index b5a4c4f9..5cc11de7 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
@@ -13,17 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.util;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.exception.BadRequestException;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
 import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.groups.Default;
-import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.experimental.UtilityClass;
 
 /**
@@ -50,4 +53,40 @@ public final class KitValidUtil {
           violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")));
     }
   }
+
+  public static void notNull(Object value) {
+    if (value == null) {
+      throw new BadRequestException("参数必填");
+    }
+  }
+
+  public static void isNull(Object value) {
+    if (value != null) {
+      throw new BadRequestException("参数非必填");
+    }
+  }
+
+  public static void notNull(Object value, @NotNull String name, @NotNull String code) {
+    if (value == null) {
+      throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code));
+    }
+  }
+
+  public static void isBlank(CharSequence value, @NotNull String name, @NotNull String code) {
+    if (StrUtil.isNotBlank(value)) {
+      throw new BadRequestException(String.format("参数 %s(%s) 非必填", name, code));
+    }
+  }
+
+  public static void notBlank(CharSequence value, @NotNull String name, @NotNull String code) {
+    if (StrUtil.isBlank(value)) {
+      throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code));
+    }
+  }
+
+  public static void notEmpty(List<?> data, @NotNull String code) {
+    if (CollUtil.isEmpty(data)) {
+      throw new BadRequestException(String.format("参数 %s 必填", code));
+    }
+  }
 }
\ No newline at end of file
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitExcelExporter.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitExcelExporter.java
index b36f3c3f..8372a27d 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitExcelExporter.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitExcelExporter.java
@@ -3,12 +3,12 @@ package cn.odboy.util.xlsx;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.idev.excel.EasyExcel;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * EasyExcel 导出增强工具类 (支持普通/分页模式)
diff --git a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitXlsxExportUtil.java b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitXlsxExportUtil.java
index 14e60780..320b0f2a 100644
--- a/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitXlsxExportUtil.java
+++ b/cutejava-springboot3/cutejava-framework/src/main/java/cn/odboy/util/xlsx/KitXlsxExportUtil.java
@@ -6,13 +6,13 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.idev.excel.FastExcel;
 import cn.odboy.framework.exception.BadRequestException;
-import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.experimental.UtilityClass;
 
 /**
diff --git a/cutejava-springboot3/cutejava-module-system/pom.xml b/cutejava-springboot3/cutejava-module-system/pom.xml
index 2c613898..34ef30ab 100644
--- a/cutejava-springboot3/cutejava-module-system/pom.xml
+++ b/cutejava-springboot3/cutejava-module-system/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-module-system</artifactId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-framework</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/io.minio/minio -->
     <dependency>
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
index 333dcfda..5fc6f746 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
@@ -24,13 +24,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SystemCaptchaBizEnum {
-  /* 通过手机号码重置邮箱 */
-  PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl",
-      "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */
+  PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置邮箱"),
   EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"),
-  /* 通过手机号码重置密码 */
   PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"),
-  /* 通过邮箱重置密码 */
   EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码");
   /**
    * 业务编码
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
index bb30f72b..47f7d19f 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
@@ -24,9 +24,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SystemDataScopeEnum {
-  /* 全部的数据权限 */
-  ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */
-  THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */
+  ALL("全部", "全部的数据权限"),
+  THIS_LEVEL("本级", "自己部门的数据权限"),
   CUSTOMIZE("自定义", "自定义的数据权限");
   private final String value;
   private final String description;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
index 02a59fe7..009455ab 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.system.constant;
 
-public interface TransferProtocolConst {
+public interface SystemTransferProtocolConst {
 
   String PREFIX_HTTP = "http://";
   String PREFIX_HTTPS = "https://";
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemYesOrNoChConst.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemYesOrNoChConst.java
index 25ab481c..d1e17789 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemYesOrNoChConst.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemYesOrNoChConst.java
@@ -1,6 +1,7 @@
 package cn.odboy.system.constant;
 
 public interface SystemYesOrNoChConst {
+
   String YES_STR = "是";
   String NO_STR = "否";
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
index f9f55523..14c225f6 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
@@ -16,18 +16,16 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.annotation.AnonymousPostMapping;
-import cn.odboy.system.dal.model.SystemUserInfoVo;
-import cn.odboy.system.dal.model.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.response.SystemAuthVo;
 import cn.odboy.system.service.SystemAuthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.Map;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,26 +44,11 @@ public class SystemAuthController {
 
   @ApiOperation("登录授权")
   @AnonymousPostMapping(value = "/login")
-  public ResponseEntity<Map<String, Object>> login(@Validated @RequestBody SystemUserLoginArgs loginRequest,
-      HttpServletRequest request) throws Exception {
-    Map<String, Object> loginInfo = systemAuthService.doLogin(loginRequest, request);
+  public ResponseEntity<SystemAuthVo> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception {
+    SystemAuthVo loginInfo = systemAuthService.doLogin(loginRequest, request);
     return ResponseEntity.ok(loginInfo);
   }
 
-  @ApiOperation("获取用户信息")
-  @PostMapping(value = "/info")
-  public ResponseEntity<SystemUserInfoVo> getUserInfo() {
-    SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo();
-    return ResponseEntity.ok(userInfoVo);
-  }
-
-  @ApiOperation("获取验证码")
-  @AnonymousPostMapping(value = "/captcha/getImage")
-  public ResponseEntity<Map<String, Object>> getCode() {
-    Map<String, Object> imgResult = systemAuthService.getCaptchaInfo();
-    return ResponseEntity.ok(imgResult);
-  }
-
   @ApiOperation("退出登录")
   @AnonymousPostMapping(value = "/logout")
   public ResponseEntity<Void> logout(HttpServletRequest request) {
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
index 5834823e..bdb74a90 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
@@ -16,7 +16,8 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
-import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,23 +38,25 @@ public class SystemCaptchaController {
   @Autowired
   private SystemEmailService systemEmailService;
 
+  @OperationLog
   @ApiOperation("重置邮箱, 发送验证码")
-  @PostMapping(value = "/sendResetEmailCaptcha")
-  public ResponseEntity<Void> sendResetEmailCaptcha(@RequestParam String email) {
+  @PostMapping(value = "/sendResetEmailCode")
+  public ResponseEntity<Void> sendResetEmailCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("重置密码，发送验证码")
-  @PostMapping(value = "/sendResetPasswordCaptcha")
-  public ResponseEntity<Void> sendResetPasswordCaptcha(@RequestParam String email) {
+  @PostMapping(value = "/sendResetPasswordCode")
+  public ResponseEntity<Void> sendResetPasswordCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("验证码验证")
-  @PostMapping(value = "/checkEmailCaptcha")
-  public ResponseEntity<Void> checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
+  @PostMapping(value = "/verifyCode")
+  public ResponseEntity<Void> verifyCode(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
     systemEmailService.checkEmailCaptcha(args);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
index ffb123a7..8c3aa3ec 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
@@ -34,16 +34,16 @@ public class SystemComponentController {
   private SystemDeptService systemDeptService;
 
   @ApiOperation("查询部门下拉选择数据源")
-  @PostMapping(value = "/queryDeptSelectDataSource")
+  @PostMapping(value = "/listDeptSelectDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource());
+  public ResponseEntity<?> listDeptSelectDataSource() {
+    return ResponseEntity.ok(systemDeptService.listDeptSelectDataSource());
   }
 
   @ApiOperation("查询部门下拉选择Pro数据源")
-  @PostMapping(value = "/queryDeptSelectProDataSource")
+  @PostMapping(value = "/listDeptSelectProDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectProDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource());
+  public ResponseEntity<?> listDeptSelectProDataSource() {
+    return ResponseEntity.ok(systemDeptService.listDeptSelectProDataSource());
   }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
index c3449355..b6b009a0 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
@@ -18,8 +18,10 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.model.SystemCreateDeptArgs;
-import cn.odboy.system.dal.model.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDeptArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDeptService;
 import cn.odboy.util.KitPageUtil;
 import io.swagger.annotations.Api;
@@ -46,6 +48,7 @@ public class SystemDeptController {
   @Autowired
   private SystemDeptService systemDeptService;
 
+  @OperationLog
   @ApiOperation("导出部门数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dept:list')")
@@ -54,22 +57,21 @@ public class SystemDeptController {
   }
 
   @ApiOperation("查询部门")
-  @PostMapping
+  @PostMapping(value = "/searchDept")
   @PreAuthorize("@el.check('user:list','dept:list')")
-  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(
-      @Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
+  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(@Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
     List<SystemDeptTb> depts = systemDeptService.queryAllDeptByArgs(pageArgs.getArgs(), true);
     return ResponseEntity.ok(KitPageUtil.toPage(depts));
   }
 
   @ApiOperation("查询部门:根据ID获取同级与上级数据")
-  @PostMapping("/queryDeptSuperiorTree")
+  @PostMapping("/searchDeptTree")
   @PreAuthorize("@el.check('user:list','dept:list')")
-  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
-      @RequestParam(defaultValue = "false") Boolean exclude) {
+  public ResponseEntity<KitPageResult<SystemDeptVo>> queryDeptSuperiorTree(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
     return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude));
   }
 
+  @OperationLog
   @ApiOperation("新增部门")
   @PostMapping(value = "/saveDept")
   @PreAuthorize("@el.check('dept:add')")
@@ -78,18 +80,20 @@ public class SystemDeptController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改部门")
-  @PostMapping(value = "/modifyDept")
+  @PostMapping(value = "/updateDeptById")
   @PreAuthorize("@el.check('dept:edit')")
-  public ResponseEntity<Void> modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
-    systemDeptService.updateDept(args);
+  public ResponseEntity<Void> updateDeptById(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
+    systemDeptService.updateDeptById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除部门")
-  @PostMapping(value = "/removeDeptByIds")
+  @PostMapping(value = "/deleteDeptByIds")
   @PreAuthorize("@el.check('dept:del')")
-  public ResponseEntity<Void> removeDeptByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDeptByIds(@RequestBody Set<Long> ids) {
     systemDeptService.deleteDeptByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
index f5b57b50..e3d3e9ae 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
@@ -18,14 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictArgs;
-import cn.odboy.system.dal.model.SystemQueryDictArgs;
-import cn.odboy.system.service.SystemDictDetailService;
+import cn.odboy.system.dal.model.request.SystemCreateDictArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDictService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import jakarta.servlet.http.HttpServletResponse;
@@ -46,32 +45,32 @@ public class SystemDictController {
 
   @Autowired
   private SystemDictService systemDictService;
-  @Autowired
-  private SystemDictDetailService systemDictDetailService;
 
+  @OperationLog
   @ApiOperation("导出字典数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dict:list')")
-  public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException {
+  public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) {
     systemDictService.exportDictXlsx(response, args);
   }
 
-  @ApiOperation("查询字典")
+  @Deprecated
+  @ApiOperation("查询所有字典")
   @PostMapping(value = "/queryAllDict")
   @PreAuthorize("@el.check('dict:list')")
   public ResponseEntity<List<SystemDictTb>> queryAllDict() {
     return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs()));
   }
 
-  @ApiOperation("查询字典")
-  @PostMapping
+  @ApiOperation("分页查询字典")
+  @PostMapping(value = "/searchDict")
   @PreAuthorize("@el.check('dict:list')")
-  public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
     Page<SystemDictTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page));
   }
 
+  @OperationLog
   @ApiOperation("新增字典")
   @PostMapping(value = "/saveDict")
   @PreAuthorize("@el.check('dict:add')")
@@ -80,18 +79,20 @@ public class SystemDictController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改字典")
-  @PostMapping(value = "/modifyDictById")
+  @PostMapping(value = "/updateDictById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
+  public ResponseEntity<Void> updateDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
     systemDictService.updateDictById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除字典")
-  @PostMapping(value = "/removeDictByIds")
+  @PostMapping(value = "/deleteDictByIds")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDictByIds(@RequestBody Set<Long> ids) {
     systemDictService.deleteDictByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
index 98d6bd89..0b7cd08f 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
@@ -18,9 +18,10 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
-import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDictDetailService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -47,16 +48,8 @@ public class SystemDictDetailController {
   private SystemDictDetailService systemDictDetailService;
 
   @ApiOperation("查询字典详情")
-  @PostMapping
-  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> args) {
-    return queryDictDetailByArgs(args);
-  }
-
-  @ApiOperation("查询字典详情")
-  @PostMapping(value = "/queryDictDetailByArgs")
-  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
+  @PostMapping(value = "/searchDictDetail")
+  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
     Page<SystemDictDetailTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemDictDetailService.searchDictDetail(pageArgs.getArgs(), page));
   }
@@ -68,6 +61,7 @@ public class SystemDictDetailController {
     return ResponseEntity.ok(dictMap);
   }
 
+  @OperationLog
   @ApiOperation("新增字典详情")
   @PostMapping(value = "/saveDictDetail")
   @PreAuthorize("@el.check('dict:add')")
@@ -76,19 +70,20 @@ public class SystemDictDetailController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改字典详情")
-  @PostMapping(value = "/modifyDictDetailById")
+  @PostMapping(value = "/updateDictDetailById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictDetailById(
-      @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
+  public ResponseEntity<Void> updateDictDetailById(@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
     systemDictDetailService.updateDictDetailById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除字典详情")
-  @PostMapping(value = "/removeDictDetailById")
+  @PostMapping(value = "/deleteDictDetailById")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictDetailById(@RequestBody SystemDictDetailTb args) {
+  public ResponseEntity<Void> deleteDictDetailById(@RequestBody SystemDictDetailTb args) {
     systemDictDetailService.deleteDictDetailById(args.getId());
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
index 9fc9ac2c..81d64ba1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
@@ -16,7 +16,8 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,17 +46,18 @@ public class SystemEmailController {
     return ResponseEntity.ok(systemEmailService.getLastEmailConfig());
   }
 
-  @ApiOperation("配置邮件")
-  @PostMapping(value = "/modifyEmailConfig")
-  public ResponseEntity<Void> modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig)
-      throws Exception {
+  @OperationLog
+  @ApiOperation("修改邮箱配置")
+  @PostMapping(value = "/updateEmailConfigById")
+  public ResponseEntity<Void> updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception {
     systemEmailService.updateEmailConfigById(emailConfig);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("发送邮件")
-  @PostMapping(value = "/sendEmail")
-  public ResponseEntity<Void> sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
+  @PostMapping(value = "/send")
+  public ResponseEntity<Void> send(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
     systemEmailService.sendEmail(sendEmailRequest);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
index 8877f379..0ab929cf 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
@@ -18,13 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.model.SystemCreateJobArgs;
-import cn.odboy.system.dal.model.SystemQueryJobArgs;
+import cn.odboy.system.dal.model.request.SystemCreateJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryJobArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemJobService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.Set;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,30 +45,23 @@ public class SystemJobController {
   @Autowired
   private SystemJobService systemJobService;
 
+  @OperationLog
   @ApiOperation("导出岗位数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('job:list')")
-  public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException {
+  public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) {
     systemJobService.exportJobXlsx(response, args);
   }
 
-  @ApiOperation("查询岗位")
-  @PostMapping(value = "/queryAllEnableJob")
+  @ApiOperation("分页查询岗位")
+  @PostMapping(value = "/searchJob")
   @PreAuthorize("@el.check('job:list','user:list')")
-  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
     Page<SystemJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("查询岗位")
-  @PostMapping
-  @PreAuthorize("@el.check('job:list','user:list')")
-  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> args) {
-    return queryJobByArgs(args);
-  }
-
+  @OperationLog
   @ApiOperation("新增岗位")
   @PostMapping(value = "/saveJob")
   @PreAuthorize("@el.check('job:add')")
@@ -77,18 +70,20 @@ public class SystemJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改岗位")
-  @PostMapping(value = "/modifyJobById")
+  @PostMapping(value = "/updateJobById")
   @PreAuthorize("@el.check('job:edit')")
-  public ResponseEntity<Void> modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
+  public ResponseEntity<Void> updateJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
     systemJobService.updateJobById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除岗位")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('job:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
index 6bd3d93e..938b7d18 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
@@ -18,12 +18,12 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemLocalStorageService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,21 +46,22 @@ public class SystemLocalStorageController {
   private SystemLocalStorageService localStorageService;
 
   @ApiOperation("查询文件")
-  @PostMapping
+  @PostMapping(value = "/searchLocalStorage")
   @PreAuthorize("@el.check('storage:list')")
-  public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
     Page<SystemLocalStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出本地存储记录数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
     localStorageService.exportLocalStorageXlsx(response, args);
   }
 
+  @OperationLog
   @ApiOperation("上传文件")
   @PostMapping(value = "/uploadFile")
   @PreAuthorize("@el.check('storage:add')")
@@ -69,6 +70,7 @@ public class SystemLocalStorageController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("上传图片")
   @PostMapping("/uploadPicture")
   public ResponseEntity<SystemLocalStorageTb> uploadPicture(@RequestParam MultipartFile file) {
@@ -76,16 +78,18 @@ public class SystemLocalStorageController {
     return ResponseEntity.ok(localStorage);
   }
 
+  @OperationLog
   @ApiOperation("修改文件")
-  @PostMapping(value = "/modifyLocalStorageById")
+  @PostMapping(value = "/updateLocalStorageById")
   @PreAuthorize("@el.check('storage:edit')")
-  public ResponseEntity<Void> modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
+  public ResponseEntity<Void> updateLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
     localStorageService.updateLocalStorageById(args);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
+  @OperationLog
+  @ApiOperation("删除文件")
+  @PostMapping(value = "/deleteFileByIds")
   public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     localStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
index 452acc3e..992eebd3 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
@@ -19,8 +19,10 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.model.SystemMenuVo;
-import cn.odboy.system.dal.model.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.request.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.response.SystemMenuRouterVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemMenuService;
 import cn.odboy.util.KitPageUtil;
 import io.swagger.annotations.Api;
@@ -47,6 +49,7 @@ public class SystemMenuController {
   @Autowired
   private SystemMenuService systemMenuService;
 
+  @OperationLog
   @ApiOperation("导出菜单数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('menu:list')")
@@ -56,36 +59,28 @@ public class SystemMenuController {
 
   @PostMapping(value = "/buildMenus")
   @ApiOperation("获取前端所需菜单")
-  public ResponseEntity<List<SystemMenuVo>> buildMenus() {
-    List<SystemMenuVo> systemMenuVos = systemMenuService.buildFrontMenus();
-    return ResponseEntity.ok(systemMenuVos);
+  public ResponseEntity<List<SystemMenuRouterVo>> buildMenus() {
+    List<SystemMenuRouterVo> systemMenuRouterVos = systemMenuService.buildFrontMenus();
+    return ResponseEntity.ok(systemMenuRouterVos);
   }
 
   @ApiOperation("返回全部的菜单")
-  @PostMapping(value = "/queryMenuListByPid")
+  @PostMapping(value = "/listMenuByPid")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<List<SystemMenuTb>> queryMenuListByPid(@RequestParam Long pid) {
-    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid);
+  public ResponseEntity<List<SystemMenuVo>> listMenuByPid(@RequestParam Long pid) {
+    List<SystemMenuVo> systemMenuTbs = systemMenuService.listMenuByPid(pid);
     return ResponseEntity.ok(systemMenuTbs);
   }
 
   @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID")
-  @PostMapping(value = "/queryChildMenuSet")
+  @PostMapping(value = "/listChildMenuSetByMenuId")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<Set<Long>> queryChildMenuSet(@RequestParam Long id) {
+  public ResponseEntity<Set<Long>> listChildMenuSetByMenuId(@RequestParam Long id) {
     Set<Long> ids = systemMenuService.listChildMenuSetByMenuId(id);
     return ResponseEntity.ok(ids);
   }
 
-  @PostMapping
-  @ApiOperation("查询菜单")
-  @PreAuthorize("@el.check('menu:list')")
-  public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenuByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> args) throws Exception {
-    return queryAllMenu(args);
-  }
-
-  @PostMapping(value = "/queryMenuByArgs")
+  @PostMapping(value = "/searchMenu")
   @ApiOperation("查询菜单")
   @PreAuthorize("@el.check('menu:list')")
   public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenu(
@@ -97,11 +92,12 @@ public class SystemMenuController {
   @ApiOperation("查询菜单:根据ID获取同级与上级数据")
   @PostMapping("/queryMenuSuperior")
   @PreAuthorize("@el.check('menu:list')")
-  public ResponseEntity<List<SystemMenuTb>> queryMenuSuperior(@RequestBody List<Long> ids) {
-    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuSuperior(ids);
+  public ResponseEntity<List<SystemMenuVo>> queryMenuSuperior(@RequestBody List<Long> ids) {
+    List<SystemMenuVo> systemMenuTbs = systemMenuService.listMenuSuperior(ids);
     return ResponseEntity.ok(systemMenuTbs);
   }
 
+  @OperationLog
   @ApiOperation("新增菜单")
   @PostMapping(value = "/saveMenu")
   @PreAuthorize("@el.check('menu:add')")
@@ -113,18 +109,20 @@ public class SystemMenuController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改菜单")
-  @PostMapping(value = "/modifyMenuById")
+  @PostMapping(value = "/updateMenuById")
   @PreAuthorize("@el.check('menu:edit')")
-  public ResponseEntity<Void> modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
+  public ResponseEntity<Void> updateMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
     systemMenuService.updateMenuById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除菜单")
-  @PostMapping(value = "/removeMenuByIds")
+  @PostMapping(value = "/deleteMenuByIds")
   @PreAuthorize("@el.check('menu:del')")
-  public ResponseEntity<Void> removeMenuByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteMenuByIds(@RequestBody Set<Long> ids) {
     systemMenuService.deleteMenuByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
index 5b419e52..7f387c68 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
@@ -15,6 +15,7 @@
  */
 package cn.odboy.system.controller;
 
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemMonitorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,10 +35,11 @@ public class SystemMonitorController {
   @Autowired
   private SystemMonitorService systemMonitorService;
 
-  @PostMapping(value = "/queryServerMonitorInfo")
+  @OperationLog
+  @PostMapping(value = "/getServerMonitorInfo")
   @ApiOperation("查询服务监控")
   @PreAuthorize("@el.check('monitor:list')")
-  public ResponseEntity<Map<String, Object>> queryServerMonitorInfo() {
+  public ResponseEntity<Map<String, Object>> getServerMonitorInfo() {
     return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo());
   }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
index 1b47c802..2ccc1927 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
@@ -17,8 +17,9 @@ package cn.odboy.system.controller;
 
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
+import cn.odboy.system.framework.operalog.OperationLog;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -43,23 +44,25 @@ public class SystemOnlineController {
   @Autowired
   private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
 
+  @OperationLog
   @ApiOperation("查询在线用户")
-  @PostMapping
+  @PostMapping(value = "/searchOnlineUser")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(
-      @Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(@Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
     IPage<SystemUserOnlineVo> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
-    return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(pageArgs.getArgs(), page));
+    return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出在线用户数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check()")
   public void exportOnlineUser(HttpServletResponse response, String username) {
     systemUserOnlineInfoDAO.exportOnlineUserXlsx(response, username);
   }
 
-  @ApiOperation("踢出用户")
+  @OperationLog
+  @ApiOperation("踢出在线用户")
   @PostMapping(value = "/kickOutUser")
   @PreAuthorize("@el.check()")
   public ResponseEntity<Void> kickOutUser(@RequestBody Set<String> keys) throws Exception {
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java
new file mode 100644
index 00000000..ac087351
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java
@@ -0,0 +1,35 @@
+package cn.odboy.system.controller;
+
+import cn.odboy.base.KitPageArgs;
+import cn.odboy.base.KitPageResult;
+import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
+import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs;
+import cn.odboy.system.service.SystemOperationLogService;
+import cn.odboy.util.KitPageUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "系统：审计日志")
+@RequestMapping("/api/logs")
+public class SystemOperationLogController {
+
+  @Autowired
+  private SystemOperationLogService systemOperationLogService;
+
+  @PostMapping(value = "/searchUserLog")
+  @ApiOperation("用户日志查询")
+  public ResponseEntity<KitPageResult<SystemOperationLogTb>> searchUserLog(@Validated @RequestBody KitPageArgs<SystemQueryOperationLogArgs> pageArgs) {
+    IPage<SystemOperationLogTb> systemOperationLogTbPage = systemOperationLogService.searchUserLog(pageArgs);
+    return new ResponseEntity<>(KitPageUtil.toPage(systemOperationLogTbPage), HttpStatus.OK);
+  }
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
index 0d391ba9..d45d5361 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
@@ -18,13 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemOssStorageService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,22 +49,23 @@ public class SystemOssStorageController {
   private SystemOssStorageService systemOssStorageService;
 
   @ApiOperation("查询文件")
-  @PostMapping
+  @PostMapping(value = "/searchOssStorage")
   @PreAuthorize("@el.check('storage:list')")
-  public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
     Page<SystemOssStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出OSS存储记录数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
     systemOssStorageService.exportOssStorageXlsx(response, args);
   }
 
-  @ApiOperation("上传文件")
+  @OperationLog
+  @ApiOperation("上传文件到OSS")
   @PostMapping(value = "/uploadFile")
   @PreAuthorize("@el.check('storage:add')")
   public ResponseEntity<String> uploadFile(@RequestParam("file") MultipartFile file) {
@@ -72,9 +73,10 @@ public class SystemOssStorageController {
     return ResponseEntity.ok(fileUrl);
   }
 
-  @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
-  public ResponseEntity<Void> removeFileByIds(@RequestBody Long[] ids) {
+  @OperationLog
+  @ApiOperation("从OSS删除文件")
+  @PostMapping(value = "/deleteFileByIds")
+  public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     systemOssStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
index 48a136f6..bcd586d9 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
@@ -19,8 +19,10 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
-import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemQuartzJobService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -35,7 +37,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,46 +51,49 @@ public class SystemQuartzJobController {
   private SystemQuartzJobService systemQuartzJobService;
 
   @ApiOperation("查询定时任务")
-  @PostMapping
+  @PostMapping(value = "/searchQuartzJob")
   @PreAuthorize("@el.check('quartzJob:list')")
-  public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
     Page<SystemQuartzJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出任务数据")
+  @OperationLog
+  @ApiOperation("导出定时任务数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('quartzJob:list')")
   public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     systemQuartzJobService.exportQuartzJobXlsx(response, args);
   }
 
-  @ApiOperation("导出日志数据")
+  @OperationLog
+  @ApiOperation("导出定时任务日志数据")
   @GetMapping(value = "/logs/download")
   @PreAuthorize("@el.check('quartzJob:list')")
   public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     systemQuartzJobService.exportQuartzLogXlsx(response, args);
   }
 
-  @ApiOperation("查询任务执行日志")
-  @PostMapping(value = "/logs")
+  @ApiOperation("查询定时任务执行日志")
+  @PostMapping(value = "/searchQuartzLog")
   @PreAuthorize("@el.check('quartzJob:list')")
   public ResponseEntity<KitPageResult<SystemQuartzLogTb>> queryQuartzJobLog(SystemQueryQuartzJobArgs args) {
     Page<SystemQuartzLogTb> page = new Page<>(args.getPage(), args.getSize());
     return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page));
   }
 
+  @OperationLog
   @ApiOperation("新增定时任务")
   @PostMapping(value = "/createQuartzJob")
   @PreAuthorize("@el.check('quartzJob:add')")
-  public ResponseEntity<Void> createQuartzJob(@Validated @RequestBody SystemQuartzJobTb args) {
+  public ResponseEntity<Void> createQuartzJob(@Validated @RequestBody SystemQuartzJobVo args) {
     systemQuartzJobService.createJob(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改定时任务")
-  @PutMapping
+  @PostMapping(value = "/updateQuartzJobResumeCron")
   @PreAuthorize("@el.check('quartzJob:edit')")
   public ResponseEntity<Void> updateQuartzJob(
       @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) {
@@ -97,6 +101,7 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("更改定时任务状态")
   @PostMapping(value = "/switchQuartzJobStatus/{id}")
   @PreAuthorize("@el.check('quartzJob:edit')")
@@ -105,6 +110,7 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("执行定时任务")
   @PostMapping(value = "/startQuartzJob/{id}")
   @PreAuthorize("@el.check('quartzJob:edit')")
@@ -113,10 +119,11 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除定时任务")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('quartzJob:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemQuartzJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
index 36550e40..d246df5f 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
@@ -19,14 +19,14 @@ import cn.hutool.core.lang.Dict;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemCreateRoleArgs;
-import cn.odboy.system.dal.model.SystemQueryRoleArgs;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.request.SystemCreateRoleArgs;
+import cn.odboy.system.dal.model.request.SystemQueryRoleArgs;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemRoleService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import jakarta.servlet.http.HttpServletResponse;
@@ -49,28 +49,28 @@ public class SystemRoleController {
   private SystemRoleService systemRoleService;
 
   @ApiOperation("获取单个role")
-  @PostMapping(value = "/queryRoleById")
+  @PostMapping(value = "/getRoleById")
   @PreAuthorize("@el.check('roles:list')")
-  public ResponseEntity<SystemRoleVo> queryRoleById(@RequestBody SystemRoleTb args) {
+  public ResponseEntity<SystemRoleVo> getRoleById(@RequestBody SystemRoleTb args) {
     return ResponseEntity.ok(systemRoleService.getRoleById(args.getId()));
   }
 
   @ApiOperation("导出角色数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('role:list')")
-  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException {
+  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) {
     systemRoleService.exportRoleXlsx(response, args);
   }
 
   @ApiOperation("返回全部的角色")
-  @PostMapping(value = "/queryRoleList")
+  @PostMapping(value = "/listAllRole")
   @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
-  public ResponseEntity<List<SystemRoleTb>> queryRoleList() {
+  public ResponseEntity<List<SystemRoleTb>> listAllRole() {
     return ResponseEntity.ok(systemRoleService.listAllRole());
   }
 
   @ApiOperation("查询角色")
-  @PostMapping
+  @PostMapping(value = "/searchRole")
   @PreAuthorize("@el.check('roles:list')")
   public ResponseEntity<KitPageResult<SystemRoleVo>> queryRoleByArgs(
       @Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> pageArgs) {
@@ -79,11 +79,12 @@ public class SystemRoleController {
   }
 
   @ApiOperation("获取用户级别")
-  @PostMapping(value = "/queryRoleLevel")
-  public ResponseEntity<Dict> queryRoleLevel() {
-    return ResponseEntity.ok(systemRoleService.getRoleLevel());
+  @PostMapping(value = "/getCurrentUserRoleLevel")
+  public ResponseEntity<Dict> getCurrentUserRoleLevel() {
+    return ResponseEntity.ok(systemRoleService.getCurrentUserRoleLevel());
   }
 
+  @OperationLog
   @ApiOperation("新增角色")
   @PostMapping(value = "/saveRole")
   @PreAuthorize("@el.check('roles:add')")
@@ -92,26 +93,29 @@ public class SystemRoleController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改角色")
-  @PostMapping(value = "/modifyRoleById")
+  @PostMapping(value = "/updateRoleById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
     systemRoleService.updateRoleById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改角色菜单")
-  @PostMapping(value = "/modifyBindMenuById")
+  @PostMapping(value = "/updateBindMenuById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyBindMenuById(@RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateBindMenuById(@RequestBody SystemRoleVo args) {
     systemRoleService.updateBindMenuById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除角色")
-  @PostMapping(value = "/removeRoleByIds")
+  @PostMapping(value = "/deleteRoleByIds")
   @PreAuthorize("@el.check('roles:del')")
-  public ResponseEntity<Void> removeRoleByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteRoleByIds(@RequestBody Set<Long> ids) {
     systemRoleService.deleteRoleByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
index 08a33d70..aa1358c9 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
@@ -19,10 +19,13 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.base.KitSelectOptionVo;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemQueryUserArgs;
-import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.system.service.SystemAuthService;
 import cn.odboy.system.service.SystemUserService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -50,8 +53,10 @@ public class SystemUserController {
 
   @Autowired
   private SystemUserService systemUserService;
+  @Autowired
+  private SystemAuthService systemAuthService;
 
-
+  @OperationLog
   @ApiOperation("导出用户数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('user:list')")
@@ -60,7 +65,7 @@ public class SystemUserController {
   }
 
   @ApiOperation("查询用户")
-  @PostMapping
+  @PostMapping(value = "/aggregationSearchUser")
   @PreAuthorize("@el.check('user:list')")
   public ResponseEntity<KitPageResult<SystemUserVo>> queryUserByArgs(@Validated @RequestBody KitPageArgs<SystemQueryUserArgs> pageArgs) {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
@@ -68,6 +73,7 @@ public class SystemUserController {
     return ResponseEntity.ok(systemUserService.aggregationSearchUserByArgs(page, pageArgs.getArgs(), currentUsername));
   }
 
+  @OperationLog
   @ApiOperation("新增用户")
   @PostMapping(value = "/saveUser")
   @PreAuthorize("@el.check('user:add')")
@@ -76,53 +82,60 @@ public class SystemUserController {
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改用户")
-  @PostMapping(value = "/modifyUserById")
+  @OperationLog
+  @ApiOperation("修改用户数据")
+  @PostMapping(value = "/updateUserById")
   @PreAuthorize("@el.check('user:edit')")
-  public ResponseEntity<Object> modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
+  public ResponseEntity<Object> updateUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
     systemUserService.updateUserById(args);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改用户：个人中心")
-  @PostMapping(value = "modifyUserCenterInfoById")
-  public ResponseEntity<Object> modifyUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
+  @OperationLog
+  @ApiOperation("修改个人中心信息")
+  @PostMapping(value = "/updateUserCenterInfoById")
+  public ResponseEntity<Object> updateUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
     systemUserService.updateUserCenterInfoById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除用户")
-  @PostMapping(value = "/removeUserByIds")
+  @PostMapping(value = "/deleteUserByIds")
   @PreAuthorize("@el.check('user:del')")
-  public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
-    systemUserService.removeUserByIds(ids);
+  public ResponseEntity<Object> deleteUserByIds(@RequestBody Set<Long> ids) {
+    systemUserService.deleteUserByIds(ids);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改密码")
-  @PostMapping(value = "/modifyUserPasswordByUsername")
-  public ResponseEntity<Object> modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
+  @OperationLog
+  @ApiOperation("修改用户密码")
+  @PostMapping(value = "/updateUserPasswordByUsername")
+  public ResponseEntity<Object> updateUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserPasswordByUsername(currentUsername, passVo);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("重置密码")
+  @OperationLog
+  @ApiOperation("重置用户密码")
   @PostMapping(value = "/resetUserPasswordByIds")
   public ResponseEntity<Object> resetUserPasswordByIds(@RequestBody Set<Long> ids) {
     systemUserService.resetUserPasswordByIds(ids);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改头像")
-  @PostMapping(value = "/modifyUserAvatar")
-  public ResponseEntity<Object> modifyUserAvatar(@RequestParam MultipartFile avatar) {
+  @OperationLog
+  @ApiOperation("修改用户头像")
+  @PostMapping(value = "/updateUserAvatar")
+  public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar) {
     return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar));
   }
 
-  @ApiOperation("修改邮箱")
-  @PostMapping(value = "/modifyUserEmailByUsername/{code}")
-  public ResponseEntity<Object> modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
+  @OperationLog
+  @ApiOperation("修改用户邮箱")
+  @PostMapping(value = "/updateUserEmailByUsername/{code}")
+  public ResponseEntity<Object> updateUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserEmailByUsername(currentUsername, args, code);
     return ResponseEntity.ok(null);
@@ -135,4 +148,11 @@ public class SystemUserController {
     List<KitSelectOptionVo> collect = systemUserService.queryUserMetadataOptions(args);
     return ResponseEntity.ok(collect);
   }
+
+  @ApiOperation("获取用户信息")
+  @PostMapping(value = "/getCurrentUserInfo")
+  public ResponseEntity<SystemUserJwtVo> getUserInfo() {
+    SystemUserJwtVo userInfoVo = systemAuthService.getCurrentUserInfo();
+    return ResponseEntity.ok(userInfoVo);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
index 40ce9625..873aa146 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
@@ -16,17 +16,13 @@
 package cn.odboy.system.dal.dataobject;
 
 import cn.odboy.base.KitBaseUserTimeTb;
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -39,14 +35,6 @@ public class SystemDeptTb extends KitBaseUserTimeTb {
   @TableId(value = "dept_id", type = IdType.AUTO)
   @ApiModelProperty(value = "ID", hidden = true)
   private Long id;
-  @TableField(exist = false)
-  @JSONField(serialize = false)
-  @ApiModelProperty(value = "角色")
-  private Set<SystemRoleTb>
-      roles;
-  @TableField(exist = false)
-  @ApiModelProperty(value = "子部门")
-  private List<SystemDeptTb> children;
   @ApiModelProperty(value = "排序")
   private Integer deptSort;
   @NotBlank
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
index 9a38ba8c..70f57a9b 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemJobTb.java
@@ -20,9 +20,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
index ee0d7011..92c19c3b 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
@@ -15,9 +15,8 @@
  */
 package cn.odboy.system.dal.dataobject;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -49,6 +48,6 @@ public class SystemLocalStorageTb extends KitBaseUserTimeTb {
   private String dateGroup;
 
   public void copy(SystemLocalStorageTb source) {
-    BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    KitBeanUtil.copyToTarget(source, this);
   }
 }
\ No newline at end of file
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
index 72fad6e2..0a9f3aa3 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
@@ -16,16 +16,13 @@
 package cn.odboy.system.dal.dataobject;
 
 import cn.odboy.base.KitBaseUserTimeTb;
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
-import jakarta.validation.constraints.NotNull;
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -38,12 +35,6 @@ public class SystemMenuTb extends KitBaseUserTimeTb {
   @TableId(value = "menu_id", type = IdType.AUTO)
   @ApiModelProperty(value = "ID", hidden = true)
   private Long id;
-  @TableField(exist = false)
-  @JSONField(serialize = false)
-  @ApiModelProperty(value = "菜单角色")
-  private Set<SystemRoleTb> roles;
-  @TableField(exist = false)
-  private List<SystemMenuTb> children;
   @ApiModelProperty(value = "菜单标题")
   private String title;
   @TableField(value = "name")
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
index 6e46522a..7df2e25e 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
@@ -36,9 +36,6 @@ public class SystemQuartzJobTb extends KitBaseUserTimeTb {
   @TableId(value = "id", type = IdType.AUTO)
   @NotNull(groups = {Update.class})
   private Long id;
-  @TableField(exist = false)
-  @ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
-  private String uuid;
   @ApiModelProperty(value = "定时器名称")
   private String jobName;
   @NotBlank
@@ -65,6 +62,5 @@ public class SystemQuartzJobTb extends KitBaseUserTimeTb {
   @NotBlank
   @ApiModelProperty(value = "备注")
   @TableField(updateStrategy = FieldStrategy.ALWAYS)
-  private String
-      description;
+  private String description;
 }
\ No newline at end of file
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
index cfe43e10..8372251a 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
@@ -23,9 +23,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -45,8 +45,7 @@ public class SystemRoleTb extends KitBaseUserTimeTb {
   @ApiModelProperty(value = "名称", hidden = true)
   private String name;
   @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义")
-  private String dataScope =
-      SystemDataScopeEnum.THIS_LEVEL.getValue();
+  private String dataScope = SystemDataScopeEnum.THIS_LEVEL.getValue();
   @ApiModelProperty(value = "级别，数值越小，级别越大")
   private Integer level = 3;
   @ApiModelProperty(value = "描述")
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
index 2c484bba..0928b5f4 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
@@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Objects;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -41,9 +41,6 @@ public class SystemUserTb extends KitBaseUserTimeTb {
   @TableField(value = "dept_id")
   @ApiModelProperty(hidden = true)
   private Long deptId;
-  @ApiModelProperty(value = "用户部门")
-  @TableField(exist = false)
-  private SystemDeptTb dept;
   @NotBlank
   @ApiModelProperty(value = "用户名称")
   private String username;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java
deleted file mode 100644
index c9b02b36..00000000
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemOssStorageVo extends SystemOssStorageTb {
-
-  private String fileSizeDesc;
-}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java
deleted file mode 100644
index 90e2d2ca..00000000
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemRoleVo extends SystemRoleTb {
-
-  @ApiModelProperty(value = "用户", hidden = true)
-  private Set<SystemUserTb> users;
-  @ApiModelProperty(value = "菜单", hidden = true)
-  private Set<SystemMenuTb> menus;
-  @ApiModelProperty(value = "部门", hidden = true)
-  private Set<SystemDeptTb> depts;
-}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java
deleted file mode 100644
index b5463eea..00000000
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemUserVo extends SystemUserTb {
-
-  @ApiModelProperty(value = "用户角色")
-  private Set<SystemRoleTb> roles;
-  @ApiModelProperty(value = "用户岗位")
-  private Set<SystemJobTb> jobs;
-}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
similarity index 90%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
index c61b6a5e..02a9da71 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
similarity index 92%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
index c91c290c..0cd7ff7d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
similarity index 90%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
index 64bce6e2..d4e6f2cd 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
index 9554c3b9..5148a50e 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
index e23f61de..21c2f4e2 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
index a196dc95..da9d765d 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
index e7d622f1..1f35df7e 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
index d78de3c1..de272d53 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
similarity index 91%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
index b8c95352..549ff2e8 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
index 9bbd2def..cb91d952 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
similarity index 92%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
index e85c86c4..15c386c0 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
index a5304b3c..b5d776b1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
index c9f7b1ce..48f2b339 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
index 5f0b51c1..545425df 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
index 42489afa..99eeb7c7 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
index 91f1a908..3a162e65 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
index d32fa14d..4a8f6496 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
index ebf9b33a..008cc29a 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
index 7dcedb88..e47babbc 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
index 8514fe81..d05f55de 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
index 9a5c0f31..53e393bc 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
index 3794be08..f7a45ff9 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java
new file mode 100644
index 00000000..2d26cc23
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java
@@ -0,0 +1,11 @@
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemQueryOperationLogArgs extends KitObject {
+
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
index 86a6d78b..88ee8d81 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
index 49841012..a08f9acd 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
index 4dad3f32..4e524e5d 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
similarity index 97%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
index cce81cc7..f74843f3 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
index 57af4839..3069250f 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.List;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
index 93cbb2ea..c568980c 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import cn.odboy.base.KitObject;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
index 5dabd94c..d8284b75 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
index e0ce1fb8..1b629817 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.request;
 
 import io.swagger.annotations.ApiModelProperty;
 import jakarta.validation.constraints.NotBlank;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java
new file mode 100644
index 00000000..9024d26e
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java
@@ -0,0 +1,16 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 登录成功后：token 与 用户信息
+ */
+@Getter
+@Setter
+public class SystemAuthVo extends KitObject {
+
+  private String token;
+  private SystemUserInfoVo user;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java
new file mode 100644
index 00000000..6f6dc84a
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java
@@ -0,0 +1,22 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 验证码信息
+ */
+@Getter
+@Setter
+public class SystemCaptchaVo extends KitObject {
+
+  /**
+   * redis key
+   */
+  private String uuid;
+  /**
+   * image base64
+   */
+  private String img;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java
new file mode 100644
index 00000000..ae6dba88
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java
@@ -0,0 +1,68 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemDeptVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "排序")
+  private Integer deptSort;
+  @ApiModelProperty(value = "部门名称")
+  private String name;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "上级部门")
+  private Long pid;
+  @ApiModelProperty(value = "子节点数目", hidden = true)
+  private Integer subCount = 0;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemDeptVo dept = (SystemDeptVo) o;
+    return Objects.equals(id, dept.id) && Objects.equals(name, dept.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @ApiModelProperty(value = "是否有子节点")
+  public Boolean getHasChildren() {
+    return subCount > 0;
+  }
+
+  @ApiModelProperty(value = "是否为叶子")
+  public Boolean getLeaf() {
+    return subCount <= 0;
+  }
+
+  @ApiModelProperty(value = "标签名称")
+  public String getLabel() {
+    return name;
+  }
+
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "子部门")
+  private List<SystemDeptVo> children;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
similarity index 61%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
index 4a64efa3..45fdb903 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
-import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
+import cn.odboy.base.KitBaseUserTimeTb;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -23,8 +23,21 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class SystemDictDetailVo extends SystemDictDetailTb {
+public class SystemDictDetailVo extends KitBaseUserTimeTb {
 
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(hidden = true)
+  private Long dictId;
+  @ApiModelProperty(value = "字典标签")
+  private String label;
+  @ApiModelProperty(value = "字典值")
+  private String value;
+  @ApiModelProperty(value = "排序")
+  private Integer dictSort = 999;
+  /**
+   * 扩展字段
+   */
   @ApiModelProperty(value = "字典")
   private SystemDictTb dict;
 }
\ No newline at end of file
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
index a0ae90a6..a49bd485 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
similarity index 90%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
index 75c33b9e..d98c65ff 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import io.swagger.annotations.ApiModelProperty;
@@ -26,7 +26,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SystemMenuVo extends KitObject {
+public class SystemMenuRouterVo extends KitObject {
 
   @ApiModelProperty(value = "菜单名称")
   private String name;
@@ -43,5 +43,5 @@ public class SystemMenuVo extends KitObject {
   @ApiModelProperty(value = "元数据")
   private SystemMenuMetaVo meta;
   @ApiModelProperty(value = "子路由")
-  private List<SystemMenuVo> children;
+  private List<SystemMenuRouterVo> children;
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java
new file mode 100644
index 00000000..597a02af
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java
@@ -0,0 +1,84 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemMenuVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "菜单标题")
+  private String title;
+  @ApiModelProperty(value = "菜单组件名称")
+  private String componentName;
+  @ApiModelProperty(value = "排序")
+  private Integer menuSort = 999;
+  @ApiModelProperty(value = "组件路径")
+  private String component;
+  @ApiModelProperty(value = "路由地址")
+  private String path;
+  @ApiModelProperty(value = "菜单类型，目录、菜单、按钮")
+  private Integer type;
+  @ApiModelProperty(value = "权限标识")
+  private String permission;
+  @ApiModelProperty(value = "菜单图标")
+  private String icon;
+  @ApiModelProperty(value = "缓存")
+  private Boolean cache;
+  @ApiModelProperty(value = "是否隐藏")
+  private Boolean hidden;
+  @ApiModelProperty(value = "上级菜单")
+  private Long pid;
+  @ApiModelProperty(value = "子节点数目", hidden = true)
+  private Integer subCount = 0;
+  @ApiModelProperty(value = "外链菜单")
+  private Boolean iFrame;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemMenuVo menu = (SystemMenuVo) o;
+    return Objects.equals(id, menu.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+
+  @ApiModelProperty(value = "是否有子节点")
+  public Boolean getHasChildren() {
+    return subCount > 0;
+  }
+
+  @ApiModelProperty(value = "是否为叶子")
+  public Boolean getLeaf() {
+    return subCount <= 0;
+  }
+
+  @ApiModelProperty(value = "标签名称")
+  public String getLabel() {
+    return title;
+  }
+
+  /**
+   * 附加属性
+   */
+  @ApiModelProperty(value = "菜单角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "子菜单")
+  private List<SystemMenuVo> children;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java
new file mode 100644
index 00000000..503cfddf
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemOssStorageVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty("ID")
+  private Long id;
+  @ApiModelProperty("类型，比如minio")
+  private String serviceType;
+  @ApiModelProperty("服务地址")
+  private String endpoint;
+  @ApiModelProperty("存储桶名称")
+  private String bucketName;
+  @ApiModelProperty("完整文件名称")
+  private String fileName;
+  @ApiModelProperty("文件大小, 单位：字节")
+  private Long fileSize;
+  @ApiModelProperty("文件类型")
+  private String fileMime;
+  @ApiModelProperty("短文件名")
+  private String filePrefix;
+  @ApiModelProperty("文件后缀")
+  private String fileSuffix;
+  @ApiModelProperty("文件md5")
+  private String fileMd5;
+  @ApiModelProperty("文件链接")
+  private String fileUrl;
+  @ApiModelProperty("文件编码")
+  private String fileCode;
+  @ApiModelProperty("对象路径")
+  private String objectName;
+  /**
+   * 扩展字段
+   */
+  private String fileSizeDesc;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
index b6914b56..91527bee 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import java.util.List;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
index dcc3713b..e358907b 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import lombok.Getter;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java
new file mode 100644
index 00000000..caf2e513
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java
@@ -0,0 +1,39 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemQuartzJobVo extends KitBaseUserTimeTb {
+  private Long id;
+  @ApiModelProperty(value = "定时器名称")
+  private String jobName;
+  @ApiModelProperty(value = "Bean名称")
+  private String beanName;
+  @ApiModelProperty(value = "方法名称")
+  private String methodName;
+  @ApiModelProperty(value = "参数")
+  private String params;
+  @ApiModelProperty(value = "cron表达式")
+  private String cronExpression;
+  @ApiModelProperty(value = "状态：暂停或启动")
+  private Boolean isPause = false;
+  @ApiModelProperty(value = "负责人")
+  private String personInCharge;
+  @ApiModelProperty(value = "报警邮箱")
+  private String email;
+  @ApiModelProperty(value = "子任务")
+  private String subTask;
+  @ApiModelProperty(value = "失败后暂停")
+  private Boolean pauseAfterFailure;
+  @ApiModelProperty(value = "备注")
+  private String description;
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
+  private String uuid;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
similarity index 95%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
index ebb0d609..2fb55924 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java
new file mode 100644
index 00000000..88a34ce2
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java
@@ -0,0 +1,55 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.constant.SystemDataScopeEnum;
+import cn.odboy.system.dal.dataobject.SystemDeptTb;
+import cn.odboy.system.dal.dataobject.SystemUserTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemRoleVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "名称", hidden = true)
+  private String name;
+  @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义")
+  private String dataScope = SystemDataScopeEnum.THIS_LEVEL.getValue();
+  @ApiModelProperty(value = "级别，数值越小，级别越大")
+  private Integer level = 3;
+  @ApiModelProperty(value = "描述")
+  private String description;
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用户", hidden = true)
+  private Set<SystemUserTb> users;
+  @ApiModelProperty(value = "菜单", hidden = true)
+  private Set<SystemMenuVo> menus;
+  @ApiModelProperty(value = "部门", hidden = true)
+  private Set<SystemDeptTb> depts;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemRoleVo role = (SystemRoleVo) o;
+    return Objects.equals(id, role.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+
+
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
similarity index 94%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
index 0fa39e00..fd60f0c1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Set;
 import lombok.Data;
@@ -36,7 +35,6 @@ public class SystemSimpleUserVo extends KitObject {
   @ApiModelProperty(value = "用户岗位")
   private Set<SystemJobTb> jobs;
   private Long deptId;
-  @TableField(exist = false)
   private SystemDeptTb dept;
   @ApiModelProperty(value = "用户名称")
   private String username;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
index 7de0b8dc..1d435bc4 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import cn.odboy.base.KitObject;
 import java.util.List;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
similarity index 97%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
index 53d69c63..9d47f2ef 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
similarity index 96%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java
rename to cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
index 8944c354..90d0ad67 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java
new file mode 100644
index 00000000..12559de4
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java
@@ -0,0 +1,71 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.system.dal.dataobject.SystemJobTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import cn.odboy.system.dal.dataobject.SystemUserTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemUserVo extends SystemUserTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(hidden = true)
+  private Long deptId;
+  @ApiModelProperty(value = "用户名称")
+  private String username;
+  @ApiModelProperty(value = "用户昵称")
+  private String nickName;
+  @ApiModelProperty(value = "邮箱")
+  private String email;
+  @ApiModelProperty(value = "电话号码")
+  private String phone;
+  @ApiModelProperty(value = "用户性别")
+  private String gender;
+  @ApiModelProperty(value = "头像真实名称", hidden = true)
+  private String avatarName;
+  @ApiModelProperty(value = "头像存储的路径", hidden = true)
+  private String avatarPath;
+  @ApiModelProperty(value = "密码")
+  private String password;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "是否为admin账号", hidden = true)
+  private Boolean isAdmin = false;
+  @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+  private Date pwdResetTime;
+
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用户部门")
+  private SystemDeptVo dept;
+  @ApiModelProperty(value = "用户角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "用户岗位")
+  private Set<SystemJobTb> jobs;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemUserVo user = (SystemUserVo) o;
+    return Objects.equals(id, user.id) && Objects.equals(username, user.username);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username);
+  }
+
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
index b8916b24..255f4607 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
@@ -16,7 +16,7 @@
 package cn.odboy.system.dal.mysql;
 
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
index 333270ea..c420ffe1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
@@ -16,6 +16,8 @@
 package cn.odboy.system.dal.mysql;
 
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -27,4 +29,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SystemQuartzJobMapper extends BaseMapper<SystemQuartzJobTb> {
 
+  default SystemQuartzJobVo selectVoById(String id) {
+    return KitBeanUtil.copyToClass(selectById(id), SystemQuartzJobVo.class);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
index aea97b10..ccb32148 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
@@ -3,7 +3,7 @@ package cn.odboy.system.dal.redis;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
index f4bc0676..f172386c 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
@@ -1,27 +1,24 @@
 package cn.odboy.system.dal.redis;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitBrowserUtil;
 import cn.odboy.util.KitDesEncryptUtil;
-import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitIPUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import jakarta.servlet.http.HttpServletRequest;
@@ -81,28 +78,28 @@ public class SystemUserOnlineInfoDAO {
     redisHelper.del(loginKey);
   }
 
-  /**
-   * 导出
-   *
-   * @param all      /
-   * @param response /
-   * @throws IOException /
-   */
-  public void downloadUserOnlineModelExcel(List<SystemUserOnlineVo> all, HttpServletResponse response)
-      throws IOException {
-    List<Map<String, Object>> list = new ArrayList<>();
-    for (SystemUserOnlineVo user : all) {
-      Map<String, Object> map = new LinkedHashMap<>();
-      map.put("用户名", user.getUserName());
-      map.put("部门", user.getDept());
-      map.put("登录IP", user.getIp());
-      map.put("登录地点", user.getAddress());
-      map.put("浏览器", user.getBrowser());
-      map.put("登录日期", user.getLoginTime());
-      list.add(map);
-    }
-    KitFileUtil.downloadExcel(list, response);
-  }
+//  /**
+//   * 导出
+//   *
+//   * @param all      /
+//   * @param response /
+//   * @throws IOException /
+//   */
+//  public void downloadUserOnlineModelExcel(List<SystemUserOnlineVo> all, HttpServletResponse response)
+//      throws IOException {
+//    List<Map<String, Object>> list = new ArrayList<>();
+//    for (SystemUserOnlineVo user : all) {
+//      Map<String, Object> map = new LinkedHashMap<>();
+//      map.put("用户名", user.getUserName());
+//      map.put("部门", user.getDept());
+//      map.put("登录IP", user.getIp());
+//      map.put("登录地点", user.getAddress());
+//      map.put("浏览器", user.getBrowser());
+//      map.put("登录日期", user.getLoginTime());
+//      list.add(map);
+//    }
+//    KitFileUtil.downloadExcel(list, response);
+//  }
 
   /**
    * 根据用户名强退用户
@@ -121,7 +118,7 @@ public class SystemUserOnlineInfoDAO {
    * @param pageable /
    * @return /
    */
-  public KitPageResult<SystemUserOnlineVo> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo,
+  public KitPageResult<SystemUserOnlineVo> searchOnlineUser(SystemUserOnlineVo onlineVo,
       IPage<SystemUserOnlineVo> pageable) {
     String username = null;
     if (onlineVo != null) {
@@ -171,9 +168,7 @@ public class SystemUserOnlineInfoDAO {
 
   public void exportOnlineUserXlsx(HttpServletResponse response, String username) {
     List<SystemUserOnlineVo> userOnlineVos = this.queryUserOnlineModelListByUsername(username);
-//    KitXlsxExportUtil.exportFile(response, "在线用户数据", userOnlineVos, SystemUserOnlineExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemUserOnlineExportRowVo.class)));
-    List<SystemUserOnlineVo> rowVos = BeanUtil.copyToList(userOnlineVos, SystemUserOnlineVo.class);
-    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineVo.class, rowVos);
+    List<SystemUserOnlineExportRowVo> rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineExportRowVo.class);
+    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineExportRowVo.class, rowVos);
   }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java
index c4d5c807..037f8b47 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLock.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.bizlock;
 
 import java.lang.annotation.Documented;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
index 1f5ccff4..9805d137 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.bizlock;
 
 import cn.odboy.framework.exception.BadRequestException;
@@ -63,14 +62,11 @@ public class BizLockAspect {
       return String.format("%s:%s", bizLock.bizName(),
           ((MethodSignature) joinPoint.getSignature()).getMethod().getName());
     }
-
     // 解析SpEL表达式
     MethodSignature signature = (MethodSignature) joinPoint.getSignature();
     Method method = signature.getMethod();
-
     // 创建SpEL上下文
     StandardEvaluationContext context = new StandardEvaluationContext();
-
     // 设置方法参数
     String[] parameterNames = signature.getParameterNames();
     Object[] args = joinPoint.getArgs();
@@ -79,15 +75,12 @@ public class BizLockAspect {
       // 支持#p0,#p1格式
       context.setVariable("p" + i, args[i]);
     }
-
     // 设置方法相关信息
     context.setVariable("methodName", method.getName());
     context.setVariable("targetClass", joinPoint.getTarget().getClass().getName());
-
     // 解析表达式
     Expression expression = parser.parseExpression(bizLock.key());
     String value = expression.getValue(context, String.class);
-
     // 组合最终的key: bizName:解析后的key
     return String.format("%s:%s", bizLock.bizName(), value);
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java
index 25fb887a..a7486382 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLog.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.operalog;
 
 import java.lang.annotation.Documented;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
index 05fc3df8..0f7b91b2 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.operalog;
 
 import cn.hutool.core.date.TimeInterval;
 import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.context.KitRequestHolder;
 import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
@@ -26,7 +26,7 @@ import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.util.KitBrowserUtil;
 import cn.odboy.util.KitIPUtil;
 import com.alibaba.fastjson2.JSON;
-import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.annotations.ApiOperation;
 import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import lombok.extern.slf4j.Slf4j;
@@ -60,8 +60,9 @@ public class OperationLogAspect {
     TimeInterval timeInterval = new TimeInterval();
     try {
       Object result = joinPoint.proceed();
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      Thread.startVirtualThread(() -> {
+      long interval = timeInterval.interval();
+      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
+      ThreadUtil.execAsync(() -> {
         try {
           systemOperationLogMapper.insert(record);
         } catch (Exception e) {
@@ -70,9 +71,10 @@ public class OperationLogAspect {
       });
       return result;
     } catch (Throwable exception) {
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
+      long interval = timeInterval.interval();
+      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
       record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
-      Thread.startVirtualThread(() -> {
+      ThreadUtil.execAsync(() -> {
         try {
           systemOperationLogMapper.insert(record);
         } catch (Exception e) {
@@ -83,20 +85,18 @@ public class OperationLogAspect {
     }
   }
 
-  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
-      TimeInterval timeInterval) {
-    long executeTime = timeInterval.intervalMs();
+  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, long executeTime) {
     MethodSignature signature = (MethodSignature) joinPoint.getSignature();
     String bizName = annotation.bizName();
     if (StrUtil.isBlank(bizName)) {
       Method method = signature.getMethod();
-      Operation apiOperation = method.getAnnotation(Operation.class);
+      ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
       if (apiOperation != null) {
-        bizName = apiOperation.summary();
+        bizName = apiOperation.value();
       }
     }
     if (StrUtil.isBlank(bizName)) {
-      bizName = "默认业务";
+      bizName = "Default";
     }
     String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
     Object[] args = joinPoint.getArgs();
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java
deleted file mode 100644
index f5327ab0..00000000
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright 2021-2025 Odboy
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package cn.odboy.system.framework.operalog.annotaions;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 捕捉操作日志
- *
- * @author odboy
- * @date 2025-05-12
- */
-@Inherited
-@Documented
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface OperationLog {
-
-  String bizName() default "";
-}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java
deleted file mode 100644
index 122052ff..00000000
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- *  Copyright 2021-2025 Odboy
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package cn.odboy.system.framework.operalog.core;
-
-import cn.hutool.core.date.TimeInterval;
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.odboy.framework.context.KitRequestHolder;
-import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
-import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
-import cn.odboy.system.framework.operalog.annotaions.OperationLog;
-import cn.odboy.system.framework.permission.core.KitSecurityHelper;
-import cn.odboy.util.KitBrowserUtil;
-import cn.odboy.util.KitIPUtil;
-import com.alibaba.fastjson2.JSON;
-import io.swagger.v3.oas.annotations.Operation;
-import jakarta.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 捕捉操作日志
- *
- * @author odboy
- * @date 2025-05-12
- */
-@Slf4j
-@Aspect
-@Component
-public class SystemOperationLogAspect {
-
-  @Autowired
-  private SystemOperationLogMapper systemOperationLogMapper;
-
-  @Around("@annotation(operationLog)")
-  public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
-    return handleLog(joinPoint, operationLog);
-  }
-
-  private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
-    TimeInterval timeInterval = new TimeInterval();
-    try {
-      Object result = joinPoint.proceed();
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      Thread.startVirtualThread(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          //                    log.error("保存审计日志失败", e);
-          // 忽略
-        }
-      });
-      return result;
-    } catch (Throwable exception) {
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
-      Thread.startVirtualThread(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          //                    log.error("保存审计日志失败", e);
-          // 忽略
-        }
-      });
-      throw exception;
-    }
-  }
-
-  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
-      TimeInterval timeInterval) {
-    long executeTime = timeInterval.intervalMs();
-    MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-    String bizName = annotation.bizName();
-    if (StrUtil.isBlank(bizName)) {
-      Method method = signature.getMethod();
-      Operation apiOperation = method.getAnnotation(Operation.class);
-      if (apiOperation != null) {
-        bizName = apiOperation.summary();
-      }
-    }
-    if (StrUtil.isBlank(bizName)) {
-      bizName = "默认业务";
-    }
-    String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-    Object[] args = joinPoint.getArgs();
-    String params = JSON.toJSONString(args);
-    HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
-    String requestIp = KitBrowserUtil.getIp(request);
-    String browserInfo = KitBrowserUtil.getVersion(request);
-    String address = KitIPUtil.getCityInfo(requestIp);
-    String username = KitSecurityHelper.getCurrentUsername();
-    SystemOperationLogTb record = new SystemOperationLogTb();
-    record.setBizName(bizName);
-    record.setMethod(method);
-    record.setParams(params);
-    record.setRequestIp(requestIp);
-    record.setExecuteTime(executeTime);
-    record.setUsername(username);
-    record.setAddress(address);
-    record.setBrowserInfo(browserInfo);
-    return record;
-  }
-}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
index da535aa6..b3081541 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
@@ -93,8 +93,8 @@ public class SpringSecurityConfig {
         .sessionManagement(
             sessionManagement -> sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
         .authorizeHttpRequests(authorizeRequests -> authorizeRequests
-            // 静态资源等等
-            .requestMatchers(HttpMethod.GET, "*.html", "*.css", "*.js", "/websocket/**").permitAll()
+            // 静态资源等
+            .requestMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/websocket/**").permitAll()
             // Knife4j 和 OpenAPI 相关路径
             .requestMatchers("/doc.html", "/webjars/**", "/v3/api-docs", "/v3/api-docs/**", "/swagger-resources",
                 "/swagger-resources/**", "/configuration/ui", "/configuration/security").permitAll()
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
index 4dfeeb41..629cf88a 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
@@ -18,7 +18,7 @@ package cn.odboy.system.framework.permission.core.handler;
 
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.constant.SystemConst;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
index a02ed79c..c713c8c4 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
@@ -22,7 +22,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.odboy.constant.SystemConst;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import cn.odboy.system.dal.redis.SystemCacheKey;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtParser;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
index d7519022..a32d1c94 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
@@ -16,9 +16,9 @@
 package cn.odboy.system.framework.permission.core.handler;
 
 import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.system.dal.model.SystemRoleCodeVo;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemRoleCodeVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.redis.SystemUserInfoDAO;
 import cn.odboy.system.service.SystemDataService;
 import cn.odboy.system.service.SystemRoleService;
@@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
 
 /**
- * TODO 通过用户名判断用户信息，并获取拥有的权限与部门
+ * 通过用户名判断用户信息，并获取拥有的权限与部门
  */
 @Slf4j
 @Service("userDetailsService")
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
index 44b8d8fb..5ddc3b19 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.quartz;
 
-import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.service.SystemQuartzJobService;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +40,7 @@ public class ActiveJobRegister implements ApplicationRunner {
    */
   @Override
   public void run(ApplicationArguments applicationArguments) {
-    List<SystemQuartzJobTb> quartzJobs = systemQuartzJobService.listEnableQuartzJob();
+    List<SystemQuartzJobVo> quartzJobs = systemQuartzJobService.listEnableQuartzJob();
     quartzJobs.forEach(quartzManage::addJob);
     log.info("Timing task injection complete");
   }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
index 621aa09d..7aba1d5f 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.quartz;
 
 import cn.hutool.core.exceptions.ExceptionUtil;
@@ -27,7 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
 import cn.odboy.system.service.SystemEmailService;
 import cn.odboy.system.service.SystemQuartzJobService;
@@ -52,14 +52,12 @@ public class ExecutionJobBean extends QuartzJobBean {
   @Override
   public void executeInternal(JobExecutionContext context) {
     // 获取任务
-    SystemQuartzJobTb quartzJob = (SystemQuartzJobTb) context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
+    SystemQuartzJobVo quartzJob = (SystemQuartzJobVo) context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
     // 获取spring bean
     SystemQuartzLogMapper quartzLogMapper = KitSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
     SystemQuartzJobService systemQuartzJobService = KitSpringBeanHolder.getBean(SystemQuartzJobService.class);
     KitRedisHelper redisHelper = KitSpringBeanHolder.getBean(KitRedisHelper.class);
-
     String uuid = quartzJob.getUuid();
-
     SystemQuartzLogTb quartzLog = new SystemQuartzLogTb();
     quartzLog.setJobName(quartzJob.getJobName());
     quartzLog.setBeanName(quartzJob.getBeanName());
@@ -69,8 +67,7 @@ public class ExecutionJobBean extends QuartzJobBean {
     quartzLog.setCronExpression(quartzJob.getCronExpression());
     try {
       // 执行任务
-      QuartzRunnable task =
-          new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams());
+      QuartzRunnable task = new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams());
       Future<?> future = executor.submit(task);
       // 忽略任务执行结果
       future.get();
@@ -117,14 +114,13 @@ public class ExecutionJobBean extends QuartzJobBean {
     }
   }
 
-  private SystemSendEmailArgs taskAlarm(SystemQuartzJobTb quartzJob, String msg) {
+  private SystemSendEmailArgs taskAlarm(SystemQuartzJobVo quartzJob, String msg) {
     SystemSendEmailArgs sendEmailRequest = new SystemSendEmailArgs();
     sendEmailRequest.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！");
     Map<String, Object> data = new HashMap<>(16);
     data.put("task", quartzJob);
     data.put("msg", msg);
-    TemplateEngine engine =
-        TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
+    TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
     Template template = engine.getTemplate("SystemQuartzJobTaskAlarmTemplate.ftl");
     sendEmailRequest.setContent(template.render(data));
     List<String> emails = Arrays.asList(quartzJob.getEmail().split("[,，]"));
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
index 1fc6fe5a..6b80b97d 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy.system.framework.quartz;
 
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
-import jakarta.annotation.Resource;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import java.util.Date;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.CronTrigger;
@@ -40,32 +40,26 @@ import org.springframework.stereotype.Component;
 public class QuartzManage {
 
   private static final String JOB_NAME = "TASK_";
-
   @Resource
   private Scheduler scheduler;
 
-  public void addJob(SystemQuartzJobTb quartzJob) {
+  public void addJob(SystemQuartzJobVo quartzJob) {
     try {
       // 构建job信息
       JobDetail jobDetail =
           JobBuilder.newJob(ExecutionJobBean.class).withIdentity(JOB_NAME + quartzJob.getId()).build();
-
       // 通过触发器名和cron 表达式创建 Trigger
       Trigger trigger = TriggerBuilder.newTrigger().withIdentity(JOB_NAME + quartzJob.getId()).startNow()
           .withSchedule(CronScheduleBuilder.cronSchedule(quartzJob.getCronExpression())).build();
-
       trigger.getJobDataMap().put(SystemQuartzJobTb.JOB_KEY, quartzJob);
-
       // 重置启动时间
       ((CronTriggerImpl) trigger).setStartTime(new Date());
-
       // 执行定时任务，如果是持久化的，这里会报错，捕获输出
       try {
         scheduler.scheduleJob(jobDetail, trigger);
       } catch (ObjectAlreadyExistsException e) {
         log.warn("定时任务已存在，跳过加载");
       }
-
       // 暂停任务
       if (quartzJob.getIsPause()) {
         pauseJob(quartzJob);
@@ -81,7 +75,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void updateJobCron(SystemQuartzJobTb quartzJob) {
+  public void updateJobCron(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -95,7 +89,6 @@ public class QuartzManage {
       // 重置启动时间
       ((CronTriggerImpl) trigger).setStartTime(new Date());
       trigger.getJobDataMap().put(SystemQuartzJobTb.JOB_KEY, quartzJob);
-
       scheduler.rescheduleJob(triggerKey, trigger);
       // 暂停任务
       if (quartzJob.getIsPause()) {
@@ -128,7 +121,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void resumeJob(SystemQuartzJobTb quartzJob) {
+  public void resumeJob(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -149,7 +142,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void runJobNow(SystemQuartzJobTb quartzJob) {
+  public void runJobNow(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -172,7 +165,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void pauseJob(SystemQuartzJobTb quartzJob) {
+  public void pauseJob(SystemQuartzJobVo quartzJob) {
     try {
       JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
       scheduler.pauseJob(jobKey);
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
new file mode 100644
index 00000000..88ef9508
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.openapi;
+
+import cn.odboy.annotation.AnonymousPostMapping;
+import cn.odboy.system.dal.model.response.SystemCaptchaVo;
+import cn.odboy.system.service.SystemCaptchaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/captcha")
+@Api(tags = "系统：验证码管理")
+public class OpenCaptchaController {
+
+  @Autowired
+  private SystemCaptchaService systemCaptchaService;
+
+  @ApiOperation("获取验证码")
+  @AnonymousPostMapping(value = "/getCode")
+  public ResponseEntity<SystemCaptchaVo> getCode() {
+    SystemCaptchaVo imgResult = systemCaptchaService.getLoginCaptcha();
+    return ResponseEntity.ok(imgResult);
+  }
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
index 441f4d2c..5d3cc43a 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
@@ -1,26 +1,19 @@
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.odboy.constant.CaptchaCodeEnum;
 import cn.odboy.constant.SystemConst;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
-import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserInfoVo;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserLoginArgs;
-import cn.odboy.system.dal.redis.SystemCacheKey;
+import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.response.SystemAuthVo;
+import cn.odboy.system.dal.model.response.SystemUserInfoVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
 import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitRsaEncryptUtil;
-import com.wf.captcha.base.Captcha;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import cn.odboy.util.KitValidUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -33,51 +26,47 @@ import org.springframework.stereotype.Service;
 public class SystemAuthService {
 
   @Autowired
-  private KitRedisHelper redisHelper;
+  private AppProperties properties;
   @Autowired
   private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
   @Autowired
   private TokenProvider tokenProvider;
   @Autowired
-  private AppProperties properties;
-  @Autowired
   private PasswordEncoder passwordEncoder;
   @Autowired
   private UserDetailsHandler userDetailsService;
+  @Autowired
+  private SystemCaptchaService systemCaptchaService;
+
+  public SystemAuthVo doLogin(SystemUserLoginArgs loginArgs, HttpServletRequest request) throws Exception {
+    KitValidUtil.notNull(loginArgs);
 
-  public Map<String, Object> doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception {
     // 密码解密
-    String password =
-        KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword());
-    // 查询验证码
-    String code = redisHelper.get(loginRequest.getUuid(), String.class);
-    // 清除验证码
-    redisHelper.del(loginRequest.getUuid());
-    if (StrUtil.isBlank(code)) {
-      throw new BadRequestException("验证码不存在或已过期");
-    }
-    if (StrUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) {
-      throw new BadRequestException("验证码错误");
-    }
+    String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword());
+    // 校验验证码
+    systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode());
     // 获取用户信息
-    SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername());
+    SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginArgs.getUsername());
     // 验证用户密码
     if (!passwordEncoder.matches(password, jwtUser.getPassword())) {
       throw new BadRequestException("登录密码错误");
     }
-    Authentication authentication =
-        new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
+
+    // 登录验证
+    Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
     SecurityContextHolder.getContext().setAuthentication(authentication);
+
     // 生成令牌
     String token = tokenProvider.createToken(jwtUser);
     // 返回 token 与 用户信息
-    Map<String, Object> authInfo = new HashMap<>(2) {{
-      put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
-      put("user", BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class));
-    }};
+    SystemAuthVo authInfo = new SystemAuthVo();
+    authInfo.setToken(String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
+    /// 这里是为了清空密码
+    authInfo.setUser(KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class));
+
     if (properties.getLogin().isSingle()) {
       // 踢掉之前已经登录的token
-      systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername());
+      systemUserOnlineInfoDAO.kickOutByUsername(loginArgs.getUsername());
     }
     // 保存在线信息
     systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request);
@@ -85,29 +74,12 @@ public class SystemAuthService {
     return authInfo;
   }
 
-  public SystemUserInfoVo getCurrentUserInfoVo() {
+  public SystemUserJwtVo getCurrentUserInfo() {
     SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser();
-    return BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class);
-  }
-
-  public Map<String, Object> getCaptchaInfo() {
-    // 获取运算的结果
-    Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha();
-    String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
-    //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型
-    String captchaValue = captcha.text();
-    if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() &&
-        captchaValue.contains(SystemConst.SYMBOL_DOT)) {
-      captchaValue = captchaValue.split("\\.")[0];
+    if (jwtUser.getUser() != null) {
+      jwtUser.getUser().setPassword(null);
     }
-    // 保存
-    redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(),
-        TimeUnit.MINUTES);
-    // 验证码信息
-    return new HashMap<>(2) {{
-      put("img", captcha.toBase64());
-      put("uuid", uuid);
-    }};
+    return jwtUser;
   }
 
   public void doLogout(HttpServletRequest request) {
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java
new file mode 100644
index 00000000..1de7cbcd
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java
@@ -0,0 +1,59 @@
+package cn.odboy.system.service;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.odboy.constant.CaptchaCodeEnum;
+import cn.odboy.constant.SystemConst;
+import cn.odboy.framework.exception.BadRequestException;
+import cn.odboy.framework.properties.AppProperties;
+import cn.odboy.framework.redis.KitRedisHelper;
+import cn.odboy.system.dal.model.response.SystemCaptchaVo;
+import cn.odboy.system.dal.redis.SystemCacheKey;
+import com.wf.captcha.base.Captcha;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 验证码
+ */
+@Service
+public class SystemCaptchaService {
+
+  @Autowired
+  private KitRedisHelper redisHelper;
+  @Autowired
+  private AppProperties properties;
+
+  public SystemCaptchaVo getLoginCaptcha() {
+    // 获取运算的结果
+    Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha();
+    String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
+    //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型
+    String captchaValue = captcha.text();
+    if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() &&
+        captchaValue.contains(SystemConst.SYMBOL_DOT)) {
+      captchaValue = captchaValue.split("\\.")[0];
+    }
+    // 保存
+    redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), TimeUnit.MINUTES);
+    // 验证码信息
+    SystemCaptchaVo captchaVo = new SystemCaptchaVo();
+    captchaVo.setUuid(uuid);
+    captchaVo.setImg(captcha.toBase64());
+    return captchaVo;
+  }
+
+  public void validate(String uuid, String inputCode) {
+    // 查询验证码
+    String code = redisHelper.get(uuid, String.class);
+    if (StrUtil.isBlank(code)) {
+      throw new BadRequestException("验证码不存在或已过期");
+    }
+    // 清除验证码
+    redisHelper.del(uuid);
+    if (StrUtil.isBlank(inputCode) || !code.equalsIgnoreCase(inputCode)) {
+      throw new BadRequestException("验证码错误");
+    }
+  }
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
index 587cc79e..caf6a3b6 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
@@ -18,9 +18,9 @@ package cn.odboy.system.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -49,12 +49,12 @@ public class SystemDataService {
    * @param user /
    * @return /
    */
-  public List<Long> queryDeptIdByArgs(SystemUserTb user) {
+  public List<Long> queryDeptIdByArgs(SystemUserVo user) {
     List<Long> deptIds = new ArrayList<>();
     // 查询用户角色
     List<SystemRoleVo> roleList = systemUserRoleService.queryRoleByUsersId(user.getId());
     // 获取对应的部门ID
-    for (SystemRoleTb role : roleList) {
+    for (SystemRoleVo role : roleList) {
       SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope());
       switch (Objects.requireNonNull(dataScopeEnum)) {
         case THIS_LEVEL:
@@ -77,11 +77,11 @@ public class SystemDataService {
    * @param role    角色
    * @return 数据权限ID
    */
-  private List<Long> queryCustomDataPermissionByArgs(List<Long> deptIds, SystemRoleTb role) {
+  private List<Long> queryCustomDataPermissionByArgs(List<Long> deptIds, SystemRoleVo role) {
     List<SystemDeptTb> deptList = systemRoleDeptService.listDeptByRoleId(role.getId());
     for (SystemDeptTb dept : deptList) {
       deptIds.add(dept.getId());
-      List<SystemDeptTb> deptChildren = systemDeptService.listDeptByPid(dept.getId());
+      List<SystemDeptVo> deptChildren = systemDeptService.listDeptByPid(dept.getId());
       if (CollUtil.isNotEmpty(deptChildren)) {
         deptIds.addAll(systemDeptService.queryChildDeptIdByDeptIds(deptChildren));
       }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
index 62868016..53f10b1d 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -25,14 +24,17 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.constant.SystemZhConst;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.model.SystemCreateDeptArgs;
-import cn.odboy.system.dal.model.SystemDeptExportRowVo;
-import cn.odboy.system.dal.model.SystemProductLineTreeVo;
-import cn.odboy.system.dal.model.SystemProductLineVo;
-import cn.odboy.system.dal.model.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.export.SystemDeptExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateDeptArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemProductLineTreeVo;
+import cn.odboy.system.dal.model.response.SystemProductLineVo;
 import cn.odboy.system.dal.mysql.SystemDeptMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.lang.reflect.Field;
@@ -68,7 +70,8 @@ public class SystemDeptService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDept(SystemCreateDeptArgs args) {
-    systemDeptMapper.insert(BeanUtil.copyProperties(args, SystemDeptTb.class));
+    KitValidUtil.notNull(args);
+    systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class));
     this.updateDeptSubCnt(args.getPid());
   }
 
@@ -78,9 +81,11 @@ public class SystemDeptService {
    * @param args /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void updateDept(SystemDeptTb args) {
-    // 旧的部门
-    Long oldPid = this.getDeptById(args.getId()).getPid();
+  public void updateDeptById(SystemDeptTb args) {
+    KitValidUtil.notNull(args);
+    // 旧的父部门
+    Long oldPid = this.getDeptVoById(args.getId()).getPid();
+    // 新的父部门
     Long newPid = args.getPid();
     if (args.getPid() != null && args.getId().equals(args.getPid())) {
       throw new BadRequestException("上级不能为自己");
@@ -100,10 +105,10 @@ public class SystemDeptService {
   @Transactional(rollbackFor = Exception.class)
   public void deleteDeptByIds(Set<Long> ids) {
     // 获取部门, 和其所有子部门
-    Set<SystemDeptTb> depts = this.traverseDeptByIdWithPids(ids);
+    Set<SystemDeptVo> depts = this.traverseDeptByIdWithPids(ids);
     // 验证是否被角色或用户关联
     this.verifyBindRelationByIds(depts);
-    for (SystemDeptTb dept : depts) {
+    for (SystemDeptVo dept : depts) {
       systemDeptMapper.deleteById(dept.getId());
       this.updateDeptSubCnt(dept.getPid());
     }
@@ -145,17 +150,16 @@ public class SystemDeptService {
   }
 
   private List<SystemDeptTb> queryDeptByArgs(SystemQueryDeptArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds());
-      wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName());
-      wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled());
-      wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid());
-      wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid);
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds());
+    wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName());
+    wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled());
+    wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid());
+    wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid);
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemDeptTb::getDeptSort);
     return systemDeptMapper.selectList(wrapper);
@@ -209,8 +213,8 @@ public class SystemDeptService {
    * @param id /
    * @return /
    */
-  public SystemDeptTb getDeptById(Long id) {
-    return systemDeptMapper.selectById(id);
+  public SystemDeptVo getDeptVoById(Long id) {
+    return KitBeanUtil.copyToClass(systemDeptMapper.selectById(id), SystemDeptVo.class);
   }
 
   /**
@@ -218,24 +222,22 @@ public class SystemDeptService {
    *
    * @param deptTbList /
    * @param depts      /
-   * @return /
    */
-  private Set<SystemDeptTb> queryRelationDeptByArgs(List<SystemDeptTb> deptTbList, Set<SystemDeptTb> depts) {
-    for (SystemDeptTb dept : deptTbList) {
+  private void queryRelationDeptByArgs(List<SystemDeptVo> deptTbList, Set<SystemDeptVo> depts) {
+    for (SystemDeptVo dept : deptTbList) {
       depts.add(dept);
-      List<SystemDeptTb> deptList = this.listDeptByPid(dept.getId());
+      List<SystemDeptVo> deptList = this.listDeptByPid(dept.getId());
       if (CollUtil.isNotEmpty(deptList)) {
         queryRelationDeptByArgs(deptList, depts);
       }
     }
-    return depts;
   }
 
-  public List<Long> queryChildDeptIdByDeptIds(List<SystemDeptTb> deptList) {
+  public List<Long> queryChildDeptIdByDeptIds(List<SystemDeptVo> deptList) {
     List<Long> list = new ArrayList<>();
-    for (SystemDeptTb systemDeptTb : deptList) {
+    for (SystemDeptVo systemDeptTb : deptList) {
       if (systemDeptTb != null && systemDeptTb.getEnabled()) {
-        List<SystemDeptTb> deptList1 = this.listDeptByPid(systemDeptTb.getId());
+        List<SystemDeptVo> deptList1 = this.listDeptByPid(systemDeptTb.getId());
         if (CollUtil.isNotEmpty(deptList1)) {
           list.addAll(queryChildDeptIdByDeptIds(deptList1));
         }
@@ -252,19 +254,19 @@ public class SystemDeptService {
    * @param deptList /
    * @return /
    */
-  private List<SystemDeptTb> querySuperiorDeptByPid(SystemDeptTb dept, List<SystemDeptTb> deptList) {
+  private List<SystemDeptVo> querySuperiorDeptByPid(SystemDeptVo dept, List<SystemDeptVo> deptList) {
     if (dept.getPid() == null) {
       deptList.addAll(this.listRootDept());
       return deptList;
     }
     deptList.addAll(this.listDeptByPid(dept.getPid()));
-    return querySuperiorDeptByPid(this.getDeptById(dept.getPid()), deptList);
+    return querySuperiorDeptByPid(this.getDeptVoById(dept.getPid()), deptList);
   }
 
-  private List<SystemDeptTb> listRootDept() {
+  private List<SystemDeptVo> listRootDept() {
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.isNull(SystemDeptTb::getPid);
-    return systemDeptMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class);
   }
 
   /**
@@ -272,15 +274,15 @@ public class SystemDeptService {
    *
    * @return /
    */
-  public KitPageResult<SystemDeptTb> searchDeptTree(List<Long> ids, Boolean exclude) {
-    Set<SystemDeptTb> deptSet1 = new LinkedHashSet<>();
+  public KitPageResult<SystemDeptVo> searchDeptTree(List<Long> ids, Boolean exclude) {
+    Set<SystemDeptVo> deptSet1 = new LinkedHashSet<>();
     for (Long id : ids) {
       // 同级数据
-      SystemDeptTb dept = this.getDeptById(id);
+      SystemDeptVo dept = this.getDeptVoById(id);
       // 上级数据
-      List<SystemDeptTb> depts = this.querySuperiorDeptByPid(dept, new ArrayList<>());
+      List<SystemDeptVo> depts = this.querySuperiorDeptByPid(dept, new ArrayList<>());
       if (exclude) {
-        for (SystemDeptTb data : depts) {
+        for (SystemDeptVo data : depts) {
           if (data.getId().equals(dept.getPid())) {
             data.setSubCount(data.getSubCount() - 1);
           }
@@ -290,18 +292,18 @@ public class SystemDeptService {
       }
       deptSet1.addAll(depts);
     }
-    ArrayList<SystemDeptTb> deptList = new ArrayList<>(deptSet1);
+    List<SystemDeptVo> deptList = new ArrayList<>(deptSet1);
     // 构建部门树
-    Set<SystemDeptTb> trees = new LinkedHashSet<>();
-    Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
-    List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList());
+    Set<SystemDeptVo> trees = new LinkedHashSet<>();
+    Set<SystemDeptVo> deptSet = new LinkedHashSet<>();
+    List<String> deptNames = deptList.stream().map(SystemDeptVo::getName).collect(Collectors.toList());
     boolean isChild;
-    for (SystemDeptTb dept : deptList) {
+    for (SystemDeptVo dept : deptList) {
       isChild = false;
       if (dept.getPid() == null) {
         trees.add(dept);
       }
-      for (SystemDeptTb it : deptList) {
+      for (SystemDeptVo it : deptList) {
         if (it.getPid() != null && dept.getId().equals(it.getPid())) {
           isChild = true;
           if (dept.getChildren() == null) {
@@ -312,14 +314,14 @@ public class SystemDeptService {
       }
       if (isChild) {
         deptSet.add(dept);
-      } else if (dept.getPid() != null && !deptNames.contains(this.getDeptById(dept.getPid()).getName())) {
+      } else if (dept.getPid() != null && !deptNames.contains(this.getDeptVoById(dept.getPid()).getName())) {
         deptSet.add(dept);
       }
     }
     if (CollectionUtil.isEmpty(trees)) {
       trees = deptSet;
     }
-    KitPageResult<SystemDeptTb> baseResult = new KitPageResult<>();
+    KitPageResult<SystemDeptVo> baseResult = new KitPageResult<>();
     baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees));
     baseResult.setTotalElements(deptSet.size());
     return baseResult;
@@ -330,8 +332,8 @@ public class SystemDeptService {
    *
    * @param deptSet /
    */
-  public void verifyBindRelationByIds(Set<SystemDeptTb> deptSet) {
-    Set<Long> deptIds = deptSet.stream().map(SystemDeptTb::getId).collect(Collectors.toSet());
+  public void verifyBindRelationByIds(Set<SystemDeptVo> deptSet) {
+    Set<Long> deptIds = deptSet.stream().map(SystemDeptVo::getId).collect(Collectors.toSet());
     if (systemUserDeptService.countUserByDeptIds(deptIds) > 0) {
       throw new BadRequestException("所选部门存在用户关联，请解除后再试！");
     }
@@ -351,21 +353,21 @@ public class SystemDeptService {
    *
    * @param ids /
    */
-  public Set<SystemDeptTb> traverseDeptByIdWithPids(Set<Long> ids) {
-    Set<SystemDeptTb> depts = new HashSet<>();
+  public Set<SystemDeptVo> traverseDeptByIdWithPids(Set<Long> ids) {
+    Set<SystemDeptVo> depts = new HashSet<>();
     for (Long id : ids) {
       // 根部门
-      depts.add(this.getDeptById(id));
+      depts.add(this.getDeptVoById(id));
       // 子部门
-      List<SystemDeptTb> deptList = listDeptByPid(id);
+      List<SystemDeptVo> deptList = this.listDeptByPid(id);
       if (CollectionUtil.isNotEmpty(deptList)) {
-        depts = queryRelationDeptByArgs(deptList, depts);
+        queryRelationDeptByArgs(deptList, depts);
       }
     }
     return depts;
   }
 
-  public List<SystemProductLineVo> queryDeptSelectDataSource() {
+  public List<SystemProductLineVo> listDeptSelectDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     return buildDeptSelectOptions(depts);
   }
@@ -414,7 +416,7 @@ public class SystemDeptService {
     }
   }
 
-  public List<SystemProductLineTreeVo> queryDeptSelectProDataSource() {
+  public List<SystemProductLineTreeVo> listDeptSelectProDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     // 获取所有部门并按父子关系组织
     Map<Long, SystemDeptTb> deptMap =
@@ -463,21 +465,14 @@ public class SystemDeptService {
     return vo;
   }
 
-  public List<SystemDeptTb> listDeptByPid(long pid) {
+  public List<SystemDeptVo> listDeptByPid(long pid) {
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemDeptTb::getPid, pid);
-    return systemDeptMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class);
   }
 
   public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception {
     List<SystemDeptTb> systemDeptTbs = this.queryAllDeptByArgs(args, false);
-//    KitXlsxExportUtil.exportFile(response, "部门数据", systemDeptTbs, SystemDeptExportRowVo.class, (dataObject) -> {
-//      SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemDeptExportRowVo> rowVos = new ArrayList<>();
     for (SystemDeptTb dataObject : systemDeptTbs) {
       SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
index 6f81af6a..19c9b210 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
@@ -15,18 +15,19 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
 import cn.odboy.system.dal.mysql.SystemDictDetailMapper;
 import cn.odboy.system.dal.mysql.SystemDictMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -55,7 +56,9 @@ public class SystemDictDetailService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDictDetail(SystemCreateDictDetailArgs args) {
-    SystemDictDetailTb dictDetail = BeanUtil.copyProperties(args, SystemDictDetailTb.class);
+    KitValidUtil.notNull(args);
+    KitValidUtil.notNull(args.getDict());
+    SystemDictDetailTb dictDetail = KitBeanUtil.copyToClass(args, SystemDictDetailTb.class);
     dictDetail.setDictId(args.getDict().getId());
     systemDictDetailMapper.insert(dictDetail);
   }
@@ -104,10 +107,9 @@ public class SystemDictDetailService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemDictDetailVo> searchDictDetail(SystemQueryDictDetailArgs args,
-      Page<SystemDictDetailTb> page) {
-    IPage<SystemDictDetailVo> iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> BeanUtil.copyProperties(i, SystemDictDetailVo.class));
-    List<Long> dictIds = iPage.getRecords().stream().map(SystemDictDetailTb::getDictId).collect(Collectors.toList());
+  public KitPageResult<SystemDictDetailVo> searchDictDetail(SystemQueryDictDetailArgs args, Page<SystemDictDetailTb> page) {
+    IPage<SystemDictDetailVo> iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> KitBeanUtil.copyToClass(i, SystemDictDetailVo.class));
+    List<Long> dictIds = iPage.getRecords().stream().map(SystemDictDetailVo::getDictId).collect(Collectors.toList());
     Map<Long, SystemDictTb> id2ItemMap = systemDictMapper.selectByIds(dictIds).stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i));
     for (SystemDictDetailVo record : iPage.getRecords()) {
       record.setDict(id2ItemMap.get(record.getDictId()));
@@ -129,11 +131,12 @@ public class SystemDictDetailService {
     if (systemDictTb == null) {
       return new ArrayList<>();
     }
-    return this.listDictDetailByDictId(systemDictTb.getId()).stream().map(m -> {
-      SystemDictDetailVo detailVo = BeanUtil.copyProperties(m, SystemDictDetailVo.class);
+    List<SystemDictDetailTb> detailTbs = this.listDictDetailByDictId(systemDictTb.getId());
+    List<SystemDictDetailVo> detailVos = KitBeanUtil.copyToList(detailTbs, SystemDictDetailVo.class);
+    for (SystemDictDetailVo detailVo : detailVos) {
       detailVo.setDict(systemDictTb);
-      return detailVo;
-    }).collect(Collectors.toList());
+    }
+    return detailVos;
   }
 
   public Map<String, List<SystemDictDetailVo>> getDictDetailMap(String dictName) {
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
index 86df8fff..2966ea91 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
@@ -15,17 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemDictExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryDictArgs;
+import cn.odboy.system.dal.model.export.SystemDictExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateDictArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
 import cn.odboy.system.dal.mysql.SystemDictMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,7 +53,8 @@ public class SystemDictService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDict(SystemCreateDictArgs args) {
-    systemDictMapper.insert(BeanUtil.copyProperties(args, SystemDictTb.class));
+    SystemDictTb dictTb = KitBeanUtil.copyToClass(args, SystemDictTb.class);
+    systemDictMapper.insert(dictTb);
   }
 
   /**
@@ -96,10 +98,9 @@ public class SystemDictService {
   }
 
   private void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper<SystemDictTb> wrapper) {
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or()
-          .like(SystemDictTb::getDescription, args.getBlurry()));
-    }
+    KitValidUtil.notNull(args);
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or()
+        .like(SystemDictTb::getDescription, args.getBlurry()));
   }
 
   public List<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args) {
@@ -110,29 +111,6 @@ public class SystemDictService {
 
   public void exportDictXlsx(HttpServletResponse response, SystemQueryDictArgs args) {
     List<SystemDictTb> systemDictTbs = this.queryDictByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "字典数据", systemDictTbs, SystemDictExportRowVo.class, (dataObject) -> {
-//      List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());
-//      if (CollUtil.isEmpty(dictDetails)) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel("");
-//        rowVo.setValue("");
-//        return CollUtil.newArrayList(rowVo);
-//      }
-//      List<SystemDictExportRowVo> rowVos = new ArrayList<>();
-//      for (SystemDictDetailVo dictDetail : dictDetails) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel(dictDetail.getLabel());
-//        rowVo.setValue(dictDetail.getValue());
-//        rowVos.add(rowVo);
-//      }
-//      return rowVos;
-//    });
     List<SystemDictExportRowVo> rowVos = new ArrayList<>();
     for (SystemDictTb dataObject : systemDictTbs) {
       List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
index 2a40d0cf..00e9a965 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
@@ -24,8 +24,8 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
 import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
-import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
 import cn.odboy.system.dal.mysql.SystemEmailConfigMapper;
 import cn.odboy.util.KitDesEncryptUtil;
 import cn.odboy.util.KitResourceTemplateUtil;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
index aefd4680..80c60b83 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
@@ -15,17 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.model.SystemCreateJobArgs;
-import cn.odboy.system.dal.model.SystemJobExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryJobArgs;
+import cn.odboy.system.dal.model.export.SystemJobExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryJobArgs;
 import cn.odboy.system.dal.mysql.SystemJobMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,7 +44,7 @@ public class SystemJobService {
   @Autowired
   private SystemJobMapper systemJobMapper;
   @Autowired
-  private SystemUserService systemUserService;
+  private SystemUserJobService systemUserJobService;
 
   /**
    * 创建
@@ -56,7 +57,8 @@ public class SystemJobService {
     if (job != null) {
       throw new BadRequestException("职位名称已存在");
     }
-    systemJobMapper.insert(BeanUtil.copyProperties(args, SystemJobTb.class));
+    SystemJobTb systemJobTb = KitBeanUtil.copyToClass(args, SystemJobTb.class);
+    systemJobMapper.insert(systemJobTb);
   }
 
   /**
@@ -115,7 +117,7 @@ public class SystemJobService {
    * @param ids /
    */
   public void verifyBindRelationByIds(Set<Long> ids) {
-    if (systemUserService.countUserByJobIds(ids) > 0) {
+    if (systemUserJobService.countUserByJobIds(ids) > 0) {
       throw new BadRequestException("所选的岗位中存在用户关联, 请解除关联再试！");
     }
   }
@@ -127,26 +129,18 @@ public class SystemJobService {
   }
 
   public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper<SystemJobTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName());
-      wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName());
+    wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId);
   }
 
   public void exportJobXlsx(HttpServletResponse response, SystemQueryJobArgs args) {
     List<SystemJobTb> systemJobTbs = this.queryJobByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "岗位数据", systemJobTbs, SystemJobExportRowVo.class, (dataObject) -> {
-//      SystemJobExportRowVo rowVo = new SystemJobExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? "启用" : "停用");
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemJobExportRowVo> rowVos = new ArrayList<>();
     for (SystemJobTb dataObject : systemJobTbs) {
       SystemJobExportRowVo rowVo = new SystemJobExportRowVo();
@@ -157,4 +151,8 @@ public class SystemJobService {
     }
     KitExcelExporter.exportSimple(response, "岗位数据", SystemJobExportRowVo.class, rowVos);
   }
+
+  public List<SystemJobTb> listByIds(Set<Long> jobIds) {
+    return systemJobMapper.selectByIds(jobIds);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
index d5b19dfb..ab83bcb3 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
@@ -28,11 +27,13 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
-import cn.odboy.system.dal.model.SystemLocalStorageExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.export.SystemLocalStorageExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
 import cn.odboy.system.dal.mysql.SystemLocalStorageMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -139,16 +140,15 @@ public class SystemLocalStorageService {
   }
 
   private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getType, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getCreateBy, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    KitValidUtil.notNull(args);
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getType, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getCreateBy, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemLocalStorageTb::getId);
   }
@@ -171,9 +171,7 @@ public class SystemLocalStorageService {
 
   public void exportLocalStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) {
     List<SystemLocalStorageTb> systemLocalStorageTbs = this.queryLocalStorageByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "文件上传记录数据", systemLocalStorageTbs, SystemLocalStorageExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemLocalStorageExportRowVo.class)));
-    List<SystemLocalStorageExportRowVo> rowVos = BeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class);
+    List<SystemLocalStorageExportRowVo> rowVos = KitBeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class);
     KitExcelExporter.exportSimple(response, "文件上传记录数据", SystemLocalStorageExportRowVo.class, rowVos);
   }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
index 5cc8f48f..7986ce5c 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
@@ -19,22 +19,21 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
+import cn.odboy.system.constant.SystemTransferProtocolConst;
 import cn.odboy.system.constant.SystemYesOrNoChConst;
-import cn.odboy.system.constant.TransferProtocolConst;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemMenuExportRowVo;
-import cn.odboy.system.dal.model.SystemMenuMetaVo;
-import cn.odboy.system.dal.model.SystemMenuVo;
-import cn.odboy.system.dal.model.SystemQueryMenuArgs;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.export.SystemMenuExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.response.SystemMenuMetaVo;
+import cn.odboy.system.dal.model.response.SystemMenuRouterVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
 import cn.odboy.system.dal.mysql.SystemMenuMapper;
-import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -59,8 +58,6 @@ public class SystemMenuService {
   @Autowired
   private SystemMenuMapper systemMenuMapper;
   @Autowired
-  private SystemRoleMenuMapper systemRoleMenuMapper;
-  @Autowired
   private SystemRoleMenuService systemRoleMenuService;
   @Autowired
   private SystemUserRoleService systemUserRoleService;
@@ -84,9 +81,9 @@ public class SystemMenuService {
       args.setPid(null);
     }
     if (args.getIFrame()) {
-      if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
-          args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
-        throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
+      if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
+          args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
+        throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
       }
     }
     systemMenuMapper.insert(args);
@@ -108,9 +105,9 @@ public class SystemMenuService {
     }
     SystemMenuTb menu = systemMenuMapper.selectById(args.getId());
     if (args.getIFrame()) {
-      if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
-          args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
-        throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
+      if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
+          args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
+        throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
       }
     }
     SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle());
@@ -155,30 +152,25 @@ public class SystemMenuService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void deleteMenuByIds(Set<Long> ids) {
-    Set<SystemMenuTb> menuSet = new HashSet<>();
+    Set<SystemMenuVo> menuSet = new HashSet<>();
     for (Long id : ids) {
-      List<SystemMenuTb> menuList = this.listMenuByPid(id);
-      menuSet.add(systemMenuMapper.selectById(id));
+      List<SystemMenuVo> menuList = this.listMenuByPid(id);
+      menuSet.add(this.getMenuVoById(id));
       menuSet = this.queryChildMenuByArgs(menuList, menuSet);
     }
     List<Long> menuIds =
-        menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+        menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
     if (CollUtil.isNotEmpty(menuIds)) {
-      KitSpringBeanHolder.getBean(SystemMenuService.class).deleteRoleMenuByMenuIds(menuIds);
+      systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds);
       systemMenuMapper.deleteByIds(menuIds);
     }
-    for (SystemMenuTb menu : menuSet) {
+    for (SystemMenuVo menu : menuSet) {
       this.updateMenuSubCnt(menu.getPid());
     }
   }
 
-  @Transactional(rollbackFor = Exception.class)
-  public void deleteRoleMenuByMenuIds(List<Long> menuIds) {
-    if (CollUtil.isNotEmpty(menuIds)) {
-      LambdaQueryWrapper<SystemRoleMenuTb> wrapper = new LambdaQueryWrapper<>();
-      wrapper.in(SystemRoleMenuTb::getMenuId, menuIds);
-      systemRoleMenuMapper.delete(wrapper);
-    }
+  private SystemMenuVo getMenuVoById(Long id) {
+    return KitBeanUtil.copyToClass(systemMenuMapper.selectById(id), SystemMenuVo.class);
   }
 
   @Transactional(rollbackFor = Exception.class)
@@ -227,9 +219,9 @@ public class SystemMenuService {
    * @param currentUserId /
    * @return /
    */
-  public List<SystemMenuTb> listMenuByUserId(Long currentUserId) {
+  public List<SystemMenuVo> listMenuByUserId(Long currentUserId) {
     List<SystemRoleVo> roles = systemUserRoleService.queryRoleByUsersId(currentUserId);
-    Set<Long> roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet());
+    Set<Long> roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet());
     return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds));
   }
 
@@ -240,10 +232,10 @@ public class SystemMenuService {
    * @param menuSet  /
    * @return /
    */
-  public Set<SystemMenuTb> queryChildMenuByArgs(List<SystemMenuTb> menuList, Set<SystemMenuTb> menuSet) {
-    for (SystemMenuTb menu : menuList) {
+  public Set<SystemMenuVo> queryChildMenuByArgs(List<SystemMenuVo> menuList, Set<SystemMenuVo> menuSet) {
+    for (SystemMenuVo menu : menuList) {
       menuSet.add(menu);
-      List<SystemMenuTb> menus = this.listMenuByPid(menu.getId());
+      List<SystemMenuVo> menus = this.listMenuByPid(menu.getId());
       if (CollUtil.isNotEmpty(menus)) {
         queryChildMenuByArgs(menus, menuSet);
       }
@@ -257,13 +249,13 @@ public class SystemMenuService {
    * @param pid /
    * @return /
    */
-  public List<SystemMenuTb> listMenuByPid(Long pid) {
-    List<SystemMenuTb> menus;
+  public List<SystemMenuVo> listMenuByPid(Long pid) {
+    List<SystemMenuVo> menus;
     if (pid != null && !pid.equals(0L)) {
       LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
       wrapper.eq(SystemMenuTb::getPid, pid);
       wrapper.orderByAsc(SystemMenuTb::getMenuSort);
-      return systemMenuMapper.selectList(wrapper);
+      return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class);
     } else {
       menus = this.listRootMenu();
     }
@@ -277,13 +269,13 @@ public class SystemMenuService {
    * @param menus /
    * @return /
    */
-  public List<SystemMenuTb> querySuperiorMenuByArgs(SystemMenuTb menu, List<SystemMenuTb> menus) {
+  public List<SystemMenuVo> querySuperiorMenuByArgs(SystemMenuVo menu, List<SystemMenuVo> menus) {
     if (menu.getPid() == null) {
       menus.addAll(this.listRootMenu());
       return menus;
     }
     menus.addAll(this.listMenuByPid(menu.getPid()));
-    return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus);
+    return querySuperiorMenuByArgs(this.getMenuVoById(menu.getPid()), menus);
   }
 
   /**
@@ -292,14 +284,14 @@ public class SystemMenuService {
    * @param menus 原始数据
    * @return /
    */
-  public List<SystemMenuTb> buildMenuTree(List<SystemMenuTb> menus) {
-    List<SystemMenuTb> trees = new ArrayList<>();
+  public List<SystemMenuVo> buildMenuTree(List<SystemMenuVo> menus) {
+    List<SystemMenuVo> trees = new ArrayList<>();
     Set<Long> ids = new HashSet<>();
-    for (SystemMenuTb menu : menus) {
+    for (SystemMenuVo menu : menus) {
       if (menu.getPid() == null) {
         trees.add(menu);
       }
-      for (SystemMenuTb it : menus) {
+      for (SystemMenuVo it : menus) {
         if (menu.getId().equals(it.getPid())) {
           if (menu.getChildren() == null) {
             menu.setChildren(new ArrayList<>());
@@ -321,12 +313,12 @@ public class SystemMenuService {
    * @param menus /
    * @return /
    */
-  public List<SystemMenuVo> buildMenuVo(List<SystemMenuTb> menus) {
-    List<SystemMenuVo> list = new LinkedList<>();
-    menus.forEach(menu -> {
+  public List<SystemMenuRouterVo> buildMenuVo(List<SystemMenuVo> menus) {
+    List<SystemMenuRouterVo> list = new LinkedList<>();
+    for (SystemMenuVo menu : menus) {
       if (menu != null) {
-        List<SystemMenuTb> menuList = menu.getChildren();
-        SystemMenuVo menuVo = new SystemMenuVo();
+        List<SystemMenuVo> menuList = menu.getChildren();
+        SystemMenuRouterVo menuVo = new SystemMenuRouterVo();
         menuVo.setName(
             ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle());
         // 一级目录需要加斜杠, 不然会报警告
@@ -350,17 +342,17 @@ public class SystemMenuService {
           menuVo.setChildren(buildMenuVo(menuList));
           // 处理是一级菜单并且没有子菜单的情况
         } else if (menu.getPid() == null) {
-          SystemMenuVo menuVo1 = getMenuVo(menu, menuVo);
+          SystemMenuRouterVo menuVo1 = getMenuVo(menu, menuVo);
           menuVo.setName(null);
           menuVo.setMeta(null);
           menuVo.setComponent("Layout");
-          List<SystemMenuVo> list1 = new ArrayList<>();
+          List<SystemMenuRouterVo> list1 = new ArrayList<>();
           list1.add(menuVo1);
           menuVo.setChildren(list1);
         }
         list.add(menuVo);
       }
-    });
+    }
     return list;
   }
 
@@ -371,8 +363,8 @@ public class SystemMenuService {
    * @param menuVo /
    * @return /
    */
-  private SystemMenuVo getMenuVo(SystemMenuTb menu, SystemMenuVo menuVo) {
-    SystemMenuVo menuVo1 = new SystemMenuVo();
+  private SystemMenuRouterVo getMenuVo(SystemMenuVo menu, SystemMenuRouterVo menuVo) {
+    SystemMenuRouterVo menuVo1 = new SystemMenuRouterVo();
     menuVo1.setMeta(menuVo.getMeta());
     // 非外链
     if (!menu.getIFrame()) {
@@ -385,8 +377,8 @@ public class SystemMenuService {
     return menuVo1;
   }
 
-  public List<SystemMenuTb> listMenuByIds(List<Long> ids) {
-    return systemMenuMapper.selectByIds(ids);
+  public List<SystemMenuVo> listMenuByIds(List<Long> ids) {
+    return KitBeanUtil.copyToList(systemMenuMapper.selectByIds(ids), SystemMenuVo.class);
   }
 
   private SystemMenuTb getMenuByComponentName(String componentName) {
@@ -408,52 +400,51 @@ public class SystemMenuService {
   }
 
   private List<SystemMenuTb> queryMenuByArgs(SystemQueryMenuArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid);
-      wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid());
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or()
-              .like(SystemMenuTb::getComponentName, args.getBlurry()).or()
-              .like(SystemMenuTb::getPermission, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid);
+    wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid());
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or()
+            .like(SystemMenuTb::getComponentName, args.getBlurry()).or()
+            .like(SystemMenuTb::getPermission, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);
     return systemMenuMapper.selectList(wrapper);
   }
 
-  private List<SystemMenuTb> listRootMenu() {
+  private List<SystemMenuVo> listRootMenu() {
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.isNull(SystemMenuTb::getPid);
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);
-    return systemMenuMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class);
   }
 
-  public List<SystemMenuVo> buildFrontMenus() {
-    List<SystemMenuTb> menuList = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId());
-    List<SystemMenuTb> menus = this.buildMenuTree(menuList);
-    return this.buildMenuVo(menus);
+  public List<SystemMenuRouterVo> buildFrontMenus() {
+    List<SystemMenuVo> originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId());
+    List<SystemMenuVo> targetMenus = this.buildMenuTree(originMenus);
+    return this.buildMenuVo(targetMenus);
   }
 
   public Set<Long> listChildMenuSetByMenuId(Long id) {
-    Set<SystemMenuTb> menuSet = new HashSet<>();
-    List<SystemMenuTb> menuList = this.listMenuByPid(id);
-    menuSet.add(systemMenuMapper.selectById(id));
+    Set<SystemMenuVo> menuSet = new HashSet<>();
+    List<SystemMenuVo> menuList = this.listMenuByPid(id);
+    menuSet.add(this.getMenuVoById(id));
     menuSet = this.queryChildMenuByArgs(menuList, menuSet);
-    return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet());
+    return menuSet.stream().map(SystemMenuVo::getId).collect(Collectors.toSet());
   }
 
-  public List<SystemMenuTb> listMenuSuperior(List<Long> ids) {
-    Set<SystemMenuTb> menus;
-    List<SystemMenuTb> systemMenuTbs;
+  public List<SystemMenuVo> listMenuSuperior(List<Long> ids) {
+    Set<SystemMenuVo> menus;
+    List<SystemMenuVo> systemMenuTbs;
     if (CollectionUtil.isNotEmpty(ids)) {
       menus = new LinkedHashSet<>(this.listMenuByIds(ids));
-      for (SystemMenuTb menu : menus) {
-        List<SystemMenuTb> menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>());
-        for (SystemMenuTb data : menuList) {
+      for (SystemMenuVo menu : menus) {
+        List<SystemMenuVo> menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>());
+        for (SystemMenuVo data : menuList) {
           if (data.getId().equals(menu.getPid())) {
             data.setSubCount(data.getSubCount() - 1);
           }
@@ -462,7 +453,8 @@ public class SystemMenuService {
       }
       // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题
       menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet());
-      systemMenuTbs = this.buildMenuTree(new ArrayList<>(menus));
+      List<SystemMenuVo> newMenuList = new ArrayList<>(menus);
+      systemMenuTbs = this.buildMenuTree(newMenuList);
     } else {
       systemMenuTbs = this.listMenuByPid(null);
     }
@@ -471,17 +463,6 @@ public class SystemMenuService {
 
   public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception {
     List<SystemMenuTb> systemMenuTbs = this.queryAllMenu(args, false);
-//    KitXlsxExportUtil.exportFile(response, "菜单数据", systemMenuTbs, SystemMenuExportRowVo.class, (dataObject -> {
-//      SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo();
-//      rowVo.setTitle(dataObject.getTitle());
-//      rowVo.setType(dataObject.getType() == null ? "目录" : dataObject.getType() == 1 ? "菜单" : "按钮");
-//      rowVo.setPermission(dataObject.getPermission());
-//      rowVo.setIFrame(dataObject.getIFrame() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR);
-//      rowVo.setHidden(dataObject.getHidden() ? SystemYesOrNoChConst.NO_STR : SystemYesOrNoChConst.YES_STR);
-//      rowVo.setCache(dataObject.getCache() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR);
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    }));
     List<SystemMenuExportRowVo> rowVos = new ArrayList<>();
     for (SystemMenuTb dataObject : systemMenuTbs) {
       SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo();
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java
new file mode 100644
index 00000000..917696ca
--- /dev/null
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java
@@ -0,0 +1,26 @@
+package cn.odboy.system.service;
+
+import cn.odboy.base.KitPageArgs;
+import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
+import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs;
+import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
+import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemOperationLogService {
+
+  @Autowired
+  private SystemOperationLogMapper systemOperationLogMapper;
+
+  public IPage<SystemOperationLogTb> searchUserLog(KitPageArgs<SystemQueryOperationLogArgs> pageArgs) {
+    LambdaQueryWrapper<SystemOperationLogTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemOperationLogTb::getUsername, KitSecurityHelper.getCurrentUsername());
+    Page<SystemOperationLogTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+    return systemOperationLogMapper.selectPage(page, wrapper);
+  }
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
index e0bf5d71..10e66194 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
@@ -17,8 +17,8 @@ package cn.odboy.system.service;
 
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
index bed1e10a..91056c88 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -25,14 +24,17 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemQuartzJobExportRowVo;
-import cn.odboy.system.dal.model.SystemQuartzLogExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
-import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo;
+import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.dal.mysql.SystemQuartzJobMapper;
 import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
 import cn.odboy.system.framework.quartz.QuartzManage;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -77,7 +79,7 @@ public class SystemQuartzJobService {
    * @param args /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void createJob(SystemQuartzJobTb args) {
+  public void createJob(SystemQuartzJobVo args) {
     if (args.getId() != null) {
       throw new BadRequestException("无效参数id");
     }
@@ -86,7 +88,8 @@ public class SystemQuartzJobService {
     if (!CronExpression.isValidExpression(args.getCronExpression())) {
       throw new BadRequestException("cron表达式格式错误");
     }
-    systemQuartzJobMapper.insert(args);
+    SystemQuartzJobTb record = KitBeanUtil.copyToClass(args, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insert(record);
     quartzManage.addJob(args);
   }
 
@@ -108,9 +111,10 @@ public class SystemQuartzJobService {
         throw new BadRequestException("子任务中不能添加当前任务ID");
       }
     }
-    SystemQuartzJobTb quartzJob = BeanUtil.copyProperties(args, SystemQuartzJobTb.class);
-    systemQuartzJobMapper.insertOrUpdate(quartzJob);
-    quartzManage.updateJobCron(quartzJob);
+    SystemQuartzJobTb jobTb = KitBeanUtil.copyToClass(args, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insertOrUpdate(jobTb);
+    SystemQuartzJobVo jobVo = KitBeanUtil.copyToClass(args, SystemQuartzJobVo.class);
+    quartzManage.updateJobCron(jobVo);
   }
 
   /**
@@ -119,7 +123,7 @@ public class SystemQuartzJobService {
    * @param quartzJob /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void switchQuartzJobStatus(SystemQuartzJobTb quartzJob) {
+  public void switchQuartzJobStatus(SystemQuartzJobVo quartzJob) {
     // 置换暂停状态
     if (quartzJob.getIsPause()) {
       quartzManage.resumeJob(quartzJob);
@@ -128,7 +132,8 @@ public class SystemQuartzJobService {
       quartzManage.pauseJob(quartzJob);
       quartzJob.setIsPause(true);
     }
-    systemQuartzJobMapper.insertOrUpdate(quartzJob);
+    SystemQuartzJobTb quartzJobTb = KitBeanUtil.copyToClass(quartzJob, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insertOrUpdate(quartzJobTb);
   }
 
   /**
@@ -136,7 +141,7 @@ public class SystemQuartzJobService {
    *
    * @param quartzJob /
    */
-  public void startQuartzJob(SystemQuartzJobTb quartzJob) {
+  public void startQuartzJob(SystemQuartzJobVo quartzJob) {
     quartzManage.runJobNow(quartzJob);
   }
 
@@ -167,7 +172,7 @@ public class SystemQuartzJobService {
         // 如果是手动清除子任务id, 会出现id为空字符串的问题
         continue;
       }
-      SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(Long.parseLong(id));
+      SystemQuartzJobVo quartzJob = systemQuartzJobMapper.selectVoById(id);
       if (quartzJob == null) {
         // 防止子任务不存在
         continue;
@@ -198,36 +203,27 @@ public class SystemQuartzJobService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args,
-      Page<SystemQuartzJobTb> page) {
+  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, Page<SystemQuartzJobTb> page) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQuartzJobQueryParams(args, wrapper);
     return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper));
   }
 
-  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args,
-      LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName,
-          args.getJobName());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName, args.getJobName());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemQuartzJobTb::getId);
   }
 
-  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args,
-      LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName,
-          args.getJobName());
-      wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName());
+    wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemQuartzLogTb::getId);
   }
@@ -270,31 +266,18 @@ public class SystemQuartzJobService {
     return systemQuartzLogMapper.selectList(wrapper);
   }
 
-  public SystemQuartzJobTb getQuartzJobById(Long id) {
-    return systemQuartzJobMapper.selectById(id);
+  public SystemQuartzJobVo getQuartzJobById(Long id) {
+    return KitBeanUtil.copyToClass(systemQuartzJobMapper.selectById(id), SystemQuartzJobVo.class);
   }
 
-  public List<SystemQuartzJobTb> listEnableQuartzJob() {
+  public List<SystemQuartzJobVo> listEnableQuartzJob() {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemQuartzJobTb::getIsPause, 0);
-    return systemQuartzJobMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemQuartzJobMapper.selectList(wrapper), SystemQuartzJobVo.class);
   }
 
   public void exportQuartzJobXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     List<SystemQuartzJobTb> systemQuartzJobTbs = this.queryQuartzJobByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "定时任务数据", systemQuartzJobTbs, SystemQuartzJobExportRowVo.class,
-//        (dataObject) -> {
-//          SystemQuartzJobExportRowVo rowVo = new SystemQuartzJobExportRowVo();
-//          rowVo.setJobName(dataObject.getJobName());
-//          rowVo.setBeanName(dataObject.getBeanName());
-//          rowVo.setMethodName(dataObject.getMethodName());
-//          rowVo.setParams(dataObject.getParams());
-//          rowVo.setCronExpression(dataObject.getCronExpression());
-//          rowVo.setIsPause(dataObject.getIsPause() ? "暂停中" : "运行中");
-//          rowVo.setDescription(dataObject.getDescription());
-//          rowVo.setCreateTime(dataObject.getCreateTime());
-//          return CollUtil.newArrayList(rowVo);
-//        });
     List<SystemQuartzJobExportRowVo> rowVos = new ArrayList<>();
     for (SystemQuartzJobTb dataObject : systemQuartzJobTbs) {
       SystemQuartzJobExportRowVo rowVo = new SystemQuartzJobExportRowVo();
@@ -313,20 +296,6 @@ public class SystemQuartzJobService {
 
   public void exportQuartzLogXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     List<SystemQuartzLogTb> systemQuartzLogTbs = this.queryQuartzLogByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "定时任务日志数据", systemQuartzLogTbs, SystemQuartzLogExportRowVo.class,
-//        (dataObject) -> {
-//          SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();
-//          rowVo.setJobName(dataObject.getJobName());
-//          rowVo.setBeanName(dataObject.getBeanName());
-//          rowVo.setMethodName(dataObject.getMethodName());
-//          rowVo.setParams(dataObject.getParams());
-//          rowVo.setCronExpression(dataObject.getCronExpression());
-//          rowVo.setExceptionDetail(dataObject.getExceptionDetail());
-//          rowVo.setTime(dataObject.getTime());
-//          rowVo.setStatus(dataObject.getIsSuccess() ? "成功" : "失败");
-//          rowVo.setCreateTime(dataObject.getCreateTime());
-//          return CollUtil.newArrayList(rowVo);
-//        });
     List<SystemQuartzLogExportRowVo> rowVos = new ArrayList<>();
     for (SystemQuartzLogTb dataObject : systemQuartzLogTbs) {
       SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
index a631f3ff..2dde9009 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
@@ -18,8 +18,10 @@ package cn.odboy.system.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleMenuTb;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
 import cn.odboy.system.dal.mysql.SystemMenuMapper;
 import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -46,10 +48,10 @@ public class SystemRoleMenuService {
   }
 
   @Transactional(rollbackFor = Exception.class)
-  public void batchInsertRoleMenu(Set<SystemMenuTb> menus, Long roleId) {
+  public void batchInsertRoleMenu(Set<SystemMenuVo> menus, Long roleId) {
     if (CollUtil.isNotEmpty(menus)) {
       List<SystemRoleMenuTb> records = new ArrayList<>();
-      for (SystemMenuTb menu : menus) {
+      for (SystemMenuVo menu : menus) {
         SystemRoleMenuTb record = new SystemRoleMenuTb();
         record.setMenuId(menu.getId());
         record.setRoleId(roleId);
@@ -68,7 +70,7 @@ public class SystemRoleMenuService {
     }
   }
 
-  public LinkedHashSet<SystemMenuTb> queryMenuByRoleIds(Set<Long> roleIds) {
+  public LinkedHashSet<SystemMenuVo> queryMenuByRoleIds(Set<Long> roleIds) {
     if (CollUtil.isEmpty(roleIds)) {
       return new LinkedHashSet<>();
     }
@@ -84,6 +86,19 @@ public class SystemRoleMenuService {
     // 排除"按钮"
     menuWrapper.ne(SystemMenuTb::getType, 2);
     menuWrapper.orderByAsc(SystemMenuTb::getMenuSort);
-    return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper));
+
+    List<SystemMenuTb> systemMenuTbs = systemMenuMapper.selectList(menuWrapper);
+    List<SystemMenuVo> systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class);
+    return new LinkedHashSet<>(systemMenuVos);
+  }
+
+  @Transactional(rollbackFor = Exception.class)
+  public void deleteRoleMenuByMenuIds(List<Long> menuIds) {
+    if (CollUtil.isEmpty(menuIds)) {
+      return;
+    }
+    LambdaQueryWrapper<SystemRoleMenuTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemRoleMenuTb::getMenuId, menuIds);
+    systemRoleMenuMapper.delete(wrapper);
   }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
index 7092377c..1b953385 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
@@ -15,24 +15,25 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemCreateRoleArgs;
-import cn.odboy.system.dal.model.SystemQueryRoleArgs;
-import cn.odboy.system.dal.model.SystemRoleCodeVo;
-import cn.odboy.system.dal.model.SystemRoleExportRowVo;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.export.SystemRoleExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateRoleArgs;
+import cn.odboy.system.dal.model.request.SystemQueryRoleArgs;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleCodeVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
 import cn.odboy.system.dal.mysql.SystemRoleMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,8 +58,6 @@ public class SystemRoleService {
   @Autowired
   private SystemRoleDeptService systemRoleDeptService;
   @Autowired
-  private SystemUserService systemUserService;
-  @Autowired
   private SystemUserRoleService systemUserRoleService;
 
   /**
@@ -72,7 +71,8 @@ public class SystemRoleService {
     if (this.getRoleByName(args.getName()) != null) {
       throw new BadRequestException("角色名称已存在");
     }
-    systemRoleMapper.insert(BeanUtil.copyProperties(args, SystemRoleTb.class));
+    SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class);
+    systemRoleMapper.insert(roleTb);
     // 判断是否有部门数据, 若有, 则需创建关联
     if (CollectionUtil.isNotEmpty(args.getDepts())) {
       systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId());
@@ -93,7 +93,7 @@ public class SystemRoleService {
   @Transactional(rollbackFor = Exception.class)
   public void updateRoleById(SystemRoleVo args) {
     checkRoleLevels(args.getLevel());
-    SystemRoleVo role = BeanUtil.copyProperties(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class);
+    SystemRoleTb role = this.getRoleTbById(args.getId());
     SystemRoleTb role1 = this.getRoleByName(args.getName());
     if (role1 != null && !role1.getId().equals(role.getId())) {
       throw new BadRequestException("角色名称已存在");
@@ -101,7 +101,6 @@ public class SystemRoleService {
     role.setName(args.getName());
     role.setDescription(args.getDescription());
     role.setDataScope(args.getDataScope());
-    role.setDepts(args.getDepts());
     role.setLevel(args.getLevel());
     // 更新
     systemRoleMapper.insertOrUpdate(role);
@@ -113,19 +112,25 @@ public class SystemRoleService {
     }
   }
 
+  private SystemRoleTb getRoleTbById(Long id) {
+    return systemRoleMapper.selectById(id);
+  }
+
   /**
    * 修改绑定的菜单
    *
    * @param args /
    */
+  @Transactional(rollbackFor = Exception.class)
   public void updateBindMenuById(SystemRoleVo args) {
     SystemRoleTb role = systemRoleMapper.selectById(args.getId());
     checkRoleLevels(role.getLevel());
     // 更新菜单
     systemRoleMenuService.deleteRoleMenuByRoleId(role.getId());
     // 判断是否为空
-    if (CollUtil.isNotEmpty(args.getMenus())) {
-      systemRoleMenuService.batchInsertRoleMenu(args.getMenus(), role.getId());
+    Set<SystemMenuVo> menus = args.getMenus();
+    if (CollUtil.isNotEmpty(menus)) {
+      systemRoleMenuService.batchInsertRoleMenu(menus, role.getId());
     }
   }
 
@@ -165,19 +170,18 @@ public class SystemRoleService {
    * @return /
    */
   public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     // 查询角色基本信息
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+            .like(SystemRoleTb::getDescription, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemRoleTb::getLevel);
-    if (args != null && args.getSize() != null) {
+    if (args.getSize() != null) {
       Page<SystemRoleTb> rolePage = new Page<>(args.getPage(), args.getSize());
       Page<SystemRoleTb> page = systemRoleMapper.selectPage(rolePage, wrapper);
       List<SystemRoleTb> roles = page.getRecords();
@@ -217,7 +221,7 @@ public class SystemRoleService {
       return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
     }
     List<SystemRoleVo> roles = systemUserRoleService.queryRoleByUsersId(user.getId());
-    permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuTb::getPermission)
+    permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuVo::getPermission)
         .filter(StrUtil::isNotBlank).collect(Collectors.toSet());
     return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
   }
@@ -228,21 +232,20 @@ public class SystemRoleService {
    * @param ids /
    */
   public void verifyBindRelationByIds(Set<Long> ids) {
-    if (systemUserService.countUserByRoleIds(ids) > 0) {
+    if (systemUserRoleService.countUserByRoleIds(ids) > 0) {
       throw new BadRequestException("所选角色存在用户关联, 请解除关联再试！");
     }
   }
 
   public Long countRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+            .like(SystemRoleTb::getDescription, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     return systemRoleMapper.selectCount(wrapper);
   }
@@ -255,7 +258,7 @@ public class SystemRoleService {
     return systemUserRoleService.convertToRoleVo(roleTb);
   }
 
-  public Dict getRoleLevel() {
+  public Dict getCurrentUserRoleLevel() {
     return Dict.create().set("level", checkRoleLevels(null));
   }
 
@@ -266,7 +269,7 @@ public class SystemRoleService {
    */
   private int checkRoleLevels(Integer level) {
     List<Integer> levels = systemUserRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream()
-        .map(SystemRoleTb::getLevel).collect(Collectors.toList());
+        .map(SystemRoleVo::getLevel).collect(Collectors.toList());
     int min = Collections.min(levels);
     if (level != null) {
       if (level < min) {
@@ -278,14 +281,6 @@ public class SystemRoleService {
 
   public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) {
     List<SystemRoleVo> systemRoleVos = this.queryRoleByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "角色数据", systemRoleVos, SystemRoleExportRowVo.class, (dataObject) -> {
-//      SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setLevel(dataObject.getLevel());
-//      rowVo.setDescription(dataObject.getDescription());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemRoleExportRowVo> rowVos = new ArrayList<>();
     for (SystemRoleVo dataObject : systemRoleVos) {
       SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
@@ -297,4 +292,8 @@ public class SystemRoleService {
     }
     KitExcelExporter.exportSimple(response, "部门数据", SystemRoleExportRowVo.class, rowVos);
   }
+
+  public List<SystemRoleTb> listByIds(Set<Long> roleIds) {
+    return systemRoleMapper.selectByIds(roleIds);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
index 90c450a6..33ae7628 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
@@ -55,4 +55,25 @@ public class SystemUserJobService {
       systemUserJobMapper.delete(wrapper);
     }
   }
+
+  /**
+   * 根据岗位ID统计用户数量
+   *
+   * @param jobIds 岗位ID集合
+   * @return /
+   */
+  public Long countUserByJobIds(Set<Long> jobIds) {
+    if (CollUtil.isEmpty(jobIds)) {
+      return 0L;
+    }
+    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemUserJobTb::getJobId, jobIds);
+    return systemUserJobMapper.selectCount(wrapper);
+  }
+
+  public List<SystemUserJobTb> listUserJobByUserId(Long userId) {
+    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemUserJobTb::getUserId, userId);
+    return systemUserJobMapper.selectList(wrapper);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
index b2424f97..e389bda9 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
@@ -15,18 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserRoleTb;
-import cn.odboy.system.dal.model.SystemRoleVo;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.mysql.SystemRoleMapper;
 import cn.odboy.system.dal.mysql.SystemUserRoleMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -84,10 +84,9 @@ public class SystemUserRoleService {
     if (role == null) {
       return null;
     }
-    SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class);
+    SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class);
     // 查询关联的菜单信息
-    Set<SystemMenuTb> menus = systemRoleMenuService.queryMenuByRoleIds(
-        Collections.singleton(role.getId()));
+    Set<SystemMenuVo> menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId()));
     roleVo.setMenus(menus);
 
     // 查询关联的部门信息
@@ -141,10 +140,25 @@ public class SystemUserRoleService {
   public void checkLevel(SystemUserVo args) {
     Integer currentLevel = Collections.min(
         this.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream()
-            .map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+            .map(SystemRoleVo::getLevel).collect(Collectors.toList()));
     Integer optLevel = this.getDeptLevelByRoles(args.getRoles());
     if (currentLevel > optLevel) {
       throw new BadRequestException("角色权限不足");
     }
   }
+
+  public List<SystemUserRoleTb> listUserRoleByUserId(Long userId) {
+    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemUserRoleTb::getUserId, userId);
+    return systemUserRoleMapper.selectList(wrapper);
+  }
+
+  public long countUserByRoleIds(Set<Long> ids) {
+    if (CollUtil.isEmpty(ids)) {
+      return 0L;
+    }
+    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemUserRoleTb::getRoleId, ids);
+    return systemUserRoleMapper.selectCount(wrapper);
+  }
 }
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
index 67e11fe4..3187f273 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -27,28 +26,26 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
 import cn.odboy.system.constant.SystemZhConst;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserJobTb;
 import cn.odboy.system.dal.dataobject.SystemUserRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemQueryUserArgs;
-import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
-import cn.odboy.system.dal.model.SystemUserExportRowVo;
-import cn.odboy.system.dal.model.SystemUserVo;
-import cn.odboy.system.dal.mysql.SystemDeptMapper;
-import cn.odboy.system.dal.mysql.SystemJobMapper;
-import cn.odboy.system.dal.mysql.SystemRoleMapper;
-import cn.odboy.system.dal.mysql.SystemUserJobMapper;
+import cn.odboy.system.dal.model.export.SystemUserExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.mysql.SystemUserMapper;
-import cn.odboy.system.dal.mysql.SystemUserRoleMapper;
 import cn.odboy.system.dal.redis.SystemUserInfoDAO;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.KitRsaEncryptUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -78,11 +75,11 @@ public class SystemUserService {
   @Autowired
   private SystemUserMapper systemUserMapper;
   @Autowired
-  private SystemJobMapper systemJobMapper;
+  private SystemJobService systemJobService;
   @Autowired
-  private SystemRoleMapper systemRoleMapper;
+  private SystemRoleService systemRoleService;
   @Autowired
-  private SystemDeptMapper systemDeptMapper;
+  private SystemDeptService systemDeptService;
   @Autowired
   private SystemUserJobService systemUserJobService;
   @Autowired
@@ -90,8 +87,6 @@ public class SystemUserService {
   @Autowired
   private SystemEmailService systemEmailService;
   @Autowired
-  private SystemDeptService systemDeptService;
-  @Autowired
   private SystemDataService systemDataService;
   @Autowired
   private SystemUserInfoDAO systemUserInfoDAO;
@@ -100,10 +95,6 @@ public class SystemUserService {
   @Autowired
   private KitFileLocalUploadHelper fileUploadPathHelper;
   @Autowired
-  private SystemUserJobMapper systemUserJobMapper;
-  @Autowired
-  private SystemUserRoleMapper systemUserRoleMapper;
-  @Autowired
   private AppProperties properties;
   @Autowired
   private PasswordEncoder passwordEncoder;
@@ -166,7 +157,6 @@ public class SystemUserService {
     user.setUsername(args.getUsername());
     user.setEmail(args.getEmail());
     user.setEnabled(args.getEnabled());
-    user.setDept(args.getDept());
     user.setPhone(args.getPhone());
     user.setNickName(args.getNickName());
     user.setGender(args.getGender());
@@ -209,15 +199,15 @@ public class SystemUserService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeUserByIds(Set<Long> ids) {
+  public void deleteUserByIds(Set<Long> ids) {
     Long currentUserId = KitSecurityHelper.getCurrentUserId();
     // 校验权限
     for (Long id : ids) {
       Integer currentLevel = Collections.min(
           systemUserRoleService.queryRoleByUsersId(currentUserId).stream()
-              .map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+              .map(SystemRoleVo::getLevel).collect(Collectors.toList()));
       Integer optLevel = Collections.min(
-          systemUserRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel)
+          systemUserRoleService.queryRoleByUsersId(id).stream().map(SystemRoleVo::getLevel)
               .collect(Collectors.toList()));
       if (currentLevel > optLevel) {
         throw new BadRequestException(
@@ -405,36 +395,6 @@ public class SystemUserService {
     }).collect(Collectors.toList());
   }
 
-  /**
-   * 根据岗位ID统计用户数量
-   *
-   * @param jobIds 岗位ID集合
-   * @return /
-   */
-  public Long countUserByJobIds(Set<Long> jobIds) {
-    if (CollUtil.isEmpty(jobIds)) {
-      return 0L;
-    }
-    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.in(SystemUserJobTb::getJobId, jobIds);
-    return systemUserJobMapper.selectCount(wrapper);
-  }
-
-  /**
-   * 根据角色ID统计用户数量
-   *
-   * @param roleIds 角色ID集合
-   * @return /
-   */
-  public Long countUserByRoleIds(Set<Long> roleIds) {
-    if (CollUtil.isEmpty(roleIds)) {
-      return 0L;
-    }
-    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.in(SystemUserRoleTb::getRoleId, roleIds);
-    return systemUserRoleMapper.selectCount(wrapper);
-  }
-
   /**
    * 构建用户查询条件
    *
@@ -442,26 +402,25 @@ public class SystemUserService {
    * @return /
    */
   private LambdaQueryWrapper<SystemUserTb> buildUserQueryWrapper(SystemQueryUserArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      if (args.getId() != null) {
-        wrapper.eq(SystemUserTb::getId, args.getId());
-      }
-      if (args.getEnabled() != null) {
-        wrapper.eq(SystemUserTb::getEnabled, args.getEnabled());
-      }
-      if (CollUtil.isNotEmpty(args.getDeptIds())) {
-        wrapper.in(SystemUserTb::getDeptId, args.getDeptIds());
-      }
-      if (StrUtil.isNotBlank(args.getBlurry())) {
-        wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry())
-            .or().like(SystemUserTb::getNickName, args.getBlurry())
-            .or().like(SystemUserTb::getEmail, args.getBlurry()));
-      }
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    if (args.getId() != null) {
+      wrapper.eq(SystemUserTb::getId, args.getId());
+    }
+    if (args.getEnabled() != null) {
+      wrapper.eq(SystemUserTb::getEnabled, args.getEnabled());
+    }
+    if (CollUtil.isNotEmpty(args.getDeptIds())) {
+      wrapper.in(SystemUserTb::getDeptId, args.getDeptIds());
+    }
+    if (StrUtil.isNotBlank(args.getBlurry())) {
+      wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry())
+          .or().like(SystemUserTb::getNickName, args.getBlurry())
+          .or().like(SystemUserTb::getEmail, args.getBlurry()));
+    }
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemUserTb::getCreateTime);
     return wrapper;
@@ -477,28 +436,24 @@ public class SystemUserService {
     if (user == null) {
       return null;
     }
-    SystemUserVo userVo = BeanUtil.copyProperties(user, SystemUserVo.class);
+    SystemUserVo userVo = KitBeanUtil.copyToClass(user, SystemUserVo.class);
     // 查询关联的部门信息
     if (user.getDeptId() != null) {
-      SystemDeptTb dept = systemDeptMapper.selectById(user.getDeptId());
+      SystemDeptVo dept = systemDeptService.getDeptVoById(user.getDeptId());
       userVo.setDept(dept);
     }
     // 查询关联的岗位信息
-    LambdaQueryWrapper<SystemUserJobTb> jobWrapper = new LambdaQueryWrapper<>();
-    jobWrapper.eq(SystemUserJobTb::getUserId, user.getId());
-    List<SystemUserJobTb> userJobs = systemUserJobMapper.selectList(jobWrapper);
+    List<SystemUserJobTb> userJobs = systemUserJobService.listUserJobByUserId(user.getId());
     if (CollUtil.isNotEmpty(userJobs)) {
       Set<Long> jobIds = userJobs.stream().map(SystemUserJobTb::getJobId).collect(Collectors.toSet());
-      List<SystemJobTb> jobs = systemJobMapper.selectByIds(jobIds);
+      List<SystemJobTb> jobs = systemJobService.listByIds(jobIds);
       userVo.setJobs(new LinkedHashSet<>(jobs));
     }
     // 查询关联的角色信息
-    LambdaQueryWrapper<SystemUserRoleTb> roleWrapper = new LambdaQueryWrapper<>();
-    roleWrapper.eq(SystemUserRoleTb::getUserId, user.getId());
-    List<SystemUserRoleTb> userRoles = systemUserRoleMapper.selectList(roleWrapper);
+    List<SystemUserRoleTb> userRoles = systemUserRoleService.listUserRoleByUserId(user.getId());
     if (CollUtil.isNotEmpty(userRoles)) {
       Set<Long> roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet());
-      List<SystemRoleTb> roles = systemRoleMapper.selectByIds(roleIds);
+      List<SystemRoleTb> roles = systemRoleService.listByIds(roleIds);
       userVo.setRoles(new LinkedHashSet<>(roles));
     }
     return userVo;
@@ -533,13 +488,12 @@ public class SystemUserService {
     if (!ObjectUtils.isEmpty(args.getDeptId())) {
       args.getDeptIds().add(args.getDeptId());
       // 先查找是否存在子节点
-      List<SystemDeptTb> data = systemDeptService.listDeptByPid(args.getDeptId());
+      List<SystemDeptVo> data = systemDeptService.listDeptByPid(args.getDeptId());
       // 然后把子节点的ID都加入到集合中
       args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data));
     }
     // 数据权限
-    List<Long> dataScopes = systemDataService.queryDeptIdByArgs(
-        this.getUserByUsername(currentUsername));
+    List<Long> dataScopes = systemDataService.queryDeptIdByArgs(this.getUserVoByUsername(currentUsername));
     // args.getDeptIds() 不为空并且数据权限不为空则取交集
     if (!CollectionUtils.isEmpty(args.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
       // 取交集
@@ -556,35 +510,6 @@ public class SystemUserService {
   }
 
   public void exportUserXlsx(HttpServletResponse response, SystemQueryUserArgs args) {
-    //    List<SystemUserVo> systemUserVos = systemUserService.queryUserVoByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "用户数据", systemUserVos, SystemUserExportRowVo.class, (dataObject) -> {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
-//    List<SystemUserExportRowVo> rowVos = new ArrayList<>();
-//    for (SystemUserVo dataObject : systemUserVos) {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      rowVos.add(rowVo);
-//    }
-//    KitExcelExporter.exportSimple(response, "用户数据", SystemUserExportRowVo.class, rowVos);
     long totalCount = this.countUserByArgs(args);
     KitExcelExporter.exportByPage(response, "用户数据", SystemUserExportRowVo.class, totalCount, (long pageNum, long pageSize) -> {
       KitPageResult<SystemUserVo> pageResult = this.searchUserByArgs(args, new Page<>(pageNum, pageSize));
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
index 4fdd02be..143a32b1 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
@@ -24,15 +23,17 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.properties.model.StorageOSSModel;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageExportRowVo;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
 import cn.odboy.system.dal.mysql.SystemOssStorageMapper;
 import cn.odboy.system.framework.storage.minio.MinioRepository;
 import cn.odboy.system.service.SystemOssStorageService;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitDateUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -68,33 +69,27 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
   private SystemOssStorageMapper systemOssStorageMapper;
 
   @Override
-  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args,
-      Page<SystemOssStorageTb> page) {
-    IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(args, page);
-    IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
-      SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class);
+  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
+    IPage<SystemOssStorageVo> ossStorageTbs = this.selectOssStorageByArgs(args, page);
+    for (SystemOssStorageVo storageVo : ossStorageTbs.getRecords()) {
       storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize()));
-      return storageVo;
-    });
-    return KitPageUtil.toPage(convert);
+    }
+    return KitPageUtil.toPage(ossStorageTbs);
   }
 
-  private IPage<SystemOssStorageTb> selectOssStorageByArgs(SystemQueryStorageArgs args,
-      Page<SystemOssStorageTb> page) {
+  private IPage<SystemOssStorageVo> selectOssStorageByArgs(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemOssStorageTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMd5, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFileMd5, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemOssStorageTb::getId);
-    return systemOssStorageMapper.selectPage(page, wrapper);
+    return systemOssStorageMapper.selectPage(page, wrapper).convert(i -> KitBeanUtil.copyToClass(i, SystemOssStorageVo.class));
   }
 
   @Override
@@ -157,8 +152,8 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
   public void exportOssStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) {
     List<SystemOssStorageVo> systemOssStorageVos = this.queryOssStorage(args);
 //    KitXlsxExportUtil.exportFile(response, "OSS文件上传记录数据", systemOssStorageVos, SystemOssStorageExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemOssStorageExportRowVo.class)));
-    List<SystemOssStorageExportRowVo> rowVos = BeanUtil.copyToList(systemOssStorageVos, SystemOssStorageExportRowVo.class);
+//        (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemOssStorageExportRowVo.class)));
+    List<SystemOssStorageExportRowVo> rowVos = KitBeanUtil.copyToList(systemOssStorageVos, SystemOssStorageExportRowVo.class);
     KitExcelExporter.exportSimple(response, "OSS文件上传记录数据", SystemOssStorageExportRowVo.class, rowVos);
   }
 
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
index 0d443168..4c08c8a6 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
+++ b/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
@@ -34,6 +34,9 @@ import java.util.List;
 import javax.sql.DataSource;
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * 不建议在生产环境使用
+ */
 @Slf4j
 public final class KitSqlUtil {
 
diff --git a/cutejava-springboot3/cutejava-starter/pom.xml b/cutejava-springboot3/cutejava-starter/pom.xml
index 66140fff..529b84ff 100644
--- a/cutejava-springboot3/cutejava-starter/pom.xml
+++ b/cutejava-springboot3/cutejava-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-module-system</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
   </dependencies>
 
diff --git a/cutejava-springboot3/cutejava-starter/src/main/resources/banner.txt b/cutejava-springboot3/cutejava-starter/src/main/resources/banner.txt
index b6fb25a2..08ff90a3 100644
--- a/cutejava-springboot3/cutejava-starter/src/main/resources/banner.txt
+++ b/cutejava-springboot3/cutejava-starter/src/main/resources/banner.txt
@@ -5,4 +5,4 @@
 | |___  | |_| |   | |   | |___  | |_| |  / /  | | | |/ /     / /  | |
 \_____| \_____/   |_|   |_____| \_____/ /_/   |_| |___/     /_/   |_|
 
-Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.4.1)
\ No newline at end of file
+Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.5.0)
\ No newline at end of file
diff --git a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
index 8ec5f6d7..c9e6daeb 100644
--- a/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
+++ b/cutejava-springboot3/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package cn.odboy;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.service.SystemUserService;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
@@ -36,19 +35,19 @@ public class SystemApplicationTests {
   @Autowired
   private SystemUserService systemUserService;
 
+  public static void main(String[] args) {
+  }
+
   @Test
   public void contextLoads() {
-    SystemDeptTb systemDept = new SystemDeptTb();
+    SystemDeptVo systemDept = new SystemDeptVo();
     systemDept.setId(2L);
-
     SystemJobTb systemJob = new SystemJobTb();
     systemJob.setId(11L);
     Set<SystemJobTb> systemJobs = CollUtil.newHashSet(systemJob);
-
     SystemRoleTb systemRole = new SystemRoleTb();
     systemRole.setId(2L);
     Set<SystemRoleTb> systemRoles = CollUtil.newHashSet(systemRole);
-
     String pwd = passwordEncoder.encode("123456");
     for (int i = 100; i < 200; i++) {
       SystemUserVo systemUser = new SystemUserVo();
@@ -64,4 +63,3 @@ public class SystemApplicationTests {
     }
   }
 }
-
diff --git a/cutejava-springboot3/pom.xml b/cutejava-springboot3/pom.xml
index 1ab0ebf8..d845252e 100644
--- a/cutejava-springboot3/pom.xml
+++ b/cutejava-springboot3/pom.xml
@@ -5,7 +5,7 @@
   <groupId>cn.odboy</groupId>
   <artifactId>cutejava</artifactId>
   <packaging>pom</packaging>
-  <version>1.4.1</version>
+  <version>1.5.0</version>
 
   <modules>
     <!-- 基础设施 -->
diff --git a/cutejava/cutejava-framework/pom.xml b/cutejava/cutejava-framework/pom.xml
index fdfa62b9..62c745fc 100644
--- a/cutejava/cutejava-framework/pom.xml
+++ b/cutejava/cutejava-framework/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-framework</artifactId>
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
index 0ba9e06b..4a6fedb3 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/context/KitSpringBeanHolder.java
@@ -18,6 +18,7 @@ package cn.odboy.framework.context;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
@@ -27,7 +28,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 @Slf4j
-@SuppressWarnings({"unchecked", "all"})
 public class KitSpringBeanHolder implements ApplicationContextAware, DisposableBean {
 
   private static final List<CallBack> CALL_BACKS = new ArrayList<>();
@@ -135,7 +135,7 @@ public class KitSpringBeanHolder implements ApplicationContextAware, DisposableB
   }
 
   @Override
-  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+  public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
     if (KitSpringBeanHolder.applicationContext != null) {
       log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" +
           KitSpringBeanHolder.applicationContext);
@@ -150,7 +150,7 @@ public class KitSpringBeanHolder implements ApplicationContextAware, DisposableB
     KitSpringBeanHolder.addCallback = false;
   }
 
-  interface CallBack {
+  public interface CallBack {
 
     /**
      * 回调执行方法
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
index 0e3f5307..90dd1349 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/doc/SwaggerConfig.java
@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.NonNull;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -67,11 +68,10 @@ public class SwaggerConfig {
    * @return /
    */
   @Bean
-  @SuppressWarnings({"unchecked", "all"})
   public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
     return new BeanPostProcessor() {
       @Override
-      public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+      public Object postProcessAfterInitialization(@NonNull Object bean, @NonNull String beanName) throws BeansException {
         if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
           customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
         }
@@ -111,7 +111,7 @@ public class SwaggerConfig {
 
   private ApiInfo apiInfo() {
     return new ApiInfoBuilder().description("一个简单且易上手的自动化运维平台").title("CuteJava 接口文档")
-        .version("1.4.1").build();
+        .version("1.5.0").build();
   }
 
   private List<SecurityScheme> securitySchemes() {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
index a2397e62..852c229c 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 统计执行时长
+ * 统计执行时长（仅对代理方法有效）
  *
  * @author odboy
  */
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
index b39f078d..7668667e 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/DataTypeEnum.java
@@ -16,13 +16,11 @@
 package cn.odboy.framework.mybatisplus.config;
 
 import cn.odboy.framework.exception.BadRequestException;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-/**
- * @author /
- */
+@Getter
 @Slf4j
-@SuppressWarnings({"unchecked", "all"})
 public enum DataTypeEnum {
   /**
    * mysql
@@ -85,13 +83,13 @@ public enum DataTypeEnum {
    */
   IMPALA("impala", "impala", "com.cloudera.impala.jdbc41.Driver", "", "", "'", "'");
   private static final String JDBC_URL_PREFIX = "jdbc:";
-  private String feature;
-  private String desc;
-  private String driver;
-  private String keywordPrefix;
-  private String keywordSuffix;
-  private String aliasPrefix;
-  private String aliasSuffix;
+  private final String feature;
+  private final String desc;
+  private final String driver;
+  private final String keywordPrefix;
+  private final String keywordSuffix;
+  private final String aliasPrefix;
+  private final String aliasSuffix;
 
   DataTypeEnum(String feature, String desc, String driver, String keywordPrefix, String keywordSuffix,
       String aliasPrefix, String aliasSuffix) {
@@ -109,10 +107,7 @@ public enum DataTypeEnum {
     for (DataTypeEnum dataTypeEnum : values()) {
       if (url.startsWith(JDBC_URL_PREFIX + dataTypeEnum.feature)) {
         try {
-          Class<?> aClass = Class.forName(dataTypeEnum.getDriver());
-          if (null == aClass) {
-            throw new BadRequestException("Unable to get driver instance for jdbcUrl: " + jdbcUrl);
-          }
+          Class.forName(dataTypeEnum.getDriver());
         } catch (ClassNotFoundException e) {
           throw new BadRequestException("Unable to get driver instance: " + jdbcUrl);
         }
@@ -122,31 +117,4 @@ public enum DataTypeEnum {
     return null;
   }
 
-  public String getFeature() {
-    return feature;
-  }
-
-  public String getDesc() {
-    return desc;
-  }
-
-  public String getDriver() {
-    return driver;
-  }
-
-  public String getKeywordPrefix() {
-    return keywordPrefix;
-  }
-
-  public String getKeywordSuffix() {
-    return keywordSuffix;
-  }
-
-  public String getAliasPrefix() {
-    return aliasPrefix;
-  }
-
-  public String getAliasSuffix() {
-    return aliasSuffix;
-  }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
index 2247f06f..fd66c1f5 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/RemoveDruidAdConfig.java
@@ -35,7 +35,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@SuppressWarnings({"unchecked", "all"})
 @ConditionalOnWebApplication
 @AutoConfigureAfter(DruidDataSourceAutoConfigure.class)
 @ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true",
@@ -49,7 +48,7 @@ public class RemoveDruidAdConfig {
    * @return org.springframework.boot.web.servlet.FilterRegistrationBean
    */
   @Bean
-  public FilterRegistrationBean removeDruidAdFilterRegistrationBean(DruidStatProperties properties) {
+  public FilterRegistrationBean<Filter> removeDruidAdFilterRegistrationBean(DruidStatProperties properties) {
     // 获取web监控页面的参数
     DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
     // 提取common.js的配置路径
@@ -85,7 +84,7 @@ public class RemoveDruidAdConfig {
       public void destroy() {
       }
     };
-    FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+    FilterRegistrationBean<Filter> registrationBean = new FilterRegistrationBean<>();
     registrationBean.setFilter(filter);
     registrationBean.addUrlPatterns(commonJsPattern);
     return registrationBean;
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
index 96e5bd87..efa02dd6 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/KitMpAnyQUtil.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.framework.mybatisplus.core;
 
-import cn.hutool.core.bean.BeanUtil;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,7 +41,7 @@ public class KitMpAnyQUtil {
     if (mapperTarget == null) {
       return null;
     }
-    return BeanUtil.copyProperties(mapperTarget, mapperClazz);
+    return KitBeanUtil.copyToClass(mapperTarget, mapperClazz);
   }
 
   public static <T> List<T> selectList(BaseMapper<T> baseMapper, Object queryParams) {
@@ -55,7 +55,7 @@ public class KitMpAnyQUtil {
     if (mapperTarget == null) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(mapperTarget, mapperClazz);
+    return KitBeanUtil.copyToList(mapperTarget, mapperClazz);
   }
 
   public static <T> Long selectCount(BaseMapper<T> baseMapper, Object queryParams) {
@@ -73,7 +73,7 @@ public class KitMpAnyQUtil {
     QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
     Page<T> tPage = baseMapper.selectPage(page, queryWrapper);
     Page<M> mapperTarget = new Page<>();
-    mapperTarget.setRecords(BeanUtil.copyToList(tPage.getRecords(), mapperClazz));
+    mapperTarget.setRecords(KitBeanUtil.copyToList(tPage.getRecords(), mapperClazz));
     mapperTarget.setTotal(tPage.getTotal());
     mapperTarget.setSize(tPage.getSize());
     mapperTarget.setCurrent(tPage.getCurrent());
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
index 9ddaf900..2bd4a2c9 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpMapper.java
@@ -15,10 +15,10 @@
  */
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.odboy.base.KitPageResult;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -110,7 +110,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(list)) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(list, clazz);
+    return KitBeanUtil.copyToList(list, clazz);
   }
 
   /**
@@ -125,7 +125,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(list)) {
       return new ArrayList<>();
     }
-    return BeanUtil.copyToList(list, clazz);
+    return KitBeanUtil.copyToList(list, clazz);
   }
 
   /**
@@ -146,7 +146,7 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (CollUtil.isEmpty(pageInfo.getRecords())) {
       return new KitPageResult<>(new ArrayList<>(), pageInfo.getTotal());
     }
-    return new KitPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+    return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
   }
 
   /**
@@ -165,9 +165,9 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     pageSize = pageSize <= 0 ? 10 : pageSize;
     IPage<E> pageInfo = wrapper.page(new Page<>(pageNumber, pageSize));
     if (CollUtil.isEmpty(pageInfo.getRecords())) {
-      return KitPageUtil.emptyListData();
+      return KitPageUtil.emptyData();
     }
-    return new KitPageResult<>(BeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
+    return new KitPageResult<>(KitBeanUtil.copyToList(pageInfo.getRecords(), clazz), pageInfo.getTotal());
   }
 
   /**
@@ -182,6 +182,6 @@ public interface KitMpMapper<E> extends BaseMapper<E> {
     if (e == null) {
       return null;
     }
-    return BeanUtil.copyProperties(e, clazz);
+    return KitBeanUtil.copyToClass(e, clazz);
   }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
index a51853bc..9be39c97 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/KitMpServiceImpl.java
@@ -15,11 +15,11 @@
  */
 package cn.odboy.framework.mybatisplus.core.interfaces;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.mybatisplus.core.KitMpQUtil;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.enums.SqlMethod;
@@ -45,7 +45,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int saveFeatureClazz(G resources) {
-    return getBaseMapper().insert(BeanUtil.copyProperties(resources, this.getEntityClass()));
+    return getBaseMapper().insert(KitBeanUtil.copyToClass(resources, this.getEntityClass()));
   }
 
   /**
@@ -54,7 +54,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int saveFeatureClazzList(List<G> resources) {
-    return getBaseMapper().insertBatchSomeColumn(BeanUtil.copyToList(resources, this.getEntityClass()));
+    return getBaseMapper().insertBatchSomeColumn(KitBeanUtil.copyToList(resources, this.getEntityClass()));
   }
 
   /**
@@ -63,7 +63,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    * @param resources /
    */
   public <G> int modifyFeatureClazzById(G resources) {
-    return getBaseMapper().updateById(BeanUtil.copyProperties(resources, this.getEntityClass()));
+    return getBaseMapper().updateById(KitBeanUtil.copyToClass(resources, this.getEntityClass()));
   }
 
   /**
@@ -76,7 +76,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     String sqlStatement = this.getSqlStatement(SqlMethod.UPDATE_BY_ID);
     return this.executeBatch(resources, batchSize, (sqlSession, entity) -> {
       MapperMethod.ParamMap<T> param = new MapperMethod.ParamMap<>();
-      param.put("et", BeanUtil.copyProperties(entity, this.getEntityClass()));
+      param.put("et", KitBeanUtil.copyToClass(entity, this.getEntityClass()));
       sqlSession.update(sqlStatement, param);
     });
   }
@@ -89,7 +89,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    */
   public <G> G queryFeatureClazzById(Serializable id, Class<G> targetClazz) {
     T entity = this.getById(id);
-    return entity == null ? null : BeanUtil.copyProperties(entity, targetClazz);
+    return entity == null ? null : KitBeanUtil.copyToClass(entity, targetClazz);
   }
 
   /**
@@ -126,7 +126,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     if (ts.isEmpty()) {
       return null;
     }
-    return BeanUtil.copyProperties(ts.stream().findFirst().get(), clazz);
+    return KitBeanUtil.copyToClass(ts.stream().findFirst().get(), clazz);
   }
 
   /**
@@ -137,8 +137,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
    */
   public <G> List<G> queryFeatureClazzListByIds(List<Serializable> ids, Class<G> targetClazz) {
     List<T> entitys = this.listByIds(ids);
-    return entitys == null || entitys.isEmpty() ? CollUtil.newArrayList()
-        : BeanUtil.copyToList(entitys, targetClazz);
+    return entitys == null || entitys.isEmpty() ? CollUtil.newArrayList() : KitBeanUtil.copyToList(entitys, targetClazz);
   }
 
   /**
@@ -172,7 +171,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
   public <G, Q> List<G> queryFeatureClazzListByArgs(Q args, Class<G> targetClazz) {
     QueryWrapper<T> predicate = KitMpQUtil.build(args);
     List<T> data = baseMapper.selectList(predicate);
-    return BeanUtil.copyToList(data, targetClazz);
+    return KitBeanUtil.copyToList(data, targetClazz);
   }
 
   /**
@@ -185,7 +184,7 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
     if (wrapper == null) {
       wrapper = new LambdaQueryWrapper<>();
     }
-    return BeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz);
+    return KitBeanUtil.copyToList(baseMapper.selectList(wrapper), targetClazz);
   }
 
   /**
@@ -215,14 +214,14 @@ public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M
       wrapper = new LambdaQueryWrapper<>();
     }
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-    return new KitPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz),
+    return new KitPageResult<>(KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz),
         originPageData.getTotal());
   }
 
   public <G, Q> KitPageResult<G> queryFeatureClazzPageByArgs(Q args, IPage<T> pageable, Class<G> targetClazz) {
     QueryWrapper<T> wrapper = KitMpQUtil.build(args);
     IPage<T> originPageData = baseMapper.selectPage(pageable, wrapper);
-    return new KitPageResult<>(BeanUtil.copyToList(originPageData.getRecords(), targetClazz),
+    return new KitPageResult<>(KitBeanUtil.copyToList(originPageData.getRecords(), targetClazz),
         originPageData.getTotal());
   }
 
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
index 04ebfe66..109284ef 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/quartz/core/QuartzRunnable.java
@@ -44,13 +44,12 @@ public class QuartzRunnable implements Callable<Object> {
   }
 
   @Override
-  @SuppressWarnings({"unchecked", "all"})
   public Object call() throws Exception {
     ReflectionUtils.makeAccessible(method);
     if (StringUtils.isNotBlank(params)) {
       return method.invoke(target, params);
     } else {
-      return method.invoke(target);
+      return method.invoke(target, "");
     }
   }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
index 65f696b5..8778c4ff 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/KitRedisHelper.java
@@ -35,7 +35,6 @@ import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.ConvertingCursor;
 import org.springframework.data.redis.core.Cursor;
-import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisConnectionUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ScanOptions;
@@ -43,11 +42,10 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 
 @Component
-@SuppressWarnings({"unchecked", "all"})
 public class KitRedisHelper {
 
   private static final Logger log = LoggerFactory.getLogger(KitRedisHelper.class);
-  private RedisTemplate<Object, Object> redisTemplate;
+  private final RedisTemplate<Object, Object> redisTemplate;
 
   public KitRedisHelper(RedisTemplate<Object, Object> redisTemplate) {
     this.redisTemplate = redisTemplate;
@@ -98,7 +96,7 @@ public class KitRedisHelper {
    * @param key 键 不能为null
    * @return 时间(秒) 返回0代表为永久有效
    */
-  public long getExpire(Object key) {
+  public Long getExpire(Object key) {
     return redisTemplate.getExpire(key, TimeUnit.SECONDS);
   }
 
@@ -112,10 +110,12 @@ public class KitRedisHelper {
     ScanOptions options = ScanOptions.scanOptions().match(pattern).build();
     RedisConnectionFactory factory = redisTemplate.getConnectionFactory();
     RedisConnection rc = Objects.requireNonNull(factory).getConnection();
-    Cursor<byte[]> cursor = rc.scan(options);
-    List<String> result = new ArrayList<>();
-    while (cursor.hasNext()) {
-      result.add(new String(cursor.next()));
+    List<String> result;
+    try (Cursor<byte[]> cursor = rc.scan(options)) {
+      result = new ArrayList<>();
+      while (cursor.hasNext()) {
+        result.add(new String(cursor.next()));
+      }
     }
     try {
       RedisConnectionUtils.releaseConnection(rc, factory);
@@ -171,7 +171,7 @@ public class KitRedisHelper {
    */
   public boolean hasKey(String key) {
     try {
-      return redisTemplate.hasKey(key);
+      return Boolean.TRUE.equals(redisTemplate.hasKey(key));
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return false;
@@ -181,27 +181,23 @@ public class KitRedisHelper {
   /**
    * 删除缓存
    *
-   * @param key 可以传一个值 或多个
+   * @param keys 可以传一个值 或多个
    */
   public void del(String... keys) {
     if (keys != null && keys.length > 0) {
       if (keys.length == 1) {
-        boolean result = redisTemplate.delete(keys[0]);
-        log.debug("--------------------------------------------");
-        log.debug(new StringBuilder("删除缓存：").append(keys[0]).append(", 结果：").append(result).toString());
-        log.debug("--------------------------------------------");
+        boolean result = Boolean.TRUE.equals(redisTemplate.delete(keys[0]));
+        log.debug("删除缓存：{}, 结果：{}", keys[0], result);
       } else {
         Set<Object> keySet = new HashSet<>();
         for (String key : keys) {
-          if (redisTemplate.hasKey(key)) {
+          if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
             keySet.add(key);
           }
         }
-        long count = redisTemplate.delete(keySet);
-        log.debug("--------------------------------------------");
-        log.debug("成功删除缓存：" + keySet.toString());
-        log.debug("缓存删除数量：" + count + "个");
-        log.debug("--------------------------------------------");
+        Long count = redisTemplate.delete(keySet);
+        log.debug("成功删除缓存：{}", keySet);
+        log.debug("缓存删除数量：{}个", count);
       }
     }
   }
@@ -209,16 +205,34 @@ public class KitRedisHelper {
   /**
    * 批量模糊删除key
    *
-   * @param pattern
+   * @param pattern /
    */
   public void scanDel(String pattern) {
-    ScanOptions options = ScanOptions.scanOptions().match(pattern).build();
-    try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(
-        (RedisCallback<Cursor<byte[]>>) connection -> (Cursor<byte[]>) new ConvertingCursor<>(
-            connection.scan(options), redisTemplate.getKeySerializer()::deserialize))) {
-      while (cursor.hasNext()) {
-        redisTemplate.delete(cursor.next());
+    ScanOptions options = ScanOptions.scanOptions().match(pattern).count(100).build();
+    try (Cursor<byte[]> cursor = redisTemplate.executeWithStickyConnection(connection -> {
+      try {
+        return (Cursor<byte[]>) new ConvertingCursor<>(
+            connection.scan(options), redisTemplate.getKeySerializer()::deserialize);
+      } catch (Exception e) {
+        throw new RuntimeException("Redis scan operation failed", e);
       }
+    })) {
+      List<Object> keysToDelete = new ArrayList<>();
+      while (cursor.hasNext()) {
+        Object key = cursor.next();
+        keysToDelete.add(key);
+        // 批量删除，避免一次性删除过多key
+        if (keysToDelete.size() >= 100) {
+          redisTemplate.delete(keysToDelete);
+          keysToDelete.clear();
+        }
+      }
+      // 删除剩余的key
+      if (!keysToDelete.isEmpty()) {
+        redisTemplate.delete(keysToDelete);
+      }
+    } catch (Exception e) {
+      throw new RuntimeException("Error during scan and delete operation", e);
     }
   }
   // ============================String=============================
@@ -244,7 +258,7 @@ public class KitRedisHelper {
     if (value == null) {
       return null;
     }
-    // 如果 value 不是目标类型, 则尝试将其反序列化为 clazz 类型 by
+    // 如果 value 不是目标类型, 则尝试将其反序列化为 clazz 类型
     if (!clazz.isInstance(value)) {
       return JSON.parseObject(value.toString(), clazz);
     } else if (clazz.isInstance(value)) {
@@ -301,8 +315,8 @@ public class KitRedisHelper {
    * @return
    */
   public List<Object> multiGet(List<String> keys) {
-    List list = redisTemplate.opsForValue().multiGet(Sets.newHashSet(keys));
-    List resultList = Lists.newArrayList();
+    List<Object> list = redisTemplate.opsForValue().multiGet(Sets.newHashSet(keys));
+    List<Object> resultList = Lists.newArrayList();
     Optional.ofNullable(list)
         .ifPresent(e -> list.forEach(ele -> Optional.ofNullable(ele).ifPresent(resultList::add)));
     return resultList;
@@ -544,7 +558,7 @@ public class KitRedisHelper {
    */
   public boolean sHasKey(String key, Object value) {
     try {
-      return redisTemplate.opsForSet().isMember(key, value);
+      return Boolean.TRUE.equals(redisTemplate.opsForSet().isMember(key, value));
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return false;
@@ -560,10 +574,11 @@ public class KitRedisHelper {
    */
   public long sSet(String key, Object... values) {
     try {
-      return redisTemplate.opsForSet().add(key, values);
+      Long add = redisTemplate.opsForSet().add(key, values);
+      return add == null ? 0L : add;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
-      return 0;
+      return 0L;
     }
   }
 
@@ -581,7 +596,7 @@ public class KitRedisHelper {
       if (time > 0) {
         expire(key, time);
       }
-      return count;
+      return count == null ? 0 : count;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return 0;
@@ -596,7 +611,8 @@ public class KitRedisHelper {
    */
   public long sGetSetSize(String key) {
     try {
-      return redisTemplate.opsForSet().size(key);
+      Long size = redisTemplate.opsForSet().size(key);
+      return size == null ? 0 : size;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
       return 0;
@@ -833,7 +849,7 @@ public class KitRedisHelper {
    * @param unit    时间单位
    * @return 如果设置成功返回true，否则返回false
    */
-  public Boolean setIfAbsent(String key, Object value, long timeout, TimeUnit unit) {
+  public boolean setIfAbsent(String key, Object value, long timeout, TimeUnit unit) {
     try {
       String stringValue = ObjUtil.toString(value);
       // 使用Redis的SETNX命令实现原子性操作
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
index 9cbe4099..e4c978ca 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java
@@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.MurmurHash3;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -53,8 +54,13 @@ public class RedisConfiguration extends CachingConfigurerSupport {
    * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）<br/> 未配置可能导致, 登录失败, 反复登录等问题
    */
   private static final String[] WHITELIST_STR =
-      {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model",
-          "cn.odboy.task.dal.dataobject", "cn.odboy.task.dal.model",};
+      {
+          "org.springframework",
+          "cn.odboy.system.dal.dataobject",
+          "cn.odboy.system.dal.model",
+          "cn.odboy.task.dal.dataobject",
+          "cn.odboy.task.dal.model",
+      };
 
   /**
    * 设置 redis 数据默认过期时间，默认2小时 设置@cacheable 序列化方式
@@ -63,8 +69,7 @@ public class RedisConfiguration extends CachingConfigurerSupport {
   public RedisCacheConfiguration redisCacheConfiguration() {
     FastJsonRedisSerializer<Object> fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class);
     RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig();
-    configuration = configuration.serializeValuesWith(
-            RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer))
+    configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer))
         .entryTtl(Duration.ofHours(2));
     return configuration;
   }
@@ -127,29 +132,28 @@ public class RedisConfiguration extends CachingConfigurerSupport {
   }
 
   @Bean
-  @SuppressWarnings({"unchecked", "all"})
   public CacheErrorHandler errorHandler() {
     return new SimpleCacheErrorHandler() {
       @Override
-      public void handleCacheGetError(RuntimeException exception, Cache cache, Object key) {
+      public void handleCacheGetError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key) {
         // 处理缓存读取错误
         log.error("Cache Get Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCachePutError(RuntimeException exception, Cache cache, Object key, Object value) {
+      public void handleCachePutError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key, Object value) {
         // 处理缓存写入错误
         log.error("Cache Put Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCacheEvictError(RuntimeException exception, Cache cache, Object key) {
+      public void handleCacheEvictError(@NonNull RuntimeException exception, @NonNull Cache cache, @NonNull Object key) {
         // 处理缓存删除错误
         log.error("Cache Evict Error: {}", exception.getMessage());
       }
 
       @Override
-      public void handleCacheClearError(RuntimeException exception, Cache cache) {
+      public void handleCacheClearError(@NonNull RuntimeException exception, @NonNull Cache cache) {
         // 处理缓存清除错误
         log.error("Cache Clear Error: {}", exception.getMessage());
       }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
index 720ffa44..d9b20580 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java
@@ -53,7 +53,7 @@ public class KitFileLocalUploadHelper {
       if (StrUtil.isBlank(currentUserName)) {
         return PATH_MAC.replace("${appName}", appName).replace("${username}", "");
       }
-      return PATH_MAC.replace("${appName}", appName).replace("${username}", currentUserName);
+      return PATH_MAC.replace("${appName}", appName).replace("${username}", "/" + currentUserName);
     }
     return PATH_LINUX.replace("${appName}", appName);
   }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java
new file mode 100644
index 00000000..090657d4
--- /dev/null
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBeanUtil.java
@@ -0,0 +1,34 @@
+package cn.odboy.util;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import lombok.experimental.UtilityClass;
+
+/**
+ * Bean拷贝相关
+ *
+ * @author odboy
+ * @date 2026-01-06
+ */
+@UtilityClass
+public class KitBeanUtil {
+
+  public static <T> T copyToClass(Object source, Class<T> tClass) {
+    return BeanUtil.copyProperties(source, tClass);
+  }
+
+  public static void copyToTarget(Object source, Object target) {
+    BeanUtil.copyProperties(source, target, CopyOptions.create().setIgnoreNullValue(true));
+  }
+
+  public static <T> List<T> copyToList(Collection<?> collection, Class<T> targetType) {
+    List<T> ts = BeanUtil.copyToList(collection, targetType);
+    if (ts == null) {
+      return new ArrayList<>(0);
+    }
+    return ts;
+  }
+}
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
index d23d1685..bc215343 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitBigDecimalUtil.java
@@ -76,12 +76,12 @@ public final class KitBigDecimalUtil {
    *
    * @param a 乘数
    * @param b 乘数
-   * @return 两个乘数的积, 保留两位小数
+   * @return 两个乘数的积, 保留6位小数
    */
   public static BigDecimal multiply(Object a, Object b) {
     BigDecimal bdA = toBigDecimal(a);
     BigDecimal bdB = toBigDecimal(b);
-    return bdA.multiply(bdB).setScale(2, RoundingMode.HALF_UP);
+    return bdA.multiply(bdB).setScale(6, RoundingMode.HALF_UP);
   }
 
   /**
@@ -94,7 +94,7 @@ public final class KitBigDecimalUtil {
   public static BigDecimal divide(Object a, Object b) {
     BigDecimal bdA = toBigDecimal(a);
     BigDecimal bdB = toBigDecimal(b);
-    return bdA.divide(bdB, 2, RoundingMode.HALF_UP);
+    return bdA.divide(bdB, 6, RoundingMode.HALF_UP);
   }
 
   /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
index b9527561..b08340a6 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitClassUtil.java
@@ -26,8 +26,7 @@ import lombok.experimental.UtilityClass;
 @UtilityClass
 public final class KitClassUtil {
 
-  @SuppressWarnings({"unchecked", "all"})
-  public static List<Field> getAllFields(Class clazz, List<Field> fields) {
+  public static List<Field> getAllFields(Class<?> clazz, List<Field> fields) {
     if (clazz != null) {
       fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
       getAllFields(clazz.getSuperclass(), fields);
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
index 01ebabcc..79068d96 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitCollUtil.java
@@ -15,7 +15,9 @@
  */
 package cn.odboy.util;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.odboy.base.KitSelectOptionVo;
+import cn.odboy.framework.exception.BadRequestException;
 import com.alibaba.fastjson2.JSON;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
@@ -192,6 +194,7 @@ public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
    * @return /
    */
   public static BigDecimal streamBigDecimalAvg(List<BigDecimal> data) {
+    KitValidUtil.notEmpty(data, "data");
     return data.stream().filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
         .divide(BigDecimal.valueOf(data.size()), 6, RoundingMode.FLOOR);
   }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
index 2e4b1d9c..139d006e 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDateUtil.java
@@ -30,7 +30,7 @@ import lombok.experimental.UtilityClass;
 public class KitDateUtil {
 
   /**
-   * 获取当前时间毫秒数
+   * 获取当前时间毫秒数 yyyyMMddHHmmssSSS
    *
    * @return /
    */
@@ -39,7 +39,7 @@ public class KitDateUtil {
   }
 
   /**
-   * 获取当前时间,但不包括毫秒数
+   * 获取当前时间,但不包括毫秒数 yyyyMMddHHmmss
    *
    * @return /
    */
@@ -48,7 +48,7 @@ public class KitDateUtil {
   }
 
   /**
-   * 获取当前时间,但不包括毫秒数
+   * 获取当前时间,但不包括毫秒数 yyyyMMdd
    *
    * @return /
    */
@@ -61,7 +61,7 @@ public class KitDateUtil {
    *
    * @param startTime 开始时间
    * @param endTime   结束时间
-   * @return 格式化后的时间，X天X时X分X秒X毫秒
+   * @return 格式化后的时间，X天X时X分X秒
    */
   public static String formatMillsDuration(Date startTime, Date endTime) {
     if (startTime == null || endTime == null) {
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
index 6f02d687..82f5ec29 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitDistributedIdUtil.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicLong;
  * @author odboy
  * @date 2025-04-05
  */
+@Deprecated
 public final class KitDistributedIdUtil {
 
   /**
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
index 6b17973d..a2a8df19 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitFileUtil.java
@@ -20,6 +20,7 @@ import static cn.odboy.constant.SystemConst.SYMBOL_AT;
 import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
 import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
@@ -55,7 +56,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @Slf4j
 @UtilityClass
-public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
+public final class KitFileUtil extends FileUtil {
 
   /**
    * 系统临时目录
@@ -80,10 +81,6 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
    * 定义KB的计算常量
    */
   private static final int KB = 1024;
-  /**
-   * 格式化小数
-   */
-  private static final DecimalFormat DF = new DecimalFormat("0.00");
 
   /**
    * MultipartFile转File
@@ -112,13 +109,13 @@ public final class KitFileUtil extends cn.hutool.core.io.FileUtil {
     String resultSize;
     if (size / GB >= 1) {
       //如果当前Byte的值大于等于1GB
-      resultSize = DF.format(size / (float) GB) + " GB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) GB) + " GB";
     } else if (size / MB >= 1) {
       //如果当前Byte的值大于等于1MB
-      resultSize = DF.format(size / (float) MB) + " MB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) MB) + " MB";
     } else if (size / KB >= 1) {
       //如果当前Byte的值大于等于1KB
-      resultSize = DF.format(size / (float) KB) + " KB";
+      resultSize = new DecimalFormat("0.00").format(size / (float) KB) + " KB";
     } else {
       resultSize = size + " B";
     }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
index f1d888aa..abb3cdcf 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitPageUtil.java
@@ -16,10 +16,7 @@
 package cn.odboy.util;
 
 import cn.odboy.base.KitPageResult;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import lombok.experimental.UtilityClass;
@@ -62,13 +59,6 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
     return new KitPageResult<>(list, list.size());
   }
 
-  /**
-   * 返回空数据
-   */
-  public static <T> KitPageResult<T> emptyListData() {
-    return new KitPageResult<>(new ArrayList<>(), 0);
-  }
-
   /**
    * 返回空数据
    */
@@ -82,8 +72,4 @@ public final class KitPageUtil extends cn.hutool.core.util.PageUtil {
   public static <T> KitPageResult<T> toPage(List<T> list, long totalElements) {
     return new KitPageResult<>(list, totalElements);
   }
-
-  public static <T> Page<T> getCount(BaseMapper<T> baseMapper) {
-    return new Page<>(1, baseMapper.selectCount(null));
-  }
 }
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
index ce715058..9384956d 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitRsaEncryptUtil.java
@@ -184,7 +184,7 @@ public final class KitRsaEncryptUtil {
    */
   public static RsaKeyPair generateKeyPair() throws NoSuchAlgorithmException {
     KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(1024);
+    keyPairGenerator.initialize(4096);
     KeyPair keyPair = keyPairGenerator.generateKeyPair();
     RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic();
     RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate();
diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
index ee7a8949..77bccc8d 100644
--- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
+++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/KitValidUtil.java
@@ -15,13 +15,17 @@
  */
 package cn.odboy.util;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.exception.BadRequestException;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
+import javax.validation.constraints.NotNull;
 import javax.validation.groups.Default;
 import lombok.experimental.UtilityClass;
 
@@ -49,4 +53,40 @@ public final class KitValidUtil {
           violations.stream().map(ConstraintViolation::getMessage).collect(Collectors.joining(",")));
     }
   }
+
+  public static void notNull(Object value) {
+    if (value == null) {
+      throw new BadRequestException("参数必填");
+    }
+  }
+
+  public static void isNull(Object value) {
+    if (value != null) {
+      throw new BadRequestException("参数非必填");
+    }
+  }
+
+  public static void notNull(Object value, @NotNull String name, @NotNull String code) {
+    if (value == null) {
+      throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code));
+    }
+  }
+
+  public static void isBlank(CharSequence value, @NotNull String name, @NotNull String code) {
+    if (StrUtil.isNotBlank(value)) {
+      throw new BadRequestException(String.format("参数 %s(%s) 非必填", name, code));
+    }
+  }
+
+  public static void notBlank(CharSequence value, @NotNull String name, @NotNull String code) {
+    if (StrUtil.isBlank(value)) {
+      throw new BadRequestException(String.format("参数 %s(%s) 必填", name, code));
+    }
+  }
+
+  public static void notEmpty(List<?> data, @NotNull String code) {
+    if (CollUtil.isEmpty(data)) {
+      throw new BadRequestException(String.format("参数 %s 必填", code));
+    }
+  }
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/pom.xml b/cutejava/cutejava-module-system/pom.xml
index 9f72f3fe..394960db 100644
--- a/cutejava/cutejava-module-system/pom.xml
+++ b/cutejava/cutejava-module-system/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-module-system</artifactId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-framework</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/io.minio/minio -->
     <dependency>
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
index a33a1c11..6c4ec4b1 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemCaptchaBizEnum.java
@@ -24,13 +24,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SystemCaptchaBizEnum {
-  /* 通过手机号码重置邮箱 */
-  PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl",
-      "通过手机号码重置邮箱"), /* 通过旧邮箱重置邮箱 */
+  PHONE_RESET_EMAIL_CODE("10000", "phone_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置邮箱"),
   EMAIL_RESET_EMAIL_CODE("10001", "email_reset_email_code_", "SystemEmailCaptchaTemplate.ftl", "通过旧邮箱重置邮箱"),
-  /* 通过手机号码重置密码 */
   PHONE_RESET_PWD_CODE("10002", "phone_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过手机号码重置密码"),
-  /* 通过邮箱重置密码 */
   EMAIL_RESET_PWD_CODE("10003", "email_reset_pwd_code_", "SystemEmailCaptchaTemplate.ftl", "通过邮箱重置密码");
   /**
    * 业务编码
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
index 4bdff0d0..fae764ef 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemDataScopeEnum.java
@@ -24,9 +24,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum SystemDataScopeEnum {
-  /* 全部的数据权限 */
-  ALL("全部", "全部的数据权限"), /* 自己部门的数据权限 */
-  THIS_LEVEL("本级", "自己部门的数据权限"), /* 自定义的数据权限 */
+  ALL("全部", "全部的数据权限"),
+  THIS_LEVEL("本级", "自己部门的数据权限"),
   CUSTOMIZE("自定义", "自定义的数据权限");
   private final String value;
   private final String description;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
similarity index 92%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
index e6b3e168..009455ab 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/TransferProtocolConst.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/constant/SystemTransferProtocolConst.java
@@ -1,23 +1,23 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.constant;
-
-public interface TransferProtocolConst {
-
-  String PREFIX_HTTP = "http://";
-  String PREFIX_HTTPS = "https://";
-  String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头";
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.constant;
+
+public interface SystemTransferProtocolConst {
+
+  String PREFIX_HTTP = "http://";
+  String PREFIX_HTTPS = "https://";
+  String PREFIX_HTTPS_BAD_REQUEST = "外链必须以http://或者https://开头";
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
index afb31f2a..47545a24 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java
@@ -16,18 +16,16 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.annotation.AnonymousPostMapping;
-import cn.odboy.system.dal.model.SystemUserInfoVo;
-import cn.odboy.system.dal.model.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.response.SystemAuthVo;
 import cn.odboy.system.service.SystemAuthService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,26 +44,11 @@ public class SystemAuthController {
 
   @ApiOperation("登录授权")
   @AnonymousPostMapping(value = "/login")
-  public ResponseEntity<Map<String, Object>> login(@Validated @RequestBody SystemUserLoginArgs loginRequest,
-      HttpServletRequest request) throws Exception {
-    Map<String, Object> loginInfo = systemAuthService.doLogin(loginRequest, request);
+  public ResponseEntity<SystemAuthVo> login(@Validated @RequestBody SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception {
+    SystemAuthVo loginInfo = systemAuthService.doLogin(loginRequest, request);
     return ResponseEntity.ok(loginInfo);
   }
 
-  @ApiOperation("获取用户信息")
-  @PostMapping(value = "/info")
-  public ResponseEntity<SystemUserInfoVo> getUserInfo() {
-    SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo();
-    return ResponseEntity.ok(userInfoVo);
-  }
-
-  @ApiOperation("获取验证码")
-  @AnonymousPostMapping(value = "/captcha/getImage")
-  public ResponseEntity<Map<String, Object>> getCode() {
-    Map<String, Object> imgResult = systemAuthService.getCaptchaInfo();
-    return ResponseEntity.ok(imgResult);
-  }
-
   @ApiOperation("退出登录")
   @AnonymousPostMapping(value = "/logout")
   public ResponseEntity<Void> logout(HttpServletRequest request) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
index 2edf0bfb..ebc97e42 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java
@@ -16,7 +16,8 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
-import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,23 +38,25 @@ public class SystemCaptchaController {
   @Autowired
   private SystemEmailService systemEmailService;
 
+  @OperationLog
   @ApiOperation("重置邮箱, 发送验证码")
-  @PostMapping(value = "/sendResetEmailCaptcha")
-  public ResponseEntity<Void> sendResetEmailCaptcha(@RequestParam String email) {
+  @PostMapping(value = "/sendResetEmailCode")
+  public ResponseEntity<Void> sendResetEmailCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("重置密码，发送验证码")
-  @PostMapping(value = "/sendResetPasswordCaptcha")
-  public ResponseEntity<Void> sendResetPasswordCaptcha(@RequestParam String email) {
+  @PostMapping(value = "/sendResetPasswordCode")
+  public ResponseEntity<Void> sendResetPasswordCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("验证码验证")
-  @PostMapping(value = "/checkEmailCaptcha")
-  public ResponseEntity<Void> checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
+  @PostMapping(value = "/verifyCode")
+  public ResponseEntity<Void> verifyCode(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
     systemEmailService.checkEmailCaptcha(args);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
index 0df7c6ff..892d1db1 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java
@@ -34,16 +34,16 @@ public class SystemComponentController {
   private SystemDeptService systemDeptService;
 
   @ApiOperation("查询部门下拉选择数据源")
-  @PostMapping(value = "/queryDeptSelectDataSource")
+  @PostMapping(value = "/listDeptSelectDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource());
+  public ResponseEntity<?> listDeptSelectDataSource() {
+    return ResponseEntity.ok(systemDeptService.listDeptSelectDataSource());
   }
 
   @ApiOperation("查询部门下拉选择Pro数据源")
-  @PostMapping(value = "/queryDeptSelectProDataSource")
+  @PostMapping(value = "/listDeptSelectProDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectProDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource());
+  public ResponseEntity<?> listDeptSelectProDataSource() {
+    return ResponseEntity.ok(systemDeptService.listDeptSelectProDataSource());
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
index 580252f7..1662e168 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java
@@ -18,8 +18,10 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.model.SystemCreateDeptArgs;
-import cn.odboy.system.dal.model.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDeptArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDeptService;
 import cn.odboy.util.KitPageUtil;
 import io.swagger.annotations.Api;
@@ -46,6 +48,7 @@ public class SystemDeptController {
   @Autowired
   private SystemDeptService systemDeptService;
 
+  @OperationLog
   @ApiOperation("导出部门数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dept:list')")
@@ -54,22 +57,21 @@ public class SystemDeptController {
   }
 
   @ApiOperation("查询部门")
-  @PostMapping
+  @PostMapping(value = "/searchDept")
   @PreAuthorize("@el.check('user:list','dept:list')")
-  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(
-      @Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
+  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(@Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
     List<SystemDeptTb> depts = systemDeptService.queryAllDeptByArgs(pageArgs.getArgs(), true);
     return ResponseEntity.ok(KitPageUtil.toPage(depts));
   }
 
   @ApiOperation("查询部门:根据ID获取同级与上级数据")
-  @PostMapping("/queryDeptSuperiorTree")
+  @PostMapping("/searchDeptTree")
   @PreAuthorize("@el.check('user:list','dept:list')")
-  public ResponseEntity<KitPageResult<SystemDeptTb>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
-      @RequestParam(defaultValue = "false") Boolean exclude) {
+  public ResponseEntity<KitPageResult<SystemDeptVo>> queryDeptSuperiorTree(@RequestBody List<Long> ids, @RequestParam(defaultValue = "false") Boolean exclude) {
     return ResponseEntity.ok(systemDeptService.searchDeptTree(ids, exclude));
   }
 
+  @OperationLog
   @ApiOperation("新增部门")
   @PostMapping(value = "/saveDept")
   @PreAuthorize("@el.check('dept:add')")
@@ -78,18 +80,20 @@ public class SystemDeptController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改部门")
-  @PostMapping(value = "/modifyDept")
+  @PostMapping(value = "/updateDeptById")
   @PreAuthorize("@el.check('dept:edit')")
-  public ResponseEntity<Void> modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
-    systemDeptService.updateDept(args);
+  public ResponseEntity<Void> updateDeptById(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
+    systemDeptService.updateDeptById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除部门")
-  @PostMapping(value = "/removeDeptByIds")
+  @PostMapping(value = "/deleteDeptByIds")
   @PreAuthorize("@el.check('dept:del')")
-  public ResponseEntity<Void> removeDeptByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDeptByIds(@RequestBody Set<Long> ids) {
     systemDeptService.deleteDeptByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
index 9d184b96..0d55193f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java
@@ -18,14 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictArgs;
-import cn.odboy.system.dal.model.SystemQueryDictArgs;
-import cn.odboy.system.service.SystemDictDetailService;
+import cn.odboy.system.dal.model.request.SystemCreateDictArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDictService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
@@ -46,32 +45,32 @@ public class SystemDictController {
 
   @Autowired
   private SystemDictService systemDictService;
-  @Autowired
-  private SystemDictDetailService systemDictDetailService;
 
+  @OperationLog
   @ApiOperation("导出字典数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('dict:list')")
-  public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) throws IOException {
+  public void exportDict(HttpServletResponse response, SystemQueryDictArgs args) {
     systemDictService.exportDictXlsx(response, args);
   }
 
-  @ApiOperation("查询字典")
+  @Deprecated
+  @ApiOperation("查询所有字典")
   @PostMapping(value = "/queryAllDict")
   @PreAuthorize("@el.check('dict:list')")
   public ResponseEntity<List<SystemDictTb>> queryAllDict() {
     return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs()));
   }
 
-  @ApiOperation("查询字典")
-  @PostMapping
+  @ApiOperation("分页查询字典")
+  @PostMapping(value = "/searchDict")
   @PreAuthorize("@el.check('dict:list')")
-  public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemDictTb>> queryDictByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictArgs> pageArgs) {
     Page<SystemDictTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemDictService.searchDict(pageArgs.getArgs(), page));
   }
 
+  @OperationLog
   @ApiOperation("新增字典")
   @PostMapping(value = "/saveDict")
   @PreAuthorize("@el.check('dict:add')")
@@ -80,18 +79,20 @@ public class SystemDictController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改字典")
-  @PostMapping(value = "/modifyDictById")
+  @PostMapping(value = "/updateDictById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
+  public ResponseEntity<Void> updateDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
     systemDictService.updateDictById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除字典")
-  @PostMapping(value = "/removeDictByIds")
+  @PostMapping(value = "/deleteDictByIds")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDictByIds(@RequestBody Set<Long> ids) {
     systemDictService.deleteDictByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
index eea619d6..fa6ff6cc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java
@@ -18,9 +18,10 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
-import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemDictDetailService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -47,16 +48,8 @@ public class SystemDictDetailController {
   private SystemDictDetailService systemDictDetailService;
 
   @ApiOperation("查询字典详情")
-  @PostMapping
-  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> args) {
-    return queryDictDetailByArgs(args);
-  }
-
-  @ApiOperation("查询字典详情")
-  @PostMapping(value = "/queryDictDetailByArgs")
-  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
+  @PostMapping(value = "/searchDictDetail")
+  public ResponseEntity<KitPageResult<SystemDictDetailVo>> queryDictDetailByArgs(@Validated @RequestBody KitPageArgs<SystemQueryDictDetailArgs> pageArgs) {
     Page<SystemDictDetailTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemDictDetailService.searchDictDetail(pageArgs.getArgs(), page));
   }
@@ -68,6 +61,7 @@ public class SystemDictDetailController {
     return ResponseEntity.ok(dictMap);
   }
 
+  @OperationLog
   @ApiOperation("新增字典详情")
   @PostMapping(value = "/saveDictDetail")
   @PreAuthorize("@el.check('dict:add')")
@@ -76,19 +70,20 @@ public class SystemDictDetailController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改字典详情")
-  @PostMapping(value = "/modifyDictDetailById")
+  @PostMapping(value = "/updateDictDetailById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictDetailById(
-      @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
+  public ResponseEntity<Void> updateDictDetailById(@Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
     systemDictDetailService.updateDictDetailById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除字典详情")
-  @PostMapping(value = "/removeDictDetailById")
+  @PostMapping(value = "/deleteDictDetailById")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictDetailById(@RequestBody SystemDictDetailTb args) {
+  public ResponseEntity<Void> deleteDictDetailById(@RequestBody SystemDictDetailTb args) {
     systemDictDetailService.deleteDictDetailById(args.getId());
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
index 1192809e..df210692 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java
@@ -16,7 +16,8 @@
 package cn.odboy.system.controller;
 
 import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,17 +46,18 @@ public class SystemEmailController {
     return ResponseEntity.ok(systemEmailService.getLastEmailConfig());
   }
 
-  @ApiOperation("配置邮件")
-  @PostMapping(value = "/modifyEmailConfig")
-  public ResponseEntity<Void> modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig)
-      throws Exception {
+  @OperationLog
+  @ApiOperation("修改邮箱配置")
+  @PostMapping(value = "/updateEmailConfigById")
+  public ResponseEntity<Void> updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig) throws Exception {
     systemEmailService.updateEmailConfigById(emailConfig);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("发送邮件")
-  @PostMapping(value = "/sendEmail")
-  public ResponseEntity<Void> sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
+  @PostMapping(value = "/send")
+  public ResponseEntity<Void> send(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
     systemEmailService.sendEmail(sendEmailRequest);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
index 8995aae7..97af85df 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java
@@ -18,13 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.model.SystemCreateJobArgs;
-import cn.odboy.system.dal.model.SystemQueryJobArgs;
+import cn.odboy.system.dal.model.request.SystemCreateJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryJobArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemJobService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,30 +45,23 @@ public class SystemJobController {
   @Autowired
   private SystemJobService systemJobService;
 
+  @OperationLog
   @ApiOperation("导出岗位数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('job:list')")
-  public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) throws IOException {
+  public void exportJob(HttpServletResponse response, SystemQueryJobArgs args) {
     systemJobService.exportJobXlsx(response, args);
   }
 
-  @ApiOperation("查询岗位")
-  @PostMapping(value = "/queryAllEnableJob")
+  @ApiOperation("分页查询岗位")
+  @PostMapping(value = "/searchJob")
   @PreAuthorize("@el.check('job:list','user:list')")
-  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(
-      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByArgs(@Validated @RequestBody KitPageArgs<SystemQueryJobArgs> pageArgs) {
     Page<SystemJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("查询岗位")
-  @PostMapping
-  @PreAuthorize("@el.check('job:list','user:list')")
-  public ResponseEntity<KitPageResult<SystemJobTb>> queryJobByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryJobArgs> args) {
-    return queryJobByArgs(args);
-  }
-
+  @OperationLog
   @ApiOperation("新增岗位")
   @PostMapping(value = "/saveJob")
   @PreAuthorize("@el.check('job:add')")
@@ -77,18 +70,20 @@ public class SystemJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改岗位")
-  @PostMapping(value = "/modifyJobById")
+  @PostMapping(value = "/updateJobById")
   @PreAuthorize("@el.check('job:edit')")
-  public ResponseEntity<Void> modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
+  public ResponseEntity<Void> updateJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
     systemJobService.updateJobById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除岗位")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('job:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
index 172a5d6e..4ebaa181 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java
@@ -18,12 +18,12 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemLocalStorageService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,21 +46,22 @@ public class SystemLocalStorageController {
   private SystemLocalStorageService localStorageService;
 
   @ApiOperation("查询文件")
-  @PostMapping
+  @PostMapping(value = "/searchLocalStorage")
   @PreAuthorize("@el.check('storage:list')")
-  public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemLocalStorageTb>> queryLocalStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
     Page<SystemLocalStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(localStorageService.searchLocalStorage(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出本地存储记录数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
     localStorageService.exportLocalStorageXlsx(response, args);
   }
 
+  @OperationLog
   @ApiOperation("上传文件")
   @PostMapping(value = "/uploadFile")
   @PreAuthorize("@el.check('storage:add')")
@@ -69,6 +70,7 @@ public class SystemLocalStorageController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("上传图片")
   @PostMapping("/uploadPicture")
   public ResponseEntity<SystemLocalStorageTb> uploadPicture(@RequestParam MultipartFile file) {
@@ -76,16 +78,18 @@ public class SystemLocalStorageController {
     return ResponseEntity.ok(localStorage);
   }
 
+  @OperationLog
   @ApiOperation("修改文件")
-  @PostMapping(value = "/modifyLocalStorageById")
+  @PostMapping(value = "/updateLocalStorageById")
   @PreAuthorize("@el.check('storage:edit')")
-  public ResponseEntity<Void> modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
+  public ResponseEntity<Void> updateLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
     localStorageService.updateLocalStorageById(args);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
+  @OperationLog
+  @ApiOperation("删除文件")
+  @PostMapping(value = "/deleteFileByIds")
   public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     localStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
index 1dea13cb..99269a30 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java
@@ -19,8 +19,10 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.model.SystemMenuVo;
-import cn.odboy.system.dal.model.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.request.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.response.SystemMenuRouterVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemMenuService;
 import cn.odboy.util.KitPageUtil;
 import io.swagger.annotations.Api;
@@ -47,6 +49,7 @@ public class SystemMenuController {
   @Autowired
   private SystemMenuService systemMenuService;
 
+  @OperationLog
   @ApiOperation("导出菜单数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('menu:list')")
@@ -56,36 +59,28 @@ public class SystemMenuController {
 
   @PostMapping(value = "/buildMenus")
   @ApiOperation("获取前端所需菜单")
-  public ResponseEntity<List<SystemMenuVo>> buildMenus() {
-    List<SystemMenuVo> systemMenuVos = systemMenuService.buildFrontMenus();
-    return ResponseEntity.ok(systemMenuVos);
+  public ResponseEntity<List<SystemMenuRouterVo>> buildMenus() {
+    List<SystemMenuRouterVo> systemMenuRouterVos = systemMenuService.buildFrontMenus();
+    return ResponseEntity.ok(systemMenuRouterVos);
   }
 
   @ApiOperation("返回全部的菜单")
-  @PostMapping(value = "/queryMenuListByPid")
+  @PostMapping(value = "/listMenuByPid")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<List<SystemMenuTb>> queryMenuListByPid(@RequestParam Long pid) {
-    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid);
+  public ResponseEntity<List<SystemMenuVo>> listMenuByPid(@RequestParam Long pid) {
+    List<SystemMenuVo> systemMenuTbs = systemMenuService.listMenuByPid(pid);
     return ResponseEntity.ok(systemMenuTbs);
   }
 
   @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID")
-  @PostMapping(value = "/queryChildMenuSet")
+  @PostMapping(value = "/listChildMenuSetByMenuId")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<Set<Long>> queryChildMenuSet(@RequestParam Long id) {
+  public ResponseEntity<Set<Long>> listChildMenuSetByMenuId(@RequestParam Long id) {
     Set<Long> ids = systemMenuService.listChildMenuSetByMenuId(id);
     return ResponseEntity.ok(ids);
   }
 
-  @PostMapping
-  @ApiOperation("查询菜单")
-  @PreAuthorize("@el.check('menu:list')")
-  public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenuByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryMenuArgs> args) throws Exception {
-    return queryAllMenu(args);
-  }
-
-  @PostMapping(value = "/queryMenuByArgs")
+  @PostMapping(value = "/searchMenu")
   @ApiOperation("查询菜单")
   @PreAuthorize("@el.check('menu:list')")
   public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenu(
@@ -97,11 +92,12 @@ public class SystemMenuController {
   @ApiOperation("查询菜单:根据ID获取同级与上级数据")
   @PostMapping("/queryMenuSuperior")
   @PreAuthorize("@el.check('menu:list')")
-  public ResponseEntity<List<SystemMenuTb>> queryMenuSuperior(@RequestBody List<Long> ids) {
-    List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuSuperior(ids);
+  public ResponseEntity<List<SystemMenuVo>> queryMenuSuperior(@RequestBody List<Long> ids) {
+    List<SystemMenuVo> systemMenuTbs = systemMenuService.listMenuSuperior(ids);
     return ResponseEntity.ok(systemMenuTbs);
   }
 
+  @OperationLog
   @ApiOperation("新增菜单")
   @PostMapping(value = "/saveMenu")
   @PreAuthorize("@el.check('menu:add')")
@@ -113,18 +109,20 @@ public class SystemMenuController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改菜单")
-  @PostMapping(value = "/modifyMenuById")
+  @PostMapping(value = "/updateMenuById")
   @PreAuthorize("@el.check('menu:edit')")
-  public ResponseEntity<Void> modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
+  public ResponseEntity<Void> updateMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
     systemMenuService.updateMenuById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除菜单")
-  @PostMapping(value = "/removeMenuByIds")
+  @PostMapping(value = "/deleteMenuByIds")
   @PreAuthorize("@el.check('menu:del')")
-  public ResponseEntity<Void> removeMenuByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteMenuByIds(@RequestBody Set<Long> ids) {
     systemMenuService.deleteMenuByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
index b990e531..de0fcf6a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java
@@ -15,6 +15,7 @@
  */
 package cn.odboy.system.controller;
 
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemMonitorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,10 +35,11 @@ public class SystemMonitorController {
   @Autowired
   private SystemMonitorService systemMonitorService;
 
-  @PostMapping(value = "/queryServerMonitorInfo")
+  @OperationLog
+  @PostMapping(value = "/getServerMonitorInfo")
   @ApiOperation("查询服务监控")
   @PreAuthorize("@el.check('monitor:list')")
-  public ResponseEntity<Map<String, Object>> queryServerMonitorInfo() {
+  public ResponseEntity<Map<String, Object>> getServerMonitorInfo() {
     return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo());
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
index 0421ac23..7e9a512f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java
@@ -17,8 +17,9 @@ package cn.odboy.system.controller;
 
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
+import cn.odboy.system.framework.operalog.OperationLog;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -43,23 +44,25 @@ public class SystemOnlineController {
   @Autowired
   private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
 
+  @OperationLog
   @ApiOperation("查询在线用户")
-  @PostMapping
+  @PostMapping(value = "/searchOnlineUser")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(
-      @Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemUserOnlineVo>> queryOnlineUser(@Validated @RequestBody KitPageArgs<SystemUserOnlineVo> pageArgs) {
     IPage<SystemUserOnlineVo> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
-    return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(pageArgs.getArgs(), page));
+    return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出在线用户数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check()")
   public void exportOnlineUser(HttpServletResponse response, String username) {
     systemUserOnlineInfoDAO.exportOnlineUserXlsx(response, username);
   }
 
-  @ApiOperation("踢出用户")
+  @OperationLog
+  @ApiOperation("踢出在线用户")
   @PostMapping(value = "/kickOutUser")
   @PreAuthorize("@el.check()")
   public ResponseEntity<Void> kickOutUser(@RequestBody Set<String> keys) throws Exception {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java
new file mode 100644
index 00000000..ac087351
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOperationLogController.java
@@ -0,0 +1,35 @@
+package cn.odboy.system.controller;
+
+import cn.odboy.base.KitPageArgs;
+import cn.odboy.base.KitPageResult;
+import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
+import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs;
+import cn.odboy.system.service.SystemOperationLogService;
+import cn.odboy.util.KitPageUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "系统：审计日志")
+@RequestMapping("/api/logs")
+public class SystemOperationLogController {
+
+  @Autowired
+  private SystemOperationLogService systemOperationLogService;
+
+  @PostMapping(value = "/searchUserLog")
+  @ApiOperation("用户日志查询")
+  public ResponseEntity<KitPageResult<SystemOperationLogTb>> searchUserLog(@Validated @RequestBody KitPageArgs<SystemQueryOperationLogArgs> pageArgs) {
+    IPage<SystemOperationLogTb> systemOperationLogTbPage = systemOperationLogService.searchUserLog(pageArgs);
+    return new ResponseEntity<>(KitPageUtil.toPage(systemOperationLogTbPage), HttpStatus.OK);
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
index e08e4fb7..68124348 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java
@@ -18,13 +18,13 @@ package cn.odboy.system.controller;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemOssStorageService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,22 +49,23 @@ public class SystemOssStorageController {
   private SystemOssStorageService systemOssStorageService;
 
   @ApiOperation("查询文件")
-  @PostMapping
+  @PostMapping(value = "/searchOssStorage")
   @PreAuthorize("@el.check('storage:list')")
-  public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(
-      @Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemOssStorageVo>> queryOssStorage(@Validated @RequestBody KitPageArgs<SystemQueryStorageArgs> pageArgs) {
     Page<SystemOssStorageTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemOssStorageService.searchOssStorage(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出数据")
+  @OperationLog
+  @ApiOperation("导出OSS存储记录数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('storage:list')")
-  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) throws IOException {
+  public void exportFile(HttpServletResponse response, SystemQueryStorageArgs args) {
     systemOssStorageService.exportOssStorageXlsx(response, args);
   }
 
-  @ApiOperation("上传文件")
+  @OperationLog
+  @ApiOperation("上传文件到OSS")
   @PostMapping(value = "/uploadFile")
   @PreAuthorize("@el.check('storage:add')")
   public ResponseEntity<String> uploadFile(@RequestParam("file") MultipartFile file) {
@@ -72,9 +73,10 @@ public class SystemOssStorageController {
     return ResponseEntity.ok(fileUrl);
   }
 
-  @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
-  public ResponseEntity<Void> removeFileByIds(@RequestBody Long[] ids) {
+  @OperationLog
+  @ApiOperation("从OSS删除文件")
+  @PostMapping(value = "/deleteFileByIds")
+  public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     systemOssStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
index 31a1f1e2..d9dfc27e 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java
@@ -19,8 +19,10 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
-import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemQuartzJobService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -35,7 +37,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,46 +51,49 @@ public class SystemQuartzJobController {
   private SystemQuartzJobService systemQuartzJobService;
 
   @ApiOperation("查询定时任务")
-  @PostMapping
+  @PostMapping(value = "/searchQuartzJob")
   @PreAuthorize("@el.check('quartzJob:list')")
-  public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(
-      @Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
+  public ResponseEntity<KitPageResult<SystemQuartzJobTb>> queryQuartzJobByCrud(@Validated @RequestBody KitPageArgs<SystemQueryQuartzJobArgs> pageArgs) {
     Page<SystemQuartzJobTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
     return ResponseEntity.ok(systemQuartzJobService.searchQuartzJobByArgs(pageArgs.getArgs(), page));
   }
 
-  @ApiOperation("导出任务数据")
+  @OperationLog
+  @ApiOperation("导出定时任务数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('quartzJob:list')")
   public void exportQuartzJob(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     systemQuartzJobService.exportQuartzJobXlsx(response, args);
   }
 
-  @ApiOperation("导出日志数据")
+  @OperationLog
+  @ApiOperation("导出定时任务日志数据")
   @GetMapping(value = "/logs/download")
   @PreAuthorize("@el.check('quartzJob:list')")
   public void exportQuartzJobLog(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     systemQuartzJobService.exportQuartzLogXlsx(response, args);
   }
 
-  @ApiOperation("查询任务执行日志")
-  @PostMapping(value = "/logs")
+  @ApiOperation("查询定时任务执行日志")
+  @PostMapping(value = "/searchQuartzLog")
   @PreAuthorize("@el.check('quartzJob:list')")
   public ResponseEntity<KitPageResult<SystemQuartzLogTb>> queryQuartzJobLog(SystemQueryQuartzJobArgs args) {
     Page<SystemQuartzLogTb> page = new Page<>(args.getPage(), args.getSize());
     return ResponseEntity.ok(systemQuartzJobService.searchQuartzLogByArgs(args, page));
   }
 
+  @OperationLog
   @ApiOperation("新增定时任务")
   @PostMapping(value = "/createQuartzJob")
   @PreAuthorize("@el.check('quartzJob:add')")
-  public ResponseEntity<Void> createQuartzJob(@Validated @RequestBody SystemQuartzJobTb args) {
+  public ResponseEntity<Void> createQuartzJob(@Validated @RequestBody SystemQuartzJobVo args) {
     systemQuartzJobService.createJob(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改定时任务")
-  @PutMapping
+  @PostMapping(value = "/updateQuartzJobResumeCron")
   @PreAuthorize("@el.check('quartzJob:edit')")
   public ResponseEntity<Void> updateQuartzJob(
       @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) {
@@ -97,6 +101,7 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("更改定时任务状态")
   @PostMapping(value = "/switchQuartzJobStatus/{id}")
   @PreAuthorize("@el.check('quartzJob:edit')")
@@ -105,6 +110,7 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("执行定时任务")
   @PostMapping(value = "/startQuartzJob/{id}")
   @PreAuthorize("@el.check('quartzJob:edit')")
@@ -113,10 +119,11 @@ public class SystemQuartzJobController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除定时任务")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('quartzJob:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemQuartzJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
index cc74b34e..ab97fd81 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java
@@ -19,14 +19,14 @@ import cn.hutool.core.lang.Dict;
 import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemCreateRoleArgs;
-import cn.odboy.system.dal.model.SystemQueryRoleArgs;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.request.SystemCreateRoleArgs;
+import cn.odboy.system.dal.model.request.SystemQueryRoleArgs;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.service.SystemRoleService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
@@ -49,28 +49,28 @@ public class SystemRoleController {
   private SystemRoleService systemRoleService;
 
   @ApiOperation("获取单个role")
-  @PostMapping(value = "/queryRoleById")
+  @PostMapping(value = "/getRoleById")
   @PreAuthorize("@el.check('roles:list')")
-  public ResponseEntity<SystemRoleVo> queryRoleById(@RequestBody SystemRoleTb args) {
+  public ResponseEntity<SystemRoleVo> getRoleById(@RequestBody SystemRoleTb args) {
     return ResponseEntity.ok(systemRoleService.getRoleById(args.getId()));
   }
 
   @ApiOperation("导出角色数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('role:list')")
-  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) throws IOException {
+  public void exportRole(HttpServletResponse response, SystemQueryRoleArgs args) {
     systemRoleService.exportRoleXlsx(response, args);
   }
 
   @ApiOperation("返回全部的角色")
-  @PostMapping(value = "/queryRoleList")
+  @PostMapping(value = "/listAllRole")
   @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
-  public ResponseEntity<List<SystemRoleTb>> queryRoleList() {
+  public ResponseEntity<List<SystemRoleTb>> listAllRole() {
     return ResponseEntity.ok(systemRoleService.listAllRole());
   }
 
   @ApiOperation("查询角色")
-  @PostMapping
+  @PostMapping(value = "/searchRole")
   @PreAuthorize("@el.check('roles:list')")
   public ResponseEntity<KitPageResult<SystemRoleVo>> queryRoleByArgs(
       @Validated @RequestBody KitPageArgs<SystemQueryRoleArgs> pageArgs) {
@@ -79,11 +79,12 @@ public class SystemRoleController {
   }
 
   @ApiOperation("获取用户级别")
-  @PostMapping(value = "/queryRoleLevel")
-  public ResponseEntity<Dict> queryRoleLevel() {
-    return ResponseEntity.ok(systemRoleService.getRoleLevel());
+  @PostMapping(value = "/getCurrentUserRoleLevel")
+  public ResponseEntity<Dict> getCurrentUserRoleLevel() {
+    return ResponseEntity.ok(systemRoleService.getCurrentUserRoleLevel());
   }
 
+  @OperationLog
   @ApiOperation("新增角色")
   @PostMapping(value = "/saveRole")
   @PreAuthorize("@el.check('roles:add')")
@@ -92,26 +93,29 @@ public class SystemRoleController {
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改角色")
-  @PostMapping(value = "/modifyRoleById")
+  @PostMapping(value = "/updateRoleById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
     systemRoleService.updateRoleById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("修改角色菜单")
-  @PostMapping(value = "/modifyBindMenuById")
+  @PostMapping(value = "/updateBindMenuById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyBindMenuById(@RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateBindMenuById(@RequestBody SystemRoleVo args) {
     systemRoleService.updateBindMenuById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除角色")
-  @PostMapping(value = "/removeRoleByIds")
+  @PostMapping(value = "/deleteRoleByIds")
   @PreAuthorize("@el.check('roles:del')")
-  public ResponseEntity<Void> removeRoleByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteRoleByIds(@RequestBody Set<Long> ids) {
     systemRoleService.deleteRoleByIds(ids);
     return ResponseEntity.ok(null);
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
index 677b1d4c..7b7e1041 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java
@@ -19,10 +19,13 @@ import cn.odboy.base.KitPageArgs;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.base.KitSelectOptionVo;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemQueryUserArgs;
-import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
+import cn.odboy.system.framework.operalog.OperationLog;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.system.service.SystemAuthService;
 import cn.odboy.system.service.SystemUserService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -50,8 +53,10 @@ public class SystemUserController {
 
   @Autowired
   private SystemUserService systemUserService;
+  @Autowired
+  private SystemAuthService systemAuthService;
 
-
+  @OperationLog
   @ApiOperation("导出用户数据")
   @GetMapping(value = "/download")
   @PreAuthorize("@el.check('user:list')")
@@ -60,7 +65,7 @@ public class SystemUserController {
   }
 
   @ApiOperation("查询用户")
-  @PostMapping
+  @PostMapping(value = "/aggregationSearchUser")
   @PreAuthorize("@el.check('user:list')")
   public ResponseEntity<KitPageResult<SystemUserVo>> queryUserByArgs(@Validated @RequestBody KitPageArgs<SystemQueryUserArgs> pageArgs) {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
@@ -68,6 +73,7 @@ public class SystemUserController {
     return ResponseEntity.ok(systemUserService.aggregationSearchUserByArgs(page, pageArgs.getArgs(), currentUsername));
   }
 
+  @OperationLog
   @ApiOperation("新增用户")
   @PostMapping(value = "/saveUser")
   @PreAuthorize("@el.check('user:add')")
@@ -76,53 +82,60 @@ public class SystemUserController {
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改用户")
-  @PostMapping(value = "/modifyUserById")
+  @OperationLog
+  @ApiOperation("修改用户数据")
+  @PostMapping(value = "/updateUserById")
   @PreAuthorize("@el.check('user:edit')")
-  public ResponseEntity<Object> modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
+  public ResponseEntity<Object> updateUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
     systemUserService.updateUserById(args);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改用户：个人中心")
-  @PostMapping(value = "modifyUserCenterInfoById")
-  public ResponseEntity<Object> modifyUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
+  @OperationLog
+  @ApiOperation("修改个人中心信息")
+  @PostMapping(value = "/updateUserCenterInfoById")
+  public ResponseEntity<Object> updateUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
     systemUserService.updateUserCenterInfoById(args);
     return ResponseEntity.ok(null);
   }
 
+  @OperationLog
   @ApiOperation("删除用户")
-  @PostMapping(value = "/removeUserByIds")
+  @PostMapping(value = "/deleteUserByIds")
   @PreAuthorize("@el.check('user:del')")
-  public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
-    systemUserService.removeUserByIds(ids);
+  public ResponseEntity<Object> deleteUserByIds(@RequestBody Set<Long> ids) {
+    systemUserService.deleteUserByIds(ids);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改密码")
-  @PostMapping(value = "/modifyUserPasswordByUsername")
-  public ResponseEntity<Object> modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
+  @OperationLog
+  @ApiOperation("修改用户密码")
+  @PostMapping(value = "/updateUserPasswordByUsername")
+  public ResponseEntity<Object> updateUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserPasswordByUsername(currentUsername, passVo);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("重置密码")
+  @OperationLog
+  @ApiOperation("重置用户密码")
   @PostMapping(value = "/resetUserPasswordByIds")
   public ResponseEntity<Object> resetUserPasswordByIds(@RequestBody Set<Long> ids) {
     systemUserService.resetUserPasswordByIds(ids);
     return ResponseEntity.ok(null);
   }
 
-  @ApiOperation("修改头像")
-  @PostMapping(value = "/modifyUserAvatar")
-  public ResponseEntity<Object> modifyUserAvatar(@RequestParam MultipartFile avatar) {
+  @OperationLog
+  @ApiOperation("修改用户头像")
+  @PostMapping(value = "/updateUserAvatar")
+  public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar) {
     return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar));
   }
 
-  @ApiOperation("修改邮箱")
-  @PostMapping(value = "/modifyUserEmailByUsername/{code}")
-  public ResponseEntity<Object> modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
+  @OperationLog
+  @ApiOperation("修改用户邮箱")
+  @PostMapping(value = "/updateUserEmailByUsername/{code}")
+  public ResponseEntity<Object> updateUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserEmailByUsername(currentUsername, args, code);
     return ResponseEntity.ok(null);
@@ -135,4 +148,11 @@ public class SystemUserController {
     List<KitSelectOptionVo> collect = systemUserService.queryUserMetadataOptions(args);
     return ResponseEntity.ok(collect);
   }
+
+  @ApiOperation("获取用户信息")
+  @PostMapping(value = "/getCurrentUserInfo")
+  public ResponseEntity<SystemUserJwtVo> getUserInfo() {
+    SystemUserJwtVo userInfoVo = systemAuthService.getCurrentUserInfo();
+    return ResponseEntity.ok(userInfoVo);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
index a61e1ed6..50231e72 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemDeptTb.java
@@ -16,15 +16,11 @@
 package cn.odboy.system.dal.dataobject;
 
 import cn.odboy.base.KitBaseUserTimeTb;
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import lombok.Getter;
@@ -39,13 +35,6 @@ public class SystemDeptTb extends KitBaseUserTimeTb {
   @TableId(value = "dept_id", type = IdType.AUTO)
   @ApiModelProperty(value = "ID", hidden = true)
   private Long id;
-  @TableField(exist = false)
-  @JSONField(serialize = false)
-  @ApiModelProperty(value = "角色")
-  private Set<SystemRoleTb> roles;
-  @TableField(exist = false)
-  @ApiModelProperty(value = "子部门")
-  private List<SystemDeptTb> children;
   @ApiModelProperty(value = "排序")
   private Integer deptSort;
   @NotBlank
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
index d5af935d..bded4f86 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemLocalStorageTb.java
@@ -15,9 +15,8 @@
  */
 package cn.odboy.system.dal.dataobject;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.bean.copier.CopyOptions;
 import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -49,6 +48,6 @@ public class SystemLocalStorageTb extends KitBaseUserTimeTb {
   private String dateGroup;
 
   public void copy(SystemLocalStorageTb source) {
-    BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    KitBeanUtil.copyToTarget(source, this);
   }
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
index 96e37b42..ecc5dfc8 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemMenuTb.java
@@ -16,15 +16,12 @@
 package cn.odboy.system.dal.dataobject;
 
 import cn.odboy.base.KitBaseUserTimeTb;
-import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import javax.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
@@ -38,12 +35,6 @@ public class SystemMenuTb extends KitBaseUserTimeTb {
   @TableId(value = "menu_id", type = IdType.AUTO)
   @ApiModelProperty(value = "ID", hidden = true)
   private Long id;
-  @TableField(exist = false)
-  @JSONField(serialize = false)
-  @ApiModelProperty(value = "菜单角色")
-  private Set<SystemRoleTb> roles;
-  @TableField(exist = false)
-  private List<SystemMenuTb> children;
   @ApiModelProperty(value = "菜单标题")
   private String title;
   @TableField(value = "name")
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
index 3464fab5..80d4d6ec 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemQuartzJobTb.java
@@ -36,9 +36,6 @@ public class SystemQuartzJobTb extends KitBaseUserTimeTb {
   @TableId(value = "id", type = IdType.AUTO)
   @NotNull(groups = {Update.class})
   private Long id;
-  @TableField(exist = false)
-  @ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
-  private String uuid;
   @ApiModelProperty(value = "定时器名称")
   private String jobName;
   @NotBlank
@@ -65,6 +62,5 @@ public class SystemQuartzJobTb extends KitBaseUserTimeTb {
   @NotBlank
   @ApiModelProperty(value = "备注")
   @TableField(updateStrategy = FieldStrategy.ALWAYS)
-  private String
-      description;
+  private String description;
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
index 45c98226..d7e81ce4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemRoleTb.java
@@ -45,8 +45,7 @@ public class SystemRoleTb extends KitBaseUserTimeTb {
   @ApiModelProperty(value = "名称", hidden = true)
   private String name;
   @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义")
-  private String dataScope =
-      SystemDataScopeEnum.THIS_LEVEL.getValue();
+  private String dataScope = SystemDataScopeEnum.THIS_LEVEL.getValue();
   @ApiModelProperty(value = "级别，数值越小，级别越大")
   private Integer level = 3;
   @ApiModelProperty(value = "描述")
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
index 548042dd..43925297 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/dataobject/SystemUserTb.java
@@ -41,9 +41,6 @@ public class SystemUserTb extends KitBaseUserTimeTb {
   @TableField(value = "dept_id")
   @ApiModelProperty(hidden = true)
   private Long deptId;
-  @ApiModelProperty(value = "用户部门")
-  @TableField(exist = false)
-  private SystemDeptTb dept;
   @NotBlank
   @ApiModelProperty(value = "用户名称")
   private String username;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java
deleted file mode 100644
index 0da271d7..00000000
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemOssStorageVo extends SystemOssStorageTb {
-
-  private String fileSizeDesc;
-}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java
deleted file mode 100644
index 90e2d2ca..00000000
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleVo.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemRoleVo extends SystemRoleTb {
-
-  @ApiModelProperty(value = "用户", hidden = true)
-  private Set<SystemUserTb> users;
-  @ApiModelProperty(value = "菜单", hidden = true)
-  private Set<SystemMenuTb> menus;
-  @ApiModelProperty(value = "部门", hidden = true)
-  private Set<SystemDeptTb> depts;
-}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java
deleted file mode 100644
index b5463eea..00000000
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserVo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.odboy.system.dal.model;
-
-import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemUserVo extends SystemUserTb {
-
-  @ApiModelProperty(value = "用户角色")
-  private Set<SystemRoleTb> roles;
-  @ApiModelProperty(value = "用户岗位")
-  private Set<SystemJobTb> jobs;
-}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
similarity index 90%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
index c61b6a5e..02a9da71 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDeptExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDeptExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
similarity index 92%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
index c91c290c..0cd7ff7d 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemDictExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
similarity index 90%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
index 64bce6e2..d4e6f2cd 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemJobExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemJobExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
similarity index 93%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
index 9554c3b9..5148a50e 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemLocalStorageExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemLocalStorageExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
similarity index 93%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
index e23f61de..21c2f4e2 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemMenuExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
index a196dc95..da9d765d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemOssStorageExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemOssStorageExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
index e7d622f1..1f35df7e 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzJobExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzJobExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
index d78de3c1..de272d53 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQuartzLogExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemQuartzLogExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
similarity index 91%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
index b8c95352..549ff2e8 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemRoleExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
index 9bbd2def..cb91d952 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
similarity index 92%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
index e85c86c4..15c386c0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineExportRowVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/export/SystemUserOnlineExportRowVo.java
@@ -1,4 +1,4 @@
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.export;
 
 import cn.idev.excel.annotation.ExcelProperty;
 import cn.odboy.base.KitObject;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
index 808d178c..f8673027 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCheckEmailCaptchaArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCheckEmailCaptchaArgs.java
@@ -1,33 +1,33 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import javax.validation.constraints.NotBlank;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemCheckEmailCaptchaArgs extends KitObject {
-
-  @NotBlank(message = "邮箱不能为空")
-  private String email;
-  @NotBlank(message = "验证码不能为空")
-  private String code;
-  @NotBlank(message = "验证码业务标识不能为空")
-  private String bizCode;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import javax.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemCheckEmailCaptchaArgs extends KitObject {
+
+  @NotBlank(message = "邮箱不能为空")
+  private String email;
+  @NotBlank(message = "验证码不能为空")
+  private String code;
+  @NotBlank(message = "验证码业务标识不能为空")
+  private String bizCode;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
index a9b74309..bc1563d3 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDeptArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDeptArgs.java
@@ -1,36 +1,36 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemCreateDeptArgs extends KitObject {
-
-  @NotBlank(message = "部门名称必填")
-  private String name;
-  @NotNull(message = "部门排序必填")
-  private Integer deptSort;
-  private Boolean enabled;
-  private String isTop;
-  private Long pid;
-  private Integer subCount = 0;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemCreateDeptArgs extends KitObject {
+
+  @NotBlank(message = "部门名称必填")
+  private String name;
+  @NotNull(message = "部门排序必填")
+  private Integer deptSort;
+  private Boolean enabled;
+  private String isTop;
+  private Long pid;
+  private Integer subCount = 0;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
index a8fec72a..71df4f79 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictArgs.java
@@ -1,30 +1,30 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import javax.validation.constraints.NotBlank;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemCreateDictArgs extends KitObject {
-
-  @NotBlank(message = "字典名称必填")
-  private String name;
-  private String description;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import javax.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemCreateDictArgs extends KitObject {
+
+  @NotBlank(message = "字典名称必填")
+  private String name;
+  private String description;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
index 02acd140..70da6316 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateDictDetailArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateDictDetailArgs.java
@@ -1,37 +1,37 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import cn.odboy.system.dal.dataobject.SystemDictTb;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemCreateDictDetailArgs extends KitObject {
-
-  @NotNull(message = "参数dict必填")
-  private SystemDictTb dict;
-  @NotBlank(message = "字典标签必填")
-  private String label;
-  @NotBlank(message = "字典值必填")
-  private String value;
-  @NotNull(message = "字典排序必填")
-  private Integer dictSort;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import cn.odboy.system.dal.dataobject.SystemDictTb;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemCreateDictDetailArgs extends KitObject {
+
+  @NotNull(message = "参数dict必填")
+  private SystemDictTb dict;
+  @NotBlank(message = "字典标签必填")
+  private String label;
+  @NotBlank(message = "字典值必填")
+  private String value;
+  @NotNull(message = "字典排序必填")
+  private Integer dictSort;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
index 43fb7a13..5bc0c6a2 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateJobArgs.java
@@ -1,33 +1,33 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemCreateJobArgs extends KitObject {
-
-  @NotBlank(message = "职位名称必填")
-  private String name;
-  @NotNull(message = "职位排序必填")
-  private Integer jobSort;
-  private Boolean enabled;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemCreateJobArgs extends KitObject {
+
+  @NotBlank(message = "职位名称必填")
+  private String name;
+  @NotNull(message = "职位排序必填")
+  private Integer jobSort;
+  private Boolean enabled;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
index d99fadaf..70faad66 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemCreateRoleArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemCreateRoleArgs.java
@@ -1,42 +1,42 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemCreateRoleArgs extends KitObject {
-
-  @NotBlank(message = "角色名称必填")
-  private String name;
-  @NotNull(message = "角色级别必填")
-  private Integer level;
-  @NotBlank(message = "数据范围必填")
-  private String dataScope;
-  private String description;
-  /**
-   * 关联的部门
-   */
-  private Long id;
-  private Set<SystemDeptTb> depts;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import cn.odboy.system.dal.dataobject.SystemDeptTb;
+import java.util.Set;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemCreateRoleArgs extends KitObject {
+
+  @NotBlank(message = "角色名称必填")
+  private String name;
+  @NotNull(message = "角色级别必填")
+  private Integer level;
+  @NotBlank(message = "数据范围必填")
+  private String dataScope;
+  private String description;
+  /**
+   * 关联的部门
+   */
+  private Long id;
+  private Set<SystemDeptTb> depts;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
index cc8f7ef2..008cc29a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDeptArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDeptArgs.java
@@ -1,38 +1,38 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class SystemQueryDeptArgs {
-
-  @ApiModelProperty(value = "部门id集合")
-  private List<Long> ids;
-  @ApiModelProperty(value = "部门名称")
-  private String name;
-  @ApiModelProperty(value = "是否启用")
-  private Boolean enabled;
-  @ApiModelProperty(value = "上级部门")
-  private Long pid;
-  @ApiModelProperty(value = "PID为空查询")
-  private Boolean pidIsNull;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SystemQueryDeptArgs {
+
+  @ApiModelProperty(value = "部门id集合")
+  private List<Long> ids;
+  @ApiModelProperty(value = "部门名称")
+  private String name;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "上级部门")
+  private Long pid;
+  @ApiModelProperty(value = "PID为空查询")
+  private Boolean pidIsNull;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
index a1c6fb2a..e47babbc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictArgs.java
@@ -1,30 +1,30 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class SystemQueryDictArgs {
-
-  @ApiModelProperty(value = "模糊查询")
-  private String blurry;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SystemQueryDictArgs {
+
+  @ApiModelProperty(value = "模糊查询")
+  private String blurry;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
index f2564f3e..d05f55de 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryDictDetailArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryDictDetailArgs.java
@@ -1,31 +1,31 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemQueryDictDetailArgs extends KitObject {
-
-  @ApiModelProperty(value = "标签")
-  private String label;
-  @ApiModelProperty(value = "字典名称")
-  private String dictName;
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemQueryDictDetailArgs extends KitObject {
+
+  @ApiModelProperty(value = "标签")
+  private String label;
+  @ApiModelProperty(value = "字典名称")
+  private String dictName;
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
index 52196992..53e393bc 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryJobArgs.java
@@ -1,38 +1,38 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class SystemQueryJobArgs {
-
-  @ApiModelProperty(value = "岗位名称")
-  private String name;
-  @ApiModelProperty(value = "是否启用")
-  private Boolean enabled;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SystemQueryJobArgs {
+
+  @ApiModelProperty(value = "岗位名称")
+  private String name;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
index bb66c1c8..f7a45ff9 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryMenuArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryMenuArgs.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class SystemQueryMenuArgs {
-
-  @ApiModelProperty(value = "模糊查询")
-  private String blurry;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "PID为空查询")
-  private Boolean pidIsNull;
-  @ApiModelProperty(value = "PID")
-  private Long pid;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SystemQueryMenuArgs {
+
+  @ApiModelProperty(value = "模糊查询")
+  private String blurry;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "PID为空查询")
+  private Boolean pidIsNull;
+  @ApiModelProperty(value = "PID")
+  private Long pid;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java
new file mode 100644
index 00000000..2d26cc23
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryOperationLogArgs.java
@@ -0,0 +1,11 @@
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemQueryOperationLogArgs extends KitObject {
+
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
index 7114be74..88ee8d81 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryQuartzJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryQuartzJobArgs.java
@@ -1,36 +1,36 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class SystemQueryQuartzJobArgs {
-
-  @ApiModelProperty(value = "定时任务名称")
-  private String jobName;
-  @ApiModelProperty(value = "是否成功")
-  private Boolean isSuccess;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SystemQueryQuartzJobArgs {
+
+  @ApiModelProperty(value = "定时任务名称")
+  private String jobName;
+  @ApiModelProperty(value = "是否成功")
+  private Boolean isSuccess;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
index 6ce2f0df..a08f9acd 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryRoleArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryRoleArgs.java
@@ -1,36 +1,36 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class SystemQueryRoleArgs {
-
-  @ApiModelProperty(value = "模糊查询")
-  private String blurry;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-  @ApiModelProperty(value = "偏移量", hidden = true)
-  private long offset;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SystemQueryRoleArgs {
+
+  @ApiModelProperty(value = "模糊查询")
+  private String blurry;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+  @ApiModelProperty(value = "偏移量", hidden = true)
+  private long offset;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
index b13fcf91..4e524e5d 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryStorageArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryStorageArgs.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.List;
-import lombok.Data;
-
-@Data
-public class SystemQueryStorageArgs {
-
-  @ApiModelProperty(value = "模糊查询")
-  private String blurry;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SystemQueryStorageArgs {
+
+  @ApiModelProperty(value = "模糊查询")
+  private String blurry;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
index a05513dd..f74843f3 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemQueryUserArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemQueryUserArgs.java
@@ -1,47 +1,47 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemQueryUserArgs extends KitObject {
-
-  @ApiModelProperty(value = "ID")
-  private Long id;
-  @ApiModelProperty(value = "多个ID")
-  private Set<Long> deptIds = new HashSet<>();
-  @ApiModelProperty(value = "模糊查询")
-  private String blurry;
-  @ApiModelProperty(value = "是否启用")
-  private Boolean enabled;
-  @ApiModelProperty(value = "部门ID")
-  private Long deptId;
-  @ApiModelProperty(value = "创建时间")
-  private List<Date> createTime;
-  @ApiModelProperty(value = "页码", example = "1")
-  private Integer page = 1;
-  @ApiModelProperty(value = "每页数据量", example = "10")
-  private Integer size = 10;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemQueryUserArgs extends KitObject {
+
+  @ApiModelProperty(value = "ID")
+  private Long id;
+  @ApiModelProperty(value = "多个ID")
+  private Set<Long> deptIds = new HashSet<>();
+  @ApiModelProperty(value = "模糊查询")
+  private String blurry;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "部门ID")
+  private Long deptId;
+  @ApiModelProperty(value = "创建时间")
+  private List<Date> createTime;
+  @ApiModelProperty(value = "页码", example = "1")
+  private Integer page = 1;
+  @ApiModelProperty(value = "每页数据量", example = "10")
+  private Integer size = 10;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
index 4c85cf8b..fa7f28ab 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSendEmailArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemSendEmailArgs.java
@@ -1,43 +1,43 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 发送邮件时，接收参数的类
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SystemSendEmailArgs {
-
-  @NotEmpty
-  @ApiModelProperty(value = "收件人")
-  private List<String> tos;
-  @NotBlank
-  @ApiModelProperty(value = "主题")
-  private String subject;
-  @NotBlank
-  @ApiModelProperty(value = "内容")
-  private String content;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 发送邮件时，接收参数的类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SystemSendEmailArgs {
+
+  @NotEmpty
+  @ApiModelProperty(value = "收件人")
+  private List<String> tos;
+  @NotBlank
+  @ApiModelProperty(value = "主题")
+  private String subject;
+  @NotBlank
+  @ApiModelProperty(value = "内容")
+  private String content;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
index 48813084..7a368607 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateQuartzJobArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateQuartzJobArgs.java
@@ -1,46 +1,46 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemUpdateQuartzJobArgs extends KitObject {
-
-  @NotNull
-  private Long id;
-  private String uuid;
-  private String jobName;
-  @NotBlank
-  private String beanName;
-  @NotBlank
-  private String methodName;
-  private String params;
-  @NotBlank
-  private String cronExpression;
-  private Boolean isPause = false;
-  private String personInCharge;
-  private String email;
-  private String subTask;
-  private Boolean pauseAfterFailure;
-  @NotBlank
-  private String description;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import cn.odboy.base.KitObject;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemUpdateQuartzJobArgs extends KitObject {
+
+  @NotNull
+  private Long id;
+  private String uuid;
+  private String jobName;
+  @NotBlank
+  private String beanName;
+  @NotBlank
+  private String methodName;
+  private String params;
+  @NotBlank
+  private String cronExpression;
+  private Boolean isPause = false;
+  private String personInCharge;
+  private String email;
+  private String subTask;
+  private Boolean pauseAfterFailure;
+  @NotBlank
+  private String description;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
similarity index 92%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
index 9070e53c..d8284b75 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUpdateUserPasswordArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUpdateUserPasswordArgs.java
@@ -1,31 +1,31 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 修改密码
- */
-@Data
-public class SystemUpdateUserPasswordArgs {
-
-  @ApiModelProperty(value = "旧密码")
-  private String oldPass;
-  @ApiModelProperty(value = "新密码")
-  private String newPass;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 修改密码
+ */
+@Data
+public class SystemUpdateUserPasswordArgs {
+
+  @ApiModelProperty(value = "旧密码")
+  private String oldPass;
+  @ApiModelProperty(value = "新密码")
+  private String newPass;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
index e93ea5c5..88e42fa6 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserLoginArgs.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/request/SystemUserLoginArgs.java
@@ -1,37 +1,37 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import javax.validation.constraints.NotBlank;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemUserLoginArgs {
-
-  @NotBlank
-  @ApiModelProperty(value = "用户名")
-  private String username;
-  @NotBlank
-  @ApiModelProperty(value = "密码")
-  private String password;
-  @ApiModelProperty(value = "验证码")
-  private String code;
-  @ApiModelProperty(value = "验证码的key")
-  private String uuid = "";
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemUserLoginArgs {
+
+  @NotBlank
+  @ApiModelProperty(value = "用户名")
+  private String username;
+  @NotBlank
+  @ApiModelProperty(value = "密码")
+  private String password;
+  @ApiModelProperty(value = "验证码")
+  private String code;
+  @ApiModelProperty(value = "验证码的key")
+  private String uuid = "";
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java
new file mode 100644
index 00000000..9024d26e
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemAuthVo.java
@@ -0,0 +1,16 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 登录成功后：token 与 用户信息
+ */
+@Getter
+@Setter
+public class SystemAuthVo extends KitObject {
+
+  private String token;
+  private SystemUserInfoVo user;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java
new file mode 100644
index 00000000..6f6dc84a
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemCaptchaVo.java
@@ -0,0 +1,22 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 验证码信息
+ */
+@Getter
+@Setter
+public class SystemCaptchaVo extends KitObject {
+
+  /**
+   * redis key
+   */
+  private String uuid;
+  /**
+   * image base64
+   */
+  private String img;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java
new file mode 100644
index 00000000..ae6dba88
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDeptVo.java
@@ -0,0 +1,68 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemDeptVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "排序")
+  private Integer deptSort;
+  @ApiModelProperty(value = "部门名称")
+  private String name;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "上级部门")
+  private Long pid;
+  @ApiModelProperty(value = "子节点数目", hidden = true)
+  private Integer subCount = 0;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemDeptVo dept = (SystemDeptVo) o;
+    return Objects.equals(id, dept.id) && Objects.equals(name, dept.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+  @ApiModelProperty(value = "是否有子节点")
+  public Boolean getHasChildren() {
+    return subCount > 0;
+  }
+
+  @ApiModelProperty(value = "是否为叶子")
+  public Boolean getLeaf() {
+    return subCount <= 0;
+  }
+
+  @ApiModelProperty(value = "标签名称")
+  public String getLabel() {
+    return name;
+  }
+
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "子部门")
+  private List<SystemDeptVo> children;
+}
diff --git a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
similarity index 61%
rename from cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
index 4a64efa3..45fdb903 100644
--- a/cutejava-springboot3/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemDictDetailVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemDictDetailVo.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.odboy.system.dal.model;
+package cn.odboy.system.dal.model.response;
 
-import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
+import cn.odboy.base.KitBaseUserTimeTb;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -23,8 +23,21 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class SystemDictDetailVo extends SystemDictDetailTb {
+public class SystemDictDetailVo extends KitBaseUserTimeTb {
 
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(hidden = true)
+  private Long dictId;
+  @ApiModelProperty(value = "字典标签")
+  private String label;
+  @ApiModelProperty(value = "字典值")
+  private String value;
+  @ApiModelProperty(value = "排序")
+  private Integer dictSort = 999;
+  /**
+   * 扩展字段
+   */
   @ApiModelProperty(value = "字典")
   private SystemDictTb dict;
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
index 3ae49d0b..a49bd485 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuMetaVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuMetaVo.java
@@ -1,35 +1,35 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-public class SystemMenuMetaVo extends KitObject {
-
-  @ApiModelProperty(value = "菜单标题")
-  private String title;
-  @ApiModelProperty(value = "菜单图标")
-  private String icon;
-  @ApiModelProperty(value = "缓存")
-  private Boolean noCache;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SystemMenuMetaVo extends KitObject {
+
+  @ApiModelProperty(value = "菜单标题")
+  private String title;
+  @ApiModelProperty(value = "菜单图标")
+  private String icon;
+  @ApiModelProperty(value = "缓存")
+  private Boolean noCache;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
similarity index 89%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
index d1344996..d98c65ff 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemMenuVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuRouterVo.java
@@ -1,47 +1,47 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 构建前端路由时用到
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemMenuVo extends KitObject {
-
-  @ApiModelProperty(value = "菜单名称")
-  private String name;
-  @ApiModelProperty(value = "路径")
-  private String path;
-  @ApiModelProperty(value = "隐藏状态")
-  private Boolean hidden;
-  @ApiModelProperty(value = "重定向")
-  private String redirect;
-  @ApiModelProperty(value = "组件")
-  private String component;
-  @ApiModelProperty(value = "总是显示")
-  private Boolean alwaysShow;
-  @ApiModelProperty(value = "元数据")
-  private SystemMenuMetaVo meta;
-  @ApiModelProperty(value = "子路由")
-  private List<SystemMenuVo> children;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 构建前端路由时用到
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemMenuRouterVo extends KitObject {
+
+  @ApiModelProperty(value = "菜单名称")
+  private String name;
+  @ApiModelProperty(value = "路径")
+  private String path;
+  @ApiModelProperty(value = "隐藏状态")
+  private Boolean hidden;
+  @ApiModelProperty(value = "重定向")
+  private String redirect;
+  @ApiModelProperty(value = "组件")
+  private String component;
+  @ApiModelProperty(value = "总是显示")
+  private Boolean alwaysShow;
+  @ApiModelProperty(value = "元数据")
+  private SystemMenuMetaVo meta;
+  @ApiModelProperty(value = "子路由")
+  private List<SystemMenuRouterVo> children;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java
new file mode 100644
index 00000000..597a02af
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemMenuVo.java
@@ -0,0 +1,84 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemMenuVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "菜单标题")
+  private String title;
+  @ApiModelProperty(value = "菜单组件名称")
+  private String componentName;
+  @ApiModelProperty(value = "排序")
+  private Integer menuSort = 999;
+  @ApiModelProperty(value = "组件路径")
+  private String component;
+  @ApiModelProperty(value = "路由地址")
+  private String path;
+  @ApiModelProperty(value = "菜单类型，目录、菜单、按钮")
+  private Integer type;
+  @ApiModelProperty(value = "权限标识")
+  private String permission;
+  @ApiModelProperty(value = "菜单图标")
+  private String icon;
+  @ApiModelProperty(value = "缓存")
+  private Boolean cache;
+  @ApiModelProperty(value = "是否隐藏")
+  private Boolean hidden;
+  @ApiModelProperty(value = "上级菜单")
+  private Long pid;
+  @ApiModelProperty(value = "子节点数目", hidden = true)
+  private Integer subCount = 0;
+  @ApiModelProperty(value = "外链菜单")
+  private Boolean iFrame;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemMenuVo menu = (SystemMenuVo) o;
+    return Objects.equals(id, menu.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+
+  @ApiModelProperty(value = "是否有子节点")
+  public Boolean getHasChildren() {
+    return subCount > 0;
+  }
+
+  @ApiModelProperty(value = "是否为叶子")
+  public Boolean getLeaf() {
+    return subCount <= 0;
+  }
+
+  @ApiModelProperty(value = "标签名称")
+  public String getLabel() {
+    return title;
+  }
+
+  /**
+   * 附加属性
+   */
+  @ApiModelProperty(value = "菜单角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "子菜单")
+  private List<SystemMenuVo> children;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java
new file mode 100644
index 00000000..503cfddf
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemOssStorageVo.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemOssStorageVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty("ID")
+  private Long id;
+  @ApiModelProperty("类型，比如minio")
+  private String serviceType;
+  @ApiModelProperty("服务地址")
+  private String endpoint;
+  @ApiModelProperty("存储桶名称")
+  private String bucketName;
+  @ApiModelProperty("完整文件名称")
+  private String fileName;
+  @ApiModelProperty("文件大小, 单位：字节")
+  private Long fileSize;
+  @ApiModelProperty("文件类型")
+  private String fileMime;
+  @ApiModelProperty("短文件名")
+  private String filePrefix;
+  @ApiModelProperty("文件后缀")
+  private String fileSuffix;
+  @ApiModelProperty("文件md5")
+  private String fileMd5;
+  @ApiModelProperty("文件链接")
+  private String fileUrl;
+  @ApiModelProperty("文件编码")
+  private String fileCode;
+  @ApiModelProperty("对象路径")
+  private String objectName;
+  /**
+   * 扩展字段
+   */
+  private String fileSizeDesc;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
index 0f85dd05..91527bee 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineTreeVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineTreeVo.java
@@ -1,30 +1,30 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemProductLineTreeVo extends KitObject {
-
-  private String value;
-  private String label;
-  private List<SystemProductLineTreeVo> children;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemProductLineTreeVo extends KitObject {
+
+  private String value;
+  private String label;
+  private List<SystemProductLineTreeVo> children;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
similarity index 92%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
index a629f57e..e358907b 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemProductLineVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemProductLineVo.java
@@ -1,38 +1,38 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class SystemProductLineVo extends KitObject {
-
-  /**
-   * 部门ID（select的value）
-   */
-  private Long value;
-  /**
-   * 产品线，如"研发部/华南分部/devops组"
-   */
-  private String label;
-  /**
-   * ID路径，如"1-2-3"
-   */
-  private String idPath;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemProductLineVo extends KitObject {
+
+  /**
+   * 部门ID（select的value）
+   */
+  private Long value;
+  /**
+   * 产品线，如"研发部/华南分部/devops组"
+   */
+  private String label;
+  /**
+   * ID路径，如"1-2-3"
+   */
+  private String idPath;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java
new file mode 100644
index 00000000..caf2e513
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemQuartzJobVo.java
@@ -0,0 +1,39 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemQuartzJobVo extends KitBaseUserTimeTb {
+  private Long id;
+  @ApiModelProperty(value = "定时器名称")
+  private String jobName;
+  @ApiModelProperty(value = "Bean名称")
+  private String beanName;
+  @ApiModelProperty(value = "方法名称")
+  private String methodName;
+  @ApiModelProperty(value = "参数")
+  private String params;
+  @ApiModelProperty(value = "cron表达式")
+  private String cronExpression;
+  @ApiModelProperty(value = "状态：暂停或启动")
+  private Boolean isPause = false;
+  @ApiModelProperty(value = "负责人")
+  private String personInCharge;
+  @ApiModelProperty(value = "报警邮箱")
+  private String email;
+  @ApiModelProperty(value = "子任务")
+  private String subTask;
+  @ApiModelProperty(value = "失败后暂停")
+  private Boolean pauseAfterFailure;
+  @ApiModelProperty(value = "备注")
+  private String description;
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
+  private String uuid;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
index 62552fc1..2fb55924 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemRoleCodeVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleCodeVo.java
@@ -1,34 +1,34 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
-
-/**
- * 避免序列化问题
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SystemRoleCodeVo implements GrantedAuthority {
-
-  @ApiModelProperty(value = "角色名")
-  private String authority;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.security.core.GrantedAuthority;
+
+/**
+ * 避免序列化问题
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SystemRoleCodeVo implements GrantedAuthority {
+
+  @ApiModelProperty(value = "角色名")
+  private String authority;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java
new file mode 100644
index 00000000..88a34ce2
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemRoleVo.java
@@ -0,0 +1,55 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitBaseUserTimeTb;
+import cn.odboy.system.constant.SystemDataScopeEnum;
+import cn.odboy.system.dal.dataobject.SystemDeptTb;
+import cn.odboy.system.dal.dataobject.SystemUserTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemRoleVo extends KitBaseUserTimeTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "名称", hidden = true)
+  private String name;
+  @ApiModelProperty(value = "数据权限，全部 、 本级 、 自定义")
+  private String dataScope = SystemDataScopeEnum.THIS_LEVEL.getValue();
+  @ApiModelProperty(value = "级别，数值越小，级别越大")
+  private Integer level = 3;
+  @ApiModelProperty(value = "描述")
+  private String description;
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用户", hidden = true)
+  private Set<SystemUserTb> users;
+  @ApiModelProperty(value = "菜单", hidden = true)
+  private Set<SystemMenuVo> menus;
+  @ApiModelProperty(value = "部门", hidden = true)
+  private Set<SystemDeptTb> depts;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemRoleVo role = (SystemRoleVo) o;
+    return Objects.equals(id, role.id);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id);
+  }
+
+
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
similarity index 91%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
index fb5e3a75..fd60f0c1 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemSimpleUserVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemSimpleUserVo.java
@@ -1,57 +1,55 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Set;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemSimpleUserVo extends KitObject {
-
-  @ApiModelProperty(value = "ID", hidden = true)
-  private Long id;
-  @ApiModelProperty(value = "用户角色")
-  private Set<SystemRoleTb> roles;
-  @ApiModelProperty(value = "用户岗位")
-  private Set<SystemJobTb> jobs;
-  private Long deptId;
-  @TableField(exist = false)
-  private SystemDeptTb dept;
-  @ApiModelProperty(value = "用户名称")
-  private String username;
-  @ApiModelProperty(value = "用户昵称")
-  private String nickName;
-  @ApiModelProperty(value = "邮箱")
-  private String email;
-  @ApiModelProperty(value = "电话号码")
-  private String phone;
-  @ApiModelProperty(value = "用户性别")
-  private String gender;
-  @ApiModelProperty(value = "头像真实名称", hidden = true)
-  private String avatarName;
-  @ApiModelProperty(value = "是否启用")
-  private Boolean enabled;
-  @ApiModelProperty(value = "是否为admin账号", hidden = true)
-  private Boolean isAdmin = false;
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import cn.odboy.system.dal.dataobject.SystemDeptTb;
+import cn.odboy.system.dal.dataobject.SystemJobTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Set;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemSimpleUserVo extends KitObject {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(value = "用户角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "用户岗位")
+  private Set<SystemJobTb> jobs;
+  private Long deptId;
+  private SystemDeptTb dept;
+  @ApiModelProperty(value = "用户名称")
+  private String username;
+  @ApiModelProperty(value = "用户昵称")
+  private String nickName;
+  @ApiModelProperty(value = "邮箱")
+  private String email;
+  @ApiModelProperty(value = "电话号码")
+  private String phone;
+  @ApiModelProperty(value = "用户性别")
+  private String gender;
+  @ApiModelProperty(value = "头像真实名称", hidden = true)
+  private String avatarName;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "是否为admin账号", hidden = true)
+  private Boolean isAdmin = false;
 }
\ No newline at end of file
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
similarity index 93%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
index 41614581..1d435bc4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserInfoVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserInfoVo.java
@@ -1,36 +1,36 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import cn.odboy.base.KitObject;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SystemUserInfoVo extends KitObject {
-
-  private SystemSimpleUserVo user;
-  private List<Long> dataScopes;
-  private List<SystemRoleCodeVo> authorities;
-
-  public Set<String> getRoles() {
-    return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet());
-  }
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.base.KitObject;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SystemUserInfoVo extends KitObject {
+
+  private SystemSimpleUserVo user;
+  private List<Long> dataScopes;
+  private List<SystemRoleCodeVo> authorities;
+
+  public Set<String> getRoles() {
+    return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet());
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
index dbbd3545..9d47f2ef 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserJwtVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserJwtVo.java
@@ -1,77 +1,77 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.security.core.userdetails.UserDetails;
-
-@Getter
-@AllArgsConstructor
-public class SystemUserJwtVo implements UserDetails {
-
-  @ApiModelProperty(value = "用户")
-  private final SystemUserVo user;
-  @ApiModelProperty(value = "数据权限")
-  private final List<Long> dataScopes;
-  @ApiModelProperty(value = "角色")
-  private final List<SystemRoleCodeVo> authorities;
-
-  public Set<String> getRoles() {
-    return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet());
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public String getPassword() {
-    return user.getPassword();
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public String getUsername() {
-    return user.getUsername();
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public boolean isAccountNonExpired() {
-    return true;
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public boolean isAccountNonLocked() {
-    return true;
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public boolean isCredentialsNonExpired() {
-    return true;
-  }
-
-  @Override
-  @JSONField(serialize = false)
-  public boolean isEnabled() {
-    return user.getEnabled();
-  }
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.security.core.userdetails.UserDetails;
+
+@Getter
+@AllArgsConstructor
+public class SystemUserJwtVo implements UserDetails {
+
+  @ApiModelProperty(value = "用户")
+  private final SystemUserVo user;
+  @ApiModelProperty(value = "数据权限")
+  private final List<Long> dataScopes;
+  @ApiModelProperty(value = "角色")
+  private final List<SystemRoleCodeVo> authorities;
+
+  public Set<String> getRoles() {
+    return authorities.stream().map(SystemRoleCodeVo::getAuthority).collect(Collectors.toSet());
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public String getPassword() {
+    return user.getPassword();
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public String getUsername() {
+    return user.getUsername();
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public boolean isAccountNonExpired() {
+    return true;
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public boolean isAccountNonLocked() {
+    return true;
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public boolean isCredentialsNonExpired() {
+    return true;
+  }
+
+  @Override
+  @JSONField(serialize = false)
+  public boolean isEnabled() {
+    return user.getEnabled();
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
similarity index 94%
rename from cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java
rename to cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
index b8a56f20..90d0ad67 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/SystemUserOnlineVo.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserOnlineVo.java
@@ -1,46 +1,46 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.dal.model;
-
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 在线用户
- */
-@Data
-public class SystemUserOnlineVo {
-
-  @ApiModelProperty(value = "Token编号")
-  private String uid;
-  @ApiModelProperty(value = "用户名")
-  private String userName;
-  @ApiModelProperty(value = "昵称")
-  private String nickName;
-  @ApiModelProperty(value = "岗位")
-  private String dept;
-  @ApiModelProperty(value = "浏览器")
-  private String browser;
-  @ApiModelProperty(value = "IP")
-  private String ip;
-  @ApiModelProperty(value = "地址")
-  private String address;
-  @ApiModelProperty(value = "token")
-  private String key;
-  @ApiModelProperty(value = "登录时间")
-  private Date loginTime;
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.dal.model.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 在线用户
+ */
+@Data
+public class SystemUserOnlineVo {
+
+  @ApiModelProperty(value = "Token编号")
+  private String uid;
+  @ApiModelProperty(value = "用户名")
+  private String userName;
+  @ApiModelProperty(value = "昵称")
+  private String nickName;
+  @ApiModelProperty(value = "岗位")
+  private String dept;
+  @ApiModelProperty(value = "浏览器")
+  private String browser;
+  @ApiModelProperty(value = "IP")
+  private String ip;
+  @ApiModelProperty(value = "地址")
+  private String address;
+  @ApiModelProperty(value = "token")
+  private String key;
+  @ApiModelProperty(value = "登录时间")
+  private Date loginTime;
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java
new file mode 100644
index 00000000..12559de4
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/model/response/SystemUserVo.java
@@ -0,0 +1,71 @@
+package cn.odboy.system.dal.model.response;
+
+import cn.odboy.system.dal.dataobject.SystemJobTb;
+import cn.odboy.system.dal.dataobject.SystemRoleTb;
+import cn.odboy.system.dal.dataobject.SystemUserTb;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.Objects;
+import java.util.Set;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SystemUserVo extends SystemUserTb {
+
+  @ApiModelProperty(value = "ID", hidden = true)
+  private Long id;
+  @ApiModelProperty(hidden = true)
+  private Long deptId;
+  @ApiModelProperty(value = "用户名称")
+  private String username;
+  @ApiModelProperty(value = "用户昵称")
+  private String nickName;
+  @ApiModelProperty(value = "邮箱")
+  private String email;
+  @ApiModelProperty(value = "电话号码")
+  private String phone;
+  @ApiModelProperty(value = "用户性别")
+  private String gender;
+  @ApiModelProperty(value = "头像真实名称", hidden = true)
+  private String avatarName;
+  @ApiModelProperty(value = "头像存储的路径", hidden = true)
+  private String avatarPath;
+  @ApiModelProperty(value = "密码")
+  private String password;
+  @ApiModelProperty(value = "是否启用")
+  private Boolean enabled;
+  @ApiModelProperty(value = "是否为admin账号", hidden = true)
+  private Boolean isAdmin = false;
+  @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+  private Date pwdResetTime;
+
+  /**
+   * 扩展字段
+   */
+  @ApiModelProperty(value = "用户部门")
+  private SystemDeptVo dept;
+  @ApiModelProperty(value = "用户角色")
+  private Set<SystemRoleTb> roles;
+  @ApiModelProperty(value = "用户岗位")
+  private Set<SystemJobTb> jobs;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SystemUserVo user = (SystemUserVo) o;
+    return Objects.equals(id, user.id) && Objects.equals(username, user.username);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username);
+  }
+
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
index 30b2c4e4..ca437b0f 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemDictDetailMapper.java
@@ -16,7 +16,7 @@
 package cn.odboy.system.dal.mysql;
 
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
index 64c70147..0b1cfb82 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/mysql/SystemQuartzJobMapper.java
@@ -16,6 +16,8 @@
 package cn.odboy.system.dal.mysql;
 
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -27,4 +29,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SystemQuartzJobMapper extends BaseMapper<SystemQuartzJobTb> {
 
+  default SystemQuartzJobVo selectVoById(String id) {
+    return KitBeanUtil.copyToClass(selectById(id), SystemQuartzJobVo.class);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
index aea97b10..ccb32148 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserInfoDAO.java
@@ -3,7 +3,7 @@ package cn.odboy.system.dal.redis;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
index 9a1749d9..5c8129b4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java
@@ -1,27 +1,24 @@
 package cn.odboy.system.dal.redis;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.export.SystemUserOnlineExportRowVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitBrowserUtil;
 import cn.odboy.util.KitDesEncryptUtil;
-import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitIPUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
@@ -81,28 +78,28 @@ public class SystemUserOnlineInfoDAO {
     redisHelper.del(loginKey);
   }
 
-  /**
-   * 导出
-   *
-   * @param all      /
-   * @param response /
-   * @throws IOException /
-   */
-  public void downloadUserOnlineModelExcel(List<SystemUserOnlineVo> all, HttpServletResponse response)
-      throws IOException {
-    List<Map<String, Object>> list = new ArrayList<>();
-    for (SystemUserOnlineVo user : all) {
-      Map<String, Object> map = new LinkedHashMap<>();
-      map.put("用户名", user.getUserName());
-      map.put("部门", user.getDept());
-      map.put("登录IP", user.getIp());
-      map.put("登录地点", user.getAddress());
-      map.put("浏览器", user.getBrowser());
-      map.put("登录日期", user.getLoginTime());
-      list.add(map);
-    }
-    KitFileUtil.downloadExcel(list, response);
-  }
+//  /**
+//   * 导出
+//   *
+//   * @param all      /
+//   * @param response /
+//   * @throws IOException /
+//   */
+//  public void downloadUserOnlineModelExcel(List<SystemUserOnlineVo> all, HttpServletResponse response)
+//      throws IOException {
+//    List<Map<String, Object>> list = new ArrayList<>();
+//    for (SystemUserOnlineVo user : all) {
+//      Map<String, Object> map = new LinkedHashMap<>();
+//      map.put("用户名", user.getUserName());
+//      map.put("部门", user.getDept());
+//      map.put("登录IP", user.getIp());
+//      map.put("登录地点", user.getAddress());
+//      map.put("浏览器", user.getBrowser());
+//      map.put("登录日期", user.getLoginTime());
+//      list.add(map);
+//    }
+//    KitFileUtil.downloadExcel(list, response);
+//  }
 
   /**
    * 根据用户名强退用户
@@ -121,7 +118,7 @@ public class SystemUserOnlineInfoDAO {
    * @param pageable /
    * @return /
    */
-  public KitPageResult<SystemUserOnlineVo> queryUserOnlineModelPage(SystemUserOnlineVo onlineVo,
+  public KitPageResult<SystemUserOnlineVo> searchOnlineUser(SystemUserOnlineVo onlineVo,
       IPage<SystemUserOnlineVo> pageable) {
     String username = null;
     if (onlineVo != null) {
@@ -171,9 +168,7 @@ public class SystemUserOnlineInfoDAO {
 
   public void exportOnlineUserXlsx(HttpServletResponse response, String username) {
     List<SystemUserOnlineVo> userOnlineVos = this.queryUserOnlineModelListByUsername(username);
-//    KitXlsxExportUtil.exportFile(response, "在线用户数据", userOnlineVos, SystemUserOnlineExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemUserOnlineExportRowVo.class)));
-    List<SystemUserOnlineVo> rowVos = BeanUtil.copyToList(userOnlineVos, SystemUserOnlineVo.class);
-    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineVo.class, rowVos);
+    List<SystemUserOnlineExportRowVo> rowVos = KitBeanUtil.copyToList(userOnlineVos, SystemUserOnlineExportRowVo.class);
+    KitExcelExporter.exportSimple(response, "在线用户数据", SystemUserOnlineExportRowVo.class, rowVos);
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
index cf82ccec..9805d137 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/bizlock/BizLockAspect.java
@@ -72,7 +72,8 @@ public class BizLockAspect {
     Object[] args = joinPoint.getArgs();
     for (int i = 0; i < parameterNames.length; i++) {
       context.setVariable(parameterNames[i], args[i]);
-      context.setVariable("p" + i, args[i]); // 支持#p0,#p1格式
+      // 支持#p0,#p1格式
+      context.setVariable("p" + i, args[i]);
     }
     // 设置方法相关信息
     context.setVariable("methodName", method.getName());
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
index 66245aee..69fc85eb 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/OperationLogAspect.java
@@ -1,120 +1,120 @@
-/*
- * Copyright 2021-2025 Odboy
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package cn.odboy.system.framework.operalog;
-
-import cn.hutool.core.date.TimeInterval;
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.odboy.framework.context.KitRequestHolder;
-import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
-import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
-import cn.odboy.system.framework.permission.core.KitSecurityHelper;
-import cn.odboy.util.KitBrowserUtil;
-import cn.odboy.util.KitIPUtil;
-import com.alibaba.fastjson2.JSON;
-import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 捕捉操作日志
- *
- * @author odboy
- * @date 2025-05-12
- */
-@Slf4j
-@Aspect
-@Component
-public class OperationLogAspect {
-
-  @Autowired
-  private SystemOperationLogMapper systemOperationLogMapper;
-
-  @Around("@annotation(operationLog)")
-  public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
-    return handleLog(joinPoint, operationLog);
-  }
-
-  private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
-    TimeInterval timeInterval = new TimeInterval();
-    try {
-      Object result = joinPoint.proceed();
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      ThreadUtil.execAsync(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          // 忽略
-        }
-      });
-      return result;
-    } catch (Throwable exception) {
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
-      ThreadUtil.execAsync(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          // 忽略
-        }
-      });
-      throw exception;
-    }
-  }
-
-  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
-      TimeInterval timeInterval) {
-    long executeTime = timeInterval.intervalMs();
-    MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-    String bizName = annotation.bizName();
-    if (StrUtil.isBlank(bizName)) {
-      Method method = signature.getMethod();
-      ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
-      if (apiOperation != null) {
-        bizName = apiOperation.value();
-      }
-    }
-    if (StrUtil.isBlank(bizName)) {
-      bizName = "默认业务";
-    }
-    String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-    Object[] args = joinPoint.getArgs();
-    String params = JSON.toJSONString(args);
-    HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
-    String requestIp = KitBrowserUtil.getIp(request);
-    String browserInfo = KitBrowserUtil.getVersion(request);
-    String address = KitIPUtil.getCityInfo(requestIp);
-    String username = KitSecurityHelper.getCurrentUsername();
-    SystemOperationLogTb record = new SystemOperationLogTb();
-    record.setBizName(bizName);
-    record.setMethod(method);
-    record.setParams(params);
-    record.setRequestIp(requestIp);
-    record.setExecuteTime(executeTime);
-    record.setUsername(username);
-    record.setAddress(address);
-    record.setBrowserInfo(browserInfo);
-    return record;
-  }
-}
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.framework.operalog;
+
+import cn.hutool.core.date.TimeInterval;
+import cn.hutool.core.exceptions.ExceptionUtil;
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.odboy.framework.context.KitRequestHolder;
+import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
+import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
+import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBrowserUtil;
+import cn.odboy.util.KitIPUtil;
+import com.alibaba.fastjson2.JSON;
+import io.swagger.annotations.ApiOperation;
+import java.lang.reflect.Method;
+import javax.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 捕捉操作日志
+ *
+ * @author odboy
+ * @date 2025-05-12
+ */
+@Slf4j
+@Aspect
+@Component
+public class OperationLogAspect {
+
+  @Autowired
+  private SystemOperationLogMapper systemOperationLogMapper;
+
+  @Around("@annotation(operationLog)")
+  public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
+    return handleLog(joinPoint, operationLog);
+  }
+
+  private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
+    TimeInterval timeInterval = new TimeInterval();
+    try {
+      Object result = joinPoint.proceed();
+      long interval = timeInterval.interval();
+      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
+      ThreadUtil.execAsync(() -> {
+        try {
+          systemOperationLogMapper.insert(record);
+        } catch (Exception e) {
+          // 忽略
+        }
+      });
+      return result;
+    } catch (Throwable exception) {
+      long interval = timeInterval.interval();
+      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, interval);
+      record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
+      ThreadUtil.execAsync(() -> {
+        try {
+          systemOperationLogMapper.insert(record);
+        } catch (Exception e) {
+          // 忽略
+        }
+      });
+      throw exception;
+    }
+  }
+
+  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation, long executeTime) {
+    MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+    String bizName = annotation.bizName();
+    if (StrUtil.isBlank(bizName)) {
+      Method method = signature.getMethod();
+      ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
+      if (apiOperation != null) {
+        bizName = apiOperation.value();
+      }
+    }
+    if (StrUtil.isBlank(bizName)) {
+      bizName = "默认业务";
+    }
+    String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
+    Object[] args = joinPoint.getArgs();
+    String params = JSON.toJSONString(args);
+    HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
+    String requestIp = KitBrowserUtil.getIp(request);
+    String browserInfo = KitBrowserUtil.getVersion(request);
+    String address = KitIPUtil.getCityInfo(requestIp);
+    String username = KitSecurityHelper.getCurrentUsername();
+    SystemOperationLogTb record = new SystemOperationLogTb();
+    record.setBizName(bizName);
+    record.setMethod(method);
+    record.setParams(params);
+    record.setRequestIp(requestIp);
+    record.setExecuteTime(executeTime);
+    record.setUsername(username);
+    record.setAddress(address);
+    record.setBrowserInfo(browserInfo);
+    return record;
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java
deleted file mode 100644
index f5327ab0..00000000
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/annotaions/OperationLog.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright 2021-2025 Odboy
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package cn.odboy.system.framework.operalog.annotaions;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 捕捉操作日志
- *
- * @author odboy
- * @date 2025-05-12
- */
-@Inherited
-@Documented
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface OperationLog {
-
-  String bizName() default "";
-}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java
deleted file mode 100644
index 3651422f..00000000
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/operalog/core/SystemOperationLogAspect.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Copyright 2021-2025 Odboy
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package cn.odboy.system.framework.operalog.core;
-
-import cn.hutool.core.date.TimeInterval;
-import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.odboy.framework.context.KitRequestHolder;
-import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
-import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
-import cn.odboy.system.framework.operalog.annotaions.OperationLog;
-import cn.odboy.system.framework.permission.core.KitSecurityHelper;
-import cn.odboy.util.KitBrowserUtil;
-import cn.odboy.util.KitIPUtil;
-import com.alibaba.fastjson2.JSON;
-import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 捕捉操作日志
- *
- * @author odboy
- * @date 2025-05-12
- */
-@Slf4j
-@Aspect
-@Component
-public class SystemOperationLogAspect {
-
-  @Autowired
-  private SystemOperationLogMapper systemOperationLogMapper;
-
-  @Around("@annotation(operationLog)")
-  public Object operationLogCatch(ProceedingJoinPoint joinPoint, OperationLog operationLog) throws Throwable {
-    return handleLog(joinPoint, operationLog);
-  }
-
-  private Object handleLog(ProceedingJoinPoint joinPoint, OperationLog annotation) throws Throwable {
-    TimeInterval timeInterval = new TimeInterval();
-    try {
-      Object result = joinPoint.proceed();
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      ThreadUtil.execAsync(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          //                    log.error("保存审计日志失败", e);
-          // 忽略
-        }
-      });
-      return result;
-    } catch (Throwable exception) {
-      SystemOperationLogTb record = getOperationLogTb(joinPoint, annotation, timeInterval);
-      record.setExceptionDetail(ExceptionUtil.stacktraceToString(exception));
-      ThreadUtil.execAsync(() -> {
-        try {
-          systemOperationLogMapper.insert(record);
-        } catch (Exception e) {
-          //                    log.error("保存审计日志失败", e);
-          // 忽略
-        }
-      });
-      throw exception;
-    }
-  }
-
-  private SystemOperationLogTb getOperationLogTb(ProceedingJoinPoint joinPoint, OperationLog annotation,
-      TimeInterval timeInterval) {
-    long executeTime = timeInterval.intervalMs();
-    MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-    String bizName = annotation.bizName();
-    if (StrUtil.isBlank(bizName)) {
-      Method method = signature.getMethod();
-      ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
-      if (apiOperation != null) {
-        bizName = apiOperation.value();
-      }
-    }
-    if (StrUtil.isBlank(bizName)) {
-      bizName = "默认业务";
-    }
-    String method = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-    Object[] args = joinPoint.getArgs();
-    String params = JSON.toJSONString(args);
-    HttpServletRequest request = KitRequestHolder.getHttpServletRequest();
-    String requestIp = KitBrowserUtil.getIp(request);
-    String browserInfo = KitBrowserUtil.getVersion(request);
-    String address = KitIPUtil.getCityInfo(requestIp);
-    String username = KitSecurityHelper.getCurrentUsername();
-    SystemOperationLogTb record = new SystemOperationLogTb();
-    record.setBizName(bizName);
-    record.setMethod(method);
-    record.setParams(params);
-    record.setRequestIp(requestIp);
-    record.setExecuteTime(executeTime);
-    record.setUsername(username);
-    record.setAddress(address);
-    record.setBrowserInfo(browserInfo);
-    return record;
-  }
-}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
index d416582d..4fabab7b 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/config/SpringSecurityConfig.java
@@ -80,7 +80,7 @@ public class SpringSecurityConfig {
         .and().headers().frameOptions().disable()
         // 不创建会话
         .and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and().authorizeRequests()
-        // 静态资源等等
+        // 静态资源等
         .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/websocket/**").permitAll()
         // swagger 文档
         .antMatchers("/swagger-ui.html").permitAll().antMatchers("/swagger-resources/**").permitAll()
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
index c23efa9d..66302e69 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenFilter.java
@@ -17,7 +17,7 @@ package cn.odboy.system.framework.permission.core.handler;
 
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.constant.SystemConst;
-import cn.odboy.system.dal.model.SystemUserOnlineVo;
+import cn.odboy.system.dal.model.response.SystemUserOnlineVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import java.io.IOException;
 import javax.servlet.FilterChain;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
index 28659cb6..1e06d39a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/TokenProvider.java
@@ -21,7 +21,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.odboy.constant.SystemConst;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import cn.odboy.system.dal.redis.SystemCacheKey;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtParser;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
index 1c0c0e27..66e83d0a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/permission/core/handler/UserDetailsHandler.java
@@ -16,9 +16,9 @@
 package cn.odboy.system.framework.permission.core.handler;
 
 import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.system.dal.model.SystemRoleCodeVo;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemRoleCodeVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.redis.SystemUserInfoDAO;
 import cn.odboy.system.service.SystemDataService;
 import cn.odboy.system.service.SystemRoleService;
@@ -30,7 +30,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
 
 /**
- * TODO 通过用户名判断用户信息，并获取拥有的权限与部门
+ * 通过用户名判断用户信息，并获取拥有的权限与部门
  */
 @Slf4j
 @Service("userDetailsService")
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
index 0090bc30..3f5427c0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ActiveJobRegister.java
@@ -15,7 +15,7 @@
  */
 package cn.odboy.system.framework.quartz;
 
-import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.service.SystemQuartzJobService;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +40,7 @@ public class ActiveJobRegister implements ApplicationRunner {
    */
   @Override
   public void run(ApplicationArguments applicationArguments) {
-    List<SystemQuartzJobTb> quartzJobs = systemQuartzJobService.listEnableQuartzJob();
+    List<SystemQuartzJobVo> quartzJobs = systemQuartzJobService.listEnableQuartzJob();
     quartzJobs.forEach(quartzManage::addJob);
     log.info("Timing task injection complete");
   }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
index dc88ff28..b41d2cd8 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/ExecutionJobBean.java
@@ -26,7 +26,8 @@ import cn.odboy.framework.quartz.core.QuartzRunnable;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
 import cn.odboy.system.service.SystemEmailService;
 import cn.odboy.system.service.SystemQuartzJobService;
@@ -51,7 +52,7 @@ public class ExecutionJobBean extends QuartzJobBean {
   @Override
   public void executeInternal(JobExecutionContext context) {
     // 获取任务
-    SystemQuartzJobTb quartzJob = (SystemQuartzJobTb) context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
+    SystemQuartzJobVo quartzJob = (SystemQuartzJobVo) context.getMergedJobDataMap().get(SystemQuartzJobTb.JOB_KEY);
     // 获取spring bean
     SystemQuartzLogMapper quartzLogMapper = KitSpringBeanHolder.getBean(SystemQuartzLogMapper.class);
     SystemQuartzJobService systemQuartzJobService = KitSpringBeanHolder.getBean(SystemQuartzJobService.class);
@@ -66,8 +67,7 @@ public class ExecutionJobBean extends QuartzJobBean {
     quartzLog.setCronExpression(quartzJob.getCronExpression());
     try {
       // 执行任务
-      QuartzRunnable task =
-          new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams());
+      QuartzRunnable task = new QuartzRunnable(quartzJob.getBeanName(), quartzJob.getMethodName(), quartzJob.getParams());
       Future<?> future = executor.submit(task);
       // 忽略任务执行结果
       future.get();
@@ -114,14 +114,13 @@ public class ExecutionJobBean extends QuartzJobBean {
     }
   }
 
-  private SystemSendEmailArgs taskAlarm(SystemQuartzJobTb quartzJob, String msg) {
+  private SystemSendEmailArgs taskAlarm(SystemQuartzJobVo quartzJob, String msg) {
     SystemSendEmailArgs sendEmailRequest = new SystemSendEmailArgs();
     sendEmailRequest.setSubject("定时任务【" + quartzJob.getJobName() + "】执行失败，请尽快处理！");
     Map<String, Object> data = new HashMap<>(16);
     data.put("task", quartzJob);
     data.put("msg", msg);
-    TemplateEngine engine =
-        TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
+    TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
     Template template = engine.getTemplate("SystemQuartzJobTaskAlarmTemplate.ftl");
     sendEmailRequest.setContent(template.render(data));
     List<String> emails = Arrays.asList(quartzJob.getEmail().split("[,，]"));
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
index 96063bed..fa6d0006 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/framework/quartz/QuartzManage.java
@@ -17,6 +17,7 @@ package cn.odboy.system.framework.quartz;
 
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import java.util.Date;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -42,7 +43,7 @@ public class QuartzManage {
   @Resource
   private Scheduler scheduler;
 
-  public void addJob(SystemQuartzJobTb quartzJob) {
+  public void addJob(SystemQuartzJobVo quartzJob) {
     try {
       // 构建job信息
       JobDetail jobDetail =
@@ -74,7 +75,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void updateJobCron(SystemQuartzJobTb quartzJob) {
+  public void updateJobCron(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -120,7 +121,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void resumeJob(SystemQuartzJobTb quartzJob) {
+  public void resumeJob(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -141,7 +142,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void runJobNow(SystemQuartzJobTb quartzJob) {
+  public void runJobNow(SystemQuartzJobVo quartzJob) {
     try {
       TriggerKey triggerKey = TriggerKey.triggerKey(JOB_NAME + quartzJob.getId());
       CronTrigger trigger = (CronTrigger) scheduler.getTrigger(triggerKey);
@@ -164,7 +165,7 @@ public class QuartzManage {
    *
    * @param quartzJob /
    */
-  public void pauseJob(SystemQuartzJobTb quartzJob) {
+  public void pauseJob(SystemQuartzJobVo quartzJob) {
     try {
       JobKey jobKey = JobKey.jobKey(JOB_NAME + quartzJob.getId());
       scheduler.pauseJob(jobKey);
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
new file mode 100644
index 00000000..88ef9508
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/OpenCaptchaController.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021-2025 Odboy
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.odboy.system.openapi;
+
+import cn.odboy.annotation.AnonymousPostMapping;
+import cn.odboy.system.dal.model.response.SystemCaptchaVo;
+import cn.odboy.system.service.SystemCaptchaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/captcha")
+@Api(tags = "系统：验证码管理")
+public class OpenCaptchaController {
+
+  @Autowired
+  private SystemCaptchaService systemCaptchaService;
+
+  @ApiOperation("获取验证码")
+  @AnonymousPostMapping(value = "/getCode")
+  public ResponseEntity<SystemCaptchaVo> getCode() {
+    SystemCaptchaVo imgResult = systemCaptchaService.getLoginCaptcha();
+    return ResponseEntity.ok(imgResult);
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
index a5b0a510..28e2f86a 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemAuthService.java
@@ -1,26 +1,19 @@
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.odboy.constant.CaptchaCodeEnum;
 import cn.odboy.constant.SystemConst;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
-import cn.odboy.framework.redis.KitRedisHelper;
-import cn.odboy.system.dal.model.SystemUserInfoVo;
-import cn.odboy.system.dal.model.SystemUserJwtVo;
-import cn.odboy.system.dal.model.SystemUserLoginArgs;
-import cn.odboy.system.dal.redis.SystemCacheKey;
+import cn.odboy.system.dal.model.request.SystemUserLoginArgs;
+import cn.odboy.system.dal.model.response.SystemAuthVo;
+import cn.odboy.system.dal.model.response.SystemUserInfoVo;
+import cn.odboy.system.dal.model.response.SystemUserJwtVo;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
 import cn.odboy.system.framework.permission.core.handler.TokenProvider;
 import cn.odboy.system.framework.permission.core.handler.UserDetailsHandler;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitRsaEncryptUtil;
-import com.wf.captcha.base.Captcha;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import cn.odboy.util.KitValidUtil;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -33,51 +26,47 @@ import org.springframework.stereotype.Service;
 public class SystemAuthService {
 
   @Autowired
-  private KitRedisHelper redisHelper;
+  private AppProperties properties;
   @Autowired
   private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO;
   @Autowired
   private TokenProvider tokenProvider;
   @Autowired
-  private AppProperties properties;
-  @Autowired
   private PasswordEncoder passwordEncoder;
   @Autowired
   private UserDetailsHandler userDetailsService;
+  @Autowired
+  private SystemCaptchaService systemCaptchaService;
+
+  public SystemAuthVo doLogin(SystemUserLoginArgs loginArgs, HttpServletRequest request) throws Exception {
+    KitValidUtil.notNull(loginArgs);
 
-  public Map<String, Object> doLogin(SystemUserLoginArgs loginRequest, HttpServletRequest request) throws Exception {
     // 密码解密
-    String password =
-        KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginRequest.getPassword());
-    // 查询验证码
-    String code = redisHelper.get(loginRequest.getUuid(), String.class);
-    // 清除验证码
-    redisHelper.del(loginRequest.getUuid());
-    if (StrUtil.isBlank(code)) {
-      throw new BadRequestException("验证码不存在或已过期");
-    }
-    if (StrUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) {
-      throw new BadRequestException("验证码错误");
-    }
+    String password = KitRsaEncryptUtil.decryptByPrivateKey(properties.getRsa().getPrivateKey(), loginArgs.getPassword());
+    // 校验验证码
+    systemCaptchaService.validate(loginArgs.getUuid(), loginArgs.getCode());
     // 获取用户信息
-    SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername());
+    SystemUserJwtVo jwtUser = userDetailsService.loadUserByUsername(loginArgs.getUsername());
     // 验证用户密码
     if (!passwordEncoder.matches(password, jwtUser.getPassword())) {
       throw new BadRequestException("登录密码错误");
     }
-    Authentication authentication =
-        new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
+
+    // 登录验证
+    Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities());
     SecurityContextHolder.getContext().setAuthentication(authentication);
+
     // 生成令牌
     String token = tokenProvider.createToken(jwtUser);
     // 返回 token 与 用户信息
-    Map<String, Object> authInfo = new HashMap<>(2) {{
-      put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
-      put("user", BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class));
-    }};
+    SystemAuthVo authInfo = new SystemAuthVo();
+    authInfo.setToken(String.format("%s %s", SystemConst.TOKEN_PREFIX, token));
+    /// 这里是为了清空密码
+    authInfo.setUser(KitBeanUtil.copyToClass(jwtUser, SystemUserInfoVo.class));
+
     if (properties.getLogin().isSingle()) {
       // 踢掉之前已经登录的token
-      systemUserOnlineInfoDAO.kickOutByUsername(loginRequest.getUsername());
+      systemUserOnlineInfoDAO.kickOutByUsername(loginArgs.getUsername());
     }
     // 保存在线信息
     systemUserOnlineInfoDAO.saveUserJwtModelByToken(jwtUser, token, request);
@@ -85,29 +74,12 @@ public class SystemAuthService {
     return authInfo;
   }
 
-  public SystemUserInfoVo getCurrentUserInfoVo() {
+  public SystemUserJwtVo getCurrentUserInfo() {
     SystemUserJwtVo jwtUser = (SystemUserJwtVo) KitSecurityHelper.getCurrentUser();
-    return BeanUtil.copyProperties(jwtUser, SystemUserInfoVo.class);
-  }
-
-  public Map<String, Object> getCaptchaInfo() {
-    // 获取运算的结果
-    Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha();
-    String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
-    //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型
-    String captchaValue = captcha.text();
-    if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() &&
-        captchaValue.contains(SystemConst.SYMBOL_DOT)) {
-      captchaValue = captchaValue.split("\\.")[0];
+    if (jwtUser.getUser() != null) {
+      jwtUser.getUser().setPassword(null);
     }
-    // 保存
-    redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(),
-        TimeUnit.MINUTES);
-    // 验证码信息
-    return new HashMap<>(2) {{
-      put("img", captcha.toBase64());
-      put("uuid", uuid);
-    }};
+    return jwtUser;
   }
 
   public void doLogout(HttpServletRequest request) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java
new file mode 100644
index 00000000..1de7cbcd
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemCaptchaService.java
@@ -0,0 +1,59 @@
+package cn.odboy.system.service;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.odboy.constant.CaptchaCodeEnum;
+import cn.odboy.constant.SystemConst;
+import cn.odboy.framework.exception.BadRequestException;
+import cn.odboy.framework.properties.AppProperties;
+import cn.odboy.framework.redis.KitRedisHelper;
+import cn.odboy.system.dal.model.response.SystemCaptchaVo;
+import cn.odboy.system.dal.redis.SystemCacheKey;
+import com.wf.captcha.base.Captcha;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 验证码
+ */
+@Service
+public class SystemCaptchaService {
+
+  @Autowired
+  private KitRedisHelper redisHelper;
+  @Autowired
+  private AppProperties properties;
+
+  public SystemCaptchaVo getLoginCaptcha() {
+    // 获取运算的结果
+    Captcha captcha = properties.getLogin().getCaptchaSetting().getCaptcha();
+    String uuid = SystemCacheKey.CAPTCHA_LOGIN + IdUtil.simpleUUID();
+    //当验证码类型为 arithmetic时且长度 >= 2 时, captcha.text()的结果有几率为浮点型
+    String captchaValue = captcha.text();
+    if (captcha.getCharType() - 1 == CaptchaCodeEnum.ARITHMETIC.ordinal() &&
+        captchaValue.contains(SystemConst.SYMBOL_DOT)) {
+      captchaValue = captchaValue.split("\\.")[0];
+    }
+    // 保存
+    redisHelper.set(uuid, captchaValue, properties.getLogin().getCaptchaSetting().getExpiration(), TimeUnit.MINUTES);
+    // 验证码信息
+    SystemCaptchaVo captchaVo = new SystemCaptchaVo();
+    captchaVo.setUuid(uuid);
+    captchaVo.setImg(captcha.toBase64());
+    return captchaVo;
+  }
+
+  public void validate(String uuid, String inputCode) {
+    // 查询验证码
+    String code = redisHelper.get(uuid, String.class);
+    if (StrUtil.isBlank(code)) {
+      throw new BadRequestException("验证码不存在或已过期");
+    }
+    // 清除验证码
+    redisHelper.del(uuid);
+    if (StrUtil.isBlank(inputCode) || !code.equalsIgnoreCase(inputCode)) {
+      throw new BadRequestException("验证码错误");
+    }
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
index 20ad9dc6..128f8fb3 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDataService.java
@@ -18,9 +18,9 @@ package cn.odboy.system.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -49,12 +49,12 @@ public class SystemDataService {
    * @param user /
    * @return /
    */
-  public List<Long> queryDeptIdByArgs(SystemUserTb user) {
+  public List<Long> queryDeptIdByArgs(SystemUserVo user) {
     List<Long> deptIds = new ArrayList<>();
     // 查询用户角色
     List<SystemRoleVo> roleList = systemUserRoleService.queryRoleByUsersId(user.getId());
     // 获取对应的部门ID
-    for (SystemRoleTb role : roleList) {
+    for (SystemRoleVo role : roleList) {
       SystemDataScopeEnum dataScopeEnum = SystemDataScopeEnum.find(role.getDataScope());
       switch (Objects.requireNonNull(dataScopeEnum)) {
         case THIS_LEVEL:
@@ -77,11 +77,11 @@ public class SystemDataService {
    * @param role    角色
    * @return 数据权限ID
    */
-  private List<Long> queryCustomDataPermissionByArgs(List<Long> deptIds, SystemRoleTb role) {
+  private List<Long> queryCustomDataPermissionByArgs(List<Long> deptIds, SystemRoleVo role) {
     List<SystemDeptTb> deptList = systemRoleDeptService.listDeptByRoleId(role.getId());
     for (SystemDeptTb dept : deptList) {
       deptIds.add(dept.getId());
-      List<SystemDeptTb> deptChildren = systemDeptService.listDeptByPid(dept.getId());
+      List<SystemDeptVo> deptChildren = systemDeptService.listDeptByPid(dept.getId());
       if (CollUtil.isNotEmpty(deptChildren)) {
         deptIds.addAll(systemDeptService.queryChildDeptIdByDeptIds(deptChildren));
       }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
index 1a35d3e4..7c0aa0ec 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -25,14 +24,17 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.constant.SystemDataScopeEnum;
 import cn.odboy.system.constant.SystemZhConst;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.model.SystemCreateDeptArgs;
-import cn.odboy.system.dal.model.SystemDeptExportRowVo;
-import cn.odboy.system.dal.model.SystemProductLineTreeVo;
-import cn.odboy.system.dal.model.SystemProductLineVo;
-import cn.odboy.system.dal.model.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.export.SystemDeptExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateDeptArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDeptArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemProductLineTreeVo;
+import cn.odboy.system.dal.model.response.SystemProductLineVo;
 import cn.odboy.system.dal.mysql.SystemDeptMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.lang.reflect.Field;
@@ -68,7 +70,8 @@ public class SystemDeptService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDept(SystemCreateDeptArgs args) {
-    systemDeptMapper.insert(BeanUtil.copyProperties(args, SystemDeptTb.class));
+    KitValidUtil.notNull(args);
+    systemDeptMapper.insert(KitBeanUtil.copyToClass(args, SystemDeptTb.class));
     this.updateDeptSubCnt(args.getPid());
   }
 
@@ -78,9 +81,11 @@ public class SystemDeptService {
    * @param args /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void updateDept(SystemDeptTb args) {
-    // 旧的部门
-    Long oldPid = this.getDeptById(args.getId()).getPid();
+  public void updateDeptById(SystemDeptTb args) {
+    KitValidUtil.notNull(args);
+    // 旧的父部门
+    Long oldPid = this.getDeptVoById(args.getId()).getPid();
+    // 新的父部门
     Long newPid = args.getPid();
     if (args.getPid() != null && args.getId().equals(args.getPid())) {
       throw new BadRequestException("上级不能为自己");
@@ -100,10 +105,10 @@ public class SystemDeptService {
   @Transactional(rollbackFor = Exception.class)
   public void deleteDeptByIds(Set<Long> ids) {
     // 获取部门, 和其所有子部门
-    Set<SystemDeptTb> depts = this.traverseDeptByIdWithPids(ids);
+    Set<SystemDeptVo> depts = this.traverseDeptByIdWithPids(ids);
     // 验证是否被角色或用户关联
     this.verifyBindRelationByIds(depts);
-    for (SystemDeptTb dept : depts) {
+    for (SystemDeptVo dept : depts) {
       systemDeptMapper.deleteById(dept.getId());
       this.updateDeptSubCnt(dept.getPid());
     }
@@ -145,17 +150,16 @@ public class SystemDeptService {
   }
 
   private List<SystemDeptTb> queryDeptByArgs(SystemQueryDeptArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds());
-      wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName());
-      wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled());
-      wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid());
-      wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid);
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.in(CollUtil.isNotEmpty(args.getIds()), SystemDeptTb::getId, args.getIds());
+    wrapper.like(StrUtil.isNotBlank(args.getName()), SystemDeptTb::getName, args.getName());
+    wrapper.eq(args.getEnabled() != null, SystemDeptTb::getEnabled, args.getEnabled());
+    wrapper.eq(args.getPid() != null, SystemDeptTb::getPid, args.getPid());
+    wrapper.isNull(args.getPidIsNull() != null, SystemDeptTb::getPid);
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemDeptTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemDeptTb::getDeptSort);
     return systemDeptMapper.selectList(wrapper);
@@ -209,8 +213,8 @@ public class SystemDeptService {
    * @param id /
    * @return /
    */
-  public SystemDeptTb getDeptById(Long id) {
-    return systemDeptMapper.selectById(id);
+  public SystemDeptVo getDeptVoById(Long id) {
+    return KitBeanUtil.copyToClass(systemDeptMapper.selectById(id), SystemDeptVo.class);
   }
 
   /**
@@ -218,24 +222,22 @@ public class SystemDeptService {
    *
    * @param deptTbList /
    * @param depts      /
-   * @return /
    */
-  private Set<SystemDeptTb> queryRelationDeptByArgs(List<SystemDeptTb> deptTbList, Set<SystemDeptTb> depts) {
-    for (SystemDeptTb dept : deptTbList) {
+  private void queryRelationDeptByArgs(List<SystemDeptVo> deptTbList, Set<SystemDeptVo> depts) {
+    for (SystemDeptVo dept : deptTbList) {
       depts.add(dept);
-      List<SystemDeptTb> deptList = this.listDeptByPid(dept.getId());
+      List<SystemDeptVo> deptList = this.listDeptByPid(dept.getId());
       if (CollUtil.isNotEmpty(deptList)) {
         queryRelationDeptByArgs(deptList, depts);
       }
     }
-    return depts;
   }
 
-  public List<Long> queryChildDeptIdByDeptIds(List<SystemDeptTb> deptList) {
+  public List<Long> queryChildDeptIdByDeptIds(List<SystemDeptVo> deptList) {
     List<Long> list = new ArrayList<>();
-    for (SystemDeptTb systemDeptTb : deptList) {
+    for (SystemDeptVo systemDeptTb : deptList) {
       if (systemDeptTb != null && systemDeptTb.getEnabled()) {
-        List<SystemDeptTb> deptList1 = this.listDeptByPid(systemDeptTb.getId());
+        List<SystemDeptVo> deptList1 = this.listDeptByPid(systemDeptTb.getId());
         if (CollUtil.isNotEmpty(deptList1)) {
           list.addAll(queryChildDeptIdByDeptIds(deptList1));
         }
@@ -252,19 +254,19 @@ public class SystemDeptService {
    * @param deptList /
    * @return /
    */
-  private List<SystemDeptTb> querySuperiorDeptByPid(SystemDeptTb dept, List<SystemDeptTb> deptList) {
+  private List<SystemDeptVo> querySuperiorDeptByPid(SystemDeptVo dept, List<SystemDeptVo> deptList) {
     if (dept.getPid() == null) {
       deptList.addAll(this.listRootDept());
       return deptList;
     }
     deptList.addAll(this.listDeptByPid(dept.getPid()));
-    return querySuperiorDeptByPid(this.getDeptById(dept.getPid()), deptList);
+    return querySuperiorDeptByPid(this.getDeptVoById(dept.getPid()), deptList);
   }
 
-  private List<SystemDeptTb> listRootDept() {
+  private List<SystemDeptVo> listRootDept() {
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.isNull(SystemDeptTb::getPid);
-    return systemDeptMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class);
   }
 
   /**
@@ -272,15 +274,15 @@ public class SystemDeptService {
    *
    * @return /
    */
-  public KitPageResult<SystemDeptTb> searchDeptTree(List<Long> ids, Boolean exclude) {
-    Set<SystemDeptTb> deptSet1 = new LinkedHashSet<>();
+  public KitPageResult<SystemDeptVo> searchDeptTree(List<Long> ids, Boolean exclude) {
+    Set<SystemDeptVo> deptSet1 = new LinkedHashSet<>();
     for (Long id : ids) {
       // 同级数据
-      SystemDeptTb dept = this.getDeptById(id);
+      SystemDeptVo dept = this.getDeptVoById(id);
       // 上级数据
-      List<SystemDeptTb> depts = this.querySuperiorDeptByPid(dept, new ArrayList<>());
+      List<SystemDeptVo> depts = this.querySuperiorDeptByPid(dept, new ArrayList<>());
       if (exclude) {
-        for (SystemDeptTb data : depts) {
+        for (SystemDeptVo data : depts) {
           if (data.getId().equals(dept.getPid())) {
             data.setSubCount(data.getSubCount() - 1);
           }
@@ -290,18 +292,18 @@ public class SystemDeptService {
       }
       deptSet1.addAll(depts);
     }
-    ArrayList<SystemDeptTb> deptList = new ArrayList<>(deptSet1);
+    List<SystemDeptVo> deptList = new ArrayList<>(deptSet1);
     // 构建部门树
-    Set<SystemDeptTb> trees = new LinkedHashSet<>();
-    Set<SystemDeptTb> deptSet = new LinkedHashSet<>();
-    List<String> deptNames = deptList.stream().map(SystemDeptTb::getName).collect(Collectors.toList());
+    Set<SystemDeptVo> trees = new LinkedHashSet<>();
+    Set<SystemDeptVo> deptSet = new LinkedHashSet<>();
+    List<String> deptNames = deptList.stream().map(SystemDeptVo::getName).collect(Collectors.toList());
     boolean isChild;
-    for (SystemDeptTb dept : deptList) {
+    for (SystemDeptVo dept : deptList) {
       isChild = false;
       if (dept.getPid() == null) {
         trees.add(dept);
       }
-      for (SystemDeptTb it : deptList) {
+      for (SystemDeptVo it : deptList) {
         if (it.getPid() != null && dept.getId().equals(it.getPid())) {
           isChild = true;
           if (dept.getChildren() == null) {
@@ -312,14 +314,14 @@ public class SystemDeptService {
       }
       if (isChild) {
         deptSet.add(dept);
-      } else if (dept.getPid() != null && !deptNames.contains(this.getDeptById(dept.getPid()).getName())) {
+      } else if (dept.getPid() != null && !deptNames.contains(this.getDeptVoById(dept.getPid()).getName())) {
         deptSet.add(dept);
       }
     }
     if (CollectionUtil.isEmpty(trees)) {
       trees = deptSet;
     }
-    KitPageResult<SystemDeptTb> baseResult = new KitPageResult<>();
+    KitPageResult<SystemDeptVo> baseResult = new KitPageResult<>();
     baseResult.setContent(CollectionUtil.isEmpty(trees) ? new ArrayList<>(deptSet) : new ArrayList<>(trees));
     baseResult.setTotalElements(deptSet.size());
     return baseResult;
@@ -330,8 +332,8 @@ public class SystemDeptService {
    *
    * @param deptSet /
    */
-  public void verifyBindRelationByIds(Set<SystemDeptTb> deptSet) {
-    Set<Long> deptIds = deptSet.stream().map(SystemDeptTb::getId).collect(Collectors.toSet());
+  public void verifyBindRelationByIds(Set<SystemDeptVo> deptSet) {
+    Set<Long> deptIds = deptSet.stream().map(SystemDeptVo::getId).collect(Collectors.toSet());
     if (systemUserDeptService.countUserByDeptIds(deptIds) > 0) {
       throw new BadRequestException("所选部门存在用户关联，请解除后再试！");
     }
@@ -351,21 +353,21 @@ public class SystemDeptService {
    *
    * @param ids /
    */
-  public Set<SystemDeptTb> traverseDeptByIdWithPids(Set<Long> ids) {
-    Set<SystemDeptTb> depts = new HashSet<>();
+  public Set<SystemDeptVo> traverseDeptByIdWithPids(Set<Long> ids) {
+    Set<SystemDeptVo> depts = new HashSet<>();
     for (Long id : ids) {
       // 根部门
-      depts.add(this.getDeptById(id));
+      depts.add(this.getDeptVoById(id));
       // 子部门
-      List<SystemDeptTb> deptList = listDeptByPid(id);
+      List<SystemDeptVo> deptList = this.listDeptByPid(id);
       if (CollectionUtil.isNotEmpty(deptList)) {
-        depts = queryRelationDeptByArgs(deptList, depts);
+        queryRelationDeptByArgs(deptList, depts);
       }
     }
     return depts;
   }
 
-  public List<SystemProductLineVo> queryDeptSelectDataSource() {
+  public List<SystemProductLineVo> listDeptSelectDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     return buildDeptSelectOptions(depts);
   }
@@ -414,7 +416,7 @@ public class SystemDeptService {
     }
   }
 
-  public List<SystemProductLineTreeVo> queryDeptSelectProDataSource() {
+  public List<SystemProductLineTreeVo> listDeptSelectProDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     // 获取所有部门并按父子关系组织
     Map<Long, SystemDeptTb> deptMap =
@@ -463,21 +465,14 @@ public class SystemDeptService {
     return vo;
   }
 
-  public List<SystemDeptTb> listDeptByPid(long pid) {
+  public List<SystemDeptVo> listDeptByPid(long pid) {
     LambdaQueryWrapper<SystemDeptTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemDeptTb::getPid, pid);
-    return systemDeptMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemDeptMapper.selectList(wrapper), SystemDeptVo.class);
   }
 
   public void exportDeptXlsx(HttpServletResponse response, SystemQueryDeptArgs args) throws Exception {
     List<SystemDeptTb> systemDeptTbs = this.queryAllDeptByArgs(args, false);
-//    KitXlsxExportUtil.exportFile(response, "部门数据", systemDeptTbs, SystemDeptExportRowVo.class, (dataObject) -> {
-//      SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemDeptExportRowVo> rowVos = new ArrayList<>();
     for (SystemDeptTb dataObject : systemDeptTbs) {
       SystemDeptExportRowVo rowVo = new SystemDeptExportRowVo();
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
index a9266e9c..bffcdd85 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictDetailService.java
@@ -15,18 +15,19 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictDetailTb;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictDetailArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemCreateDictDetailArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictDetailArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
 import cn.odboy.system.dal.mysql.SystemDictDetailMapper;
 import cn.odboy.system.dal.mysql.SystemDictMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -55,7 +56,9 @@ public class SystemDictDetailService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDictDetail(SystemCreateDictDetailArgs args) {
-    SystemDictDetailTb dictDetail = BeanUtil.copyProperties(args, SystemDictDetailTb.class);
+    KitValidUtil.notNull(args);
+    KitValidUtil.notNull(args.getDict());
+    SystemDictDetailTb dictDetail = KitBeanUtil.copyToClass(args, SystemDictDetailTb.class);
     dictDetail.setDictId(args.getDict().getId());
     systemDictDetailMapper.insert(dictDetail);
   }
@@ -104,10 +107,9 @@ public class SystemDictDetailService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemDictDetailVo> searchDictDetail(SystemQueryDictDetailArgs args,
-      Page<SystemDictDetailTb> page) {
-    IPage<SystemDictDetailVo> iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> BeanUtil.copyProperties(i, SystemDictDetailVo.class));
-    List<Long> dictIds = iPage.getRecords().stream().map(SystemDictDetailTb::getDictId).collect(Collectors.toList());
+  public KitPageResult<SystemDictDetailVo> searchDictDetail(SystemQueryDictDetailArgs args, Page<SystemDictDetailTb> page) {
+    IPage<SystemDictDetailVo> iPage = systemDictDetailMapper.selectPageByArgs(page, args).convert(i -> KitBeanUtil.copyToClass(i, SystemDictDetailVo.class));
+    List<Long> dictIds = iPage.getRecords().stream().map(SystemDictDetailVo::getDictId).collect(Collectors.toList());
     Map<Long, SystemDictTb> id2ItemMap = systemDictMapper.selectByIds(dictIds).stream().collect(Collectors.toMap(SystemDictTb::getId, i -> i));
     for (SystemDictDetailVo record : iPage.getRecords()) {
       record.setDict(id2ItemMap.get(record.getDictId()));
@@ -129,11 +131,12 @@ public class SystemDictDetailService {
     if (systemDictTb == null) {
       return new ArrayList<>();
     }
-    return this.listDictDetailByDictId(systemDictTb.getId()).stream().map(m -> {
-      SystemDictDetailVo detailVo = BeanUtil.copyProperties(m, SystemDictDetailVo.class);
+    List<SystemDictDetailTb> detailTbs = this.listDictDetailByDictId(systemDictTb.getId());
+    List<SystemDictDetailVo> detailVos = KitBeanUtil.copyToList(detailTbs, SystemDictDetailVo.class);
+    for (SystemDictDetailVo detailVo : detailVos) {
       detailVo.setDict(systemDictTb);
-      return detailVo;
-    }).collect(Collectors.toList());
+    }
+    return detailVos;
   }
 
   public Map<String, List<SystemDictDetailVo>> getDictDetailMap(String dictName) {
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
index 58d54e77..843230ad 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDictService.java
@@ -15,17 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemDictTb;
-import cn.odboy.system.dal.model.SystemCreateDictArgs;
-import cn.odboy.system.dal.model.SystemDictDetailVo;
-import cn.odboy.system.dal.model.SystemDictExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryDictArgs;
+import cn.odboy.system.dal.model.export.SystemDictExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateDictArgs;
+import cn.odboy.system.dal.model.request.SystemQueryDictArgs;
+import cn.odboy.system.dal.model.response.SystemDictDetailVo;
 import cn.odboy.system.dal.mysql.SystemDictMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,7 +53,8 @@ public class SystemDictService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void saveDict(SystemCreateDictArgs args) {
-    systemDictMapper.insert(BeanUtil.copyProperties(args, SystemDictTb.class));
+    SystemDictTb dictTb = KitBeanUtil.copyToClass(args, SystemDictTb.class);
+    systemDictMapper.insert(dictTb);
   }
 
   /**
@@ -96,10 +98,9 @@ public class SystemDictService {
   }
 
   private void injectQueryParams(SystemQueryDictArgs args, LambdaQueryWrapper<SystemDictTb> wrapper) {
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or()
-          .like(SystemDictTb::getDescription, args.getBlurry()));
-    }
+    KitValidUtil.notNull(args);
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()), c -> c.like(SystemDictTb::getName, args.getBlurry()).or()
+        .like(SystemDictTb::getDescription, args.getBlurry()));
   }
 
   public List<SystemDictTb> queryDictByArgs(SystemQueryDictArgs args) {
@@ -110,29 +111,6 @@ public class SystemDictService {
 
   public void exportDictXlsx(HttpServletResponse response, SystemQueryDictArgs args) {
     List<SystemDictTb> systemDictTbs = this.queryDictByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "字典数据", systemDictTbs, SystemDictExportRowVo.class, (dataObject) -> {
-//      List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());
-//      if (CollUtil.isEmpty(dictDetails)) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel("");
-//        rowVo.setValue("");
-//        return CollUtil.newArrayList(rowVo);
-//      }
-//      List<SystemDictExportRowVo> rowVos = new ArrayList<>();
-//      for (SystemDictDetailVo dictDetail : dictDetails) {
-//        SystemDictExportRowVo rowVo = new SystemDictExportRowVo();
-//        rowVo.setName(dataObject.getName());
-//        rowVo.setDescription(dataObject.getDescription());
-//        rowVo.setCreateTime(dataObject.getCreateTime());
-//        rowVo.setLabel(dictDetail.getLabel());
-//        rowVo.setValue(dictDetail.getValue());
-//        rowVos.add(rowVo);
-//      }
-//      return rowVos;
-//    });
     List<SystemDictExportRowVo> rowVos = new ArrayList<>();
     for (SystemDictTb dataObject : systemDictTbs) {
       List<SystemDictDetailVo> dictDetails = systemDictDetailService.listDictDetailByName(dataObject.getName());
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
index 1971ceb9..a795bc10 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemEmailService.java
@@ -24,8 +24,8 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
 import cn.odboy.system.dal.dataobject.SystemEmailConfigTb;
-import cn.odboy.system.dal.model.SystemCheckEmailCaptchaArgs;
-import cn.odboy.system.dal.model.SystemSendEmailArgs;
+import cn.odboy.system.dal.model.request.SystemCheckEmailCaptchaArgs;
+import cn.odboy.system.dal.model.request.SystemSendEmailArgs;
 import cn.odboy.system.dal.mysql.SystemEmailConfigMapper;
 import cn.odboy.util.KitDesEncryptUtil;
 import cn.odboy.util.KitResourceTemplateUtil;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
index b7ca5ede..0b03c384 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemJobService.java
@@ -15,17 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
-import cn.odboy.system.dal.model.SystemCreateJobArgs;
-import cn.odboy.system.dal.model.SystemJobExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryJobArgs;
+import cn.odboy.system.dal.model.export.SystemJobExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateJobArgs;
+import cn.odboy.system.dal.model.request.SystemQueryJobArgs;
 import cn.odboy.system.dal.mysql.SystemJobMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -43,7 +44,7 @@ public class SystemJobService {
   @Autowired
   private SystemJobMapper systemJobMapper;
   @Autowired
-  private SystemUserService systemUserService;
+  private SystemUserJobService systemUserJobService;
 
   /**
    * 创建
@@ -56,7 +57,8 @@ public class SystemJobService {
     if (job != null) {
       throw new BadRequestException("职位名称已存在");
     }
-    systemJobMapper.insert(BeanUtil.copyProperties(args, SystemJobTb.class));
+    SystemJobTb systemJobTb = KitBeanUtil.copyToClass(args, SystemJobTb.class);
+    systemJobMapper.insert(systemJobTb);
   }
 
   /**
@@ -115,7 +117,7 @@ public class SystemJobService {
    * @param ids /
    */
   public void verifyBindRelationByIds(Set<Long> ids) {
-    if (systemUserService.countUserByJobIds(ids) > 0) {
+    if (systemUserJobService.countUserByJobIds(ids) > 0) {
       throw new BadRequestException("所选的岗位中存在用户关联, 请解除关联再试！");
     }
   }
@@ -127,26 +129,18 @@ public class SystemJobService {
   }
 
   public void injectQueryParams(SystemQueryJobArgs args, LambdaQueryWrapper<SystemJobTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName());
-      wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getName()), SystemJobTb::getName, args.getName());
+    wrapper.eq(args.getEnabled() != null, SystemJobTb::getEnabled, args.getEnabled());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemJobTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemJobTb::getJobSort, SystemJobTb::getId);
   }
 
   public void exportJobXlsx(HttpServletResponse response, SystemQueryJobArgs args) {
     List<SystemJobTb> systemJobTbs = this.queryJobByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "岗位数据", systemJobTbs, SystemJobExportRowVo.class, (dataObject) -> {
-//      SystemJobExportRowVo rowVo = new SystemJobExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setEnabled(dataObject.getEnabled() ? "启用" : "停用");
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemJobExportRowVo> rowVos = new ArrayList<>();
     for (SystemJobTb dataObject : systemJobTbs) {
       SystemJobExportRowVo rowVo = new SystemJobExportRowVo();
@@ -157,4 +151,8 @@ public class SystemJobService {
     }
     KitExcelExporter.exportSimple(response, "岗位数据", SystemJobExportRowVo.class, rowVos);
   }
+
+  public List<SystemJobTb> listByIds(Set<Long> jobIds) {
+    return systemJobMapper.selectByIds(jobIds);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
index 9944ca02..6fe99a64 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemLocalStorageService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
@@ -28,11 +27,13 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.dal.dataobject.SystemLocalStorageTb;
-import cn.odboy.system.dal.model.SystemLocalStorageExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.export.SystemLocalStorageExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
 import cn.odboy.system.dal.mysql.SystemLocalStorageMapper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -139,16 +140,15 @@ public class SystemLocalStorageService {
   }
 
   private void injectQueryParams(SystemQueryStorageArgs args, LambdaQueryWrapper<SystemLocalStorageTb> wrapper) {
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getType, args.getBlurry()).or()
-              .like(SystemLocalStorageTb::getCreateBy, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    KitValidUtil.notNull(args);
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemLocalStorageTb::getName, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getSuffix, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getType, args.getBlurry()).or()
+            .like(SystemLocalStorageTb::getCreateBy, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemLocalStorageTb::getUpdateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemLocalStorageTb::getId);
   }
@@ -171,9 +171,7 @@ public class SystemLocalStorageService {
 
   public void exportLocalStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) {
     List<SystemLocalStorageTb> systemLocalStorageTbs = this.queryLocalStorageByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "文件上传记录数据", systemLocalStorageTbs, SystemLocalStorageExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemLocalStorageExportRowVo.class)));
-    List<SystemLocalStorageExportRowVo> rowVos = BeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class);
+    List<SystemLocalStorageExportRowVo> rowVos = KitBeanUtil.copyToList(systemLocalStorageTbs, SystemLocalStorageExportRowVo.class);
     KitExcelExporter.exportSimple(response, "文件上传记录数据", SystemLocalStorageExportRowVo.class, rowVos);
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
index 7d947d81..5a4d9443 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemMenuService.java
@@ -19,22 +19,22 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
+import cn.odboy.framework.logging.ExecutionTimeStatisticsFace;
+import cn.odboy.system.constant.SystemTransferProtocolConst;
 import cn.odboy.system.constant.SystemYesOrNoChConst;
-import cn.odboy.system.constant.TransferProtocolConst;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleMenuTb;
-import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemMenuExportRowVo;
-import cn.odboy.system.dal.model.SystemMenuMetaVo;
-import cn.odboy.system.dal.model.SystemMenuVo;
-import cn.odboy.system.dal.model.SystemQueryMenuArgs;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.export.SystemMenuExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryMenuArgs;
+import cn.odboy.system.dal.model.response.SystemMenuMetaVo;
+import cn.odboy.system.dal.model.response.SystemMenuRouterVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
 import cn.odboy.system.dal.mysql.SystemMenuMapper;
-import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitClassUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -59,8 +59,6 @@ public class SystemMenuService {
   @Autowired
   private SystemMenuMapper systemMenuMapper;
   @Autowired
-  private SystemRoleMenuMapper systemRoleMenuMapper;
-  @Autowired
   private SystemRoleMenuService systemRoleMenuService;
   @Autowired
   private SystemUserRoleService systemUserRoleService;
@@ -84,9 +82,9 @@ public class SystemMenuService {
       args.setPid(null);
     }
     if (args.getIFrame()) {
-      if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
-          args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
-        throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
+      if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
+          args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
+        throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
       }
     }
     systemMenuMapper.insert(args);
@@ -108,9 +106,9 @@ public class SystemMenuService {
     }
     SystemMenuTb menu = systemMenuMapper.selectById(args.getId());
     if (args.getIFrame()) {
-      if (!(args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTP) ||
-          args.getPath().toLowerCase().startsWith(TransferProtocolConst.PREFIX_HTTPS))) {
-        throw new BadRequestException(TransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
+      if (!(args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTP) ||
+          args.getPath().toLowerCase().startsWith(SystemTransferProtocolConst.PREFIX_HTTPS))) {
+        throw new BadRequestException(SystemTransferProtocolConst.PREFIX_HTTPS_BAD_REQUEST);
       }
     }
     SystemMenuTb menu1 = this.getMenuByTitle(args.getTitle());
@@ -155,30 +153,25 @@ public class SystemMenuService {
    */
   @Transactional(rollbackFor = Exception.class)
   public void deleteMenuByIds(Set<Long> ids) {
-    Set<SystemMenuTb> menuSet = new HashSet<>();
+    Set<SystemMenuVo> menuSet = new HashSet<>();
     for (Long id : ids) {
-      List<SystemMenuTb> menuList = this.listMenuByPid(id);
-      menuSet.add(systemMenuMapper.selectById(id));
+      List<SystemMenuVo> menuList = this.listMenuByPid(id);
+      menuSet.add(this.getMenuVoById(id));
       menuSet = this.queryChildMenuByArgs(menuList, menuSet);
     }
     List<Long> menuIds =
-        menuSet.stream().map(SystemMenuTb::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+        menuSet.stream().map(SystemMenuVo::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
     if (CollUtil.isNotEmpty(menuIds)) {
-      KitSpringBeanHolder.getBean(SystemMenuService.class).deleteRoleMenuByMenuIds(menuIds);
+      systemRoleMenuService.deleteRoleMenuByMenuIds(menuIds);
       systemMenuMapper.deleteByIds(menuIds);
     }
-    for (SystemMenuTb menu : menuSet) {
+    for (SystemMenuVo menu : menuSet) {
       this.updateMenuSubCnt(menu.getPid());
     }
   }
 
-  @Transactional(rollbackFor = Exception.class)
-  public void deleteRoleMenuByMenuIds(List<Long> menuIds) {
-    if (CollUtil.isNotEmpty(menuIds)) {
-      LambdaQueryWrapper<SystemRoleMenuTb> wrapper = new LambdaQueryWrapper<>();
-      wrapper.in(SystemRoleMenuTb::getMenuId, menuIds);
-      systemRoleMenuMapper.delete(wrapper);
-    }
+  private SystemMenuVo getMenuVoById(Long id) {
+    return KitBeanUtil.copyToClass(systemMenuMapper.selectById(id), SystemMenuVo.class);
   }
 
   @Transactional(rollbackFor = Exception.class)
@@ -227,9 +220,9 @@ public class SystemMenuService {
    * @param currentUserId /
    * @return /
    */
-  public List<SystemMenuTb> listMenuByUserId(Long currentUserId) {
+  public List<SystemMenuVo> listMenuByUserId(Long currentUserId) {
     List<SystemRoleVo> roles = systemUserRoleService.queryRoleByUsersId(currentUserId);
-    Set<Long> roleIds = roles.stream().map(SystemRoleTb::getId).collect(Collectors.toSet());
+    Set<Long> roleIds = roles.stream().map(SystemRoleVo::getId).collect(Collectors.toSet());
     return new ArrayList<>(systemRoleMenuService.queryMenuByRoleIds(roleIds));
   }
 
@@ -240,10 +233,10 @@ public class SystemMenuService {
    * @param menuSet  /
    * @return /
    */
-  public Set<SystemMenuTb> queryChildMenuByArgs(List<SystemMenuTb> menuList, Set<SystemMenuTb> menuSet) {
-    for (SystemMenuTb menu : menuList) {
+  public Set<SystemMenuVo> queryChildMenuByArgs(List<SystemMenuVo> menuList, Set<SystemMenuVo> menuSet) {
+    for (SystemMenuVo menu : menuList) {
       menuSet.add(menu);
-      List<SystemMenuTb> menus = this.listMenuByPid(menu.getId());
+      List<SystemMenuVo> menus = this.listMenuByPid(menu.getId());
       if (CollUtil.isNotEmpty(menus)) {
         queryChildMenuByArgs(menus, menuSet);
       }
@@ -257,13 +250,13 @@ public class SystemMenuService {
    * @param pid /
    * @return /
    */
-  public List<SystemMenuTb> listMenuByPid(Long pid) {
-    List<SystemMenuTb> menus;
+  public List<SystemMenuVo> listMenuByPid(Long pid) {
+    List<SystemMenuVo> menus;
     if (pid != null && !pid.equals(0L)) {
       LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
       wrapper.eq(SystemMenuTb::getPid, pid);
       wrapper.orderByAsc(SystemMenuTb::getMenuSort);
-      return systemMenuMapper.selectList(wrapper);
+      return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class);
     } else {
       menus = this.listRootMenu();
     }
@@ -277,13 +270,13 @@ public class SystemMenuService {
    * @param menus /
    * @return /
    */
-  public List<SystemMenuTb> querySuperiorMenuByArgs(SystemMenuTb menu, List<SystemMenuTb> menus) {
+  public List<SystemMenuVo> querySuperiorMenuByArgs(SystemMenuVo menu, List<SystemMenuVo> menus) {
     if (menu.getPid() == null) {
       menus.addAll(this.listRootMenu());
       return menus;
     }
     menus.addAll(this.listMenuByPid(menu.getPid()));
-    return querySuperiorMenuByArgs(systemMenuMapper.selectById(menu.getPid()), menus);
+    return querySuperiorMenuByArgs(this.getMenuVoById(menu.getPid()), menus);
   }
 
   /**
@@ -292,14 +285,14 @@ public class SystemMenuService {
    * @param menus 原始数据
    * @return /
    */
-  public List<SystemMenuTb> buildMenuTree(List<SystemMenuTb> menus) {
-    List<SystemMenuTb> trees = new ArrayList<>();
+  public List<SystemMenuVo> buildMenuTree(List<SystemMenuVo> menus) {
+    List<SystemMenuVo> trees = new ArrayList<>();
     Set<Long> ids = new HashSet<>();
-    for (SystemMenuTb menu : menus) {
+    for (SystemMenuVo menu : menus) {
       if (menu.getPid() == null) {
         trees.add(menu);
       }
-      for (SystemMenuTb it : menus) {
+      for (SystemMenuVo it : menus) {
         if (menu.getId().equals(it.getPid())) {
           if (menu.getChildren() == null) {
             menu.setChildren(new ArrayList<>());
@@ -321,12 +314,12 @@ public class SystemMenuService {
    * @param menus /
    * @return /
    */
-  public List<SystemMenuVo> buildMenuVo(List<SystemMenuTb> menus) {
-    List<SystemMenuVo> list = new LinkedList<>();
-    menus.forEach(menu -> {
+  public List<SystemMenuRouterVo> buildMenuVo(List<SystemMenuVo> menus) {
+    List<SystemMenuRouterVo> list = new LinkedList<>();
+    for (SystemMenuVo menu : menus) {
       if (menu != null) {
-        List<SystemMenuTb> menuList = menu.getChildren();
-        SystemMenuVo menuVo = new SystemMenuVo();
+        List<SystemMenuVo> menuList = menu.getChildren();
+        SystemMenuRouterVo menuVo = new SystemMenuRouterVo();
         menuVo.setName(
             ObjectUtil.isNotEmpty(menu.getComponentName()) ? menu.getComponentName() : menu.getTitle());
         // 一级目录需要加斜杠, 不然会报警告
@@ -350,17 +343,17 @@ public class SystemMenuService {
           menuVo.setChildren(buildMenuVo(menuList));
           // 处理是一级菜单并且没有子菜单的情况
         } else if (menu.getPid() == null) {
-          SystemMenuVo menuVo1 = getMenuVo(menu, menuVo);
+          SystemMenuRouterVo menuVo1 = getMenuVo(menu, menuVo);
           menuVo.setName(null);
           menuVo.setMeta(null);
           menuVo.setComponent("Layout");
-          List<SystemMenuVo> list1 = new ArrayList<>();
+          List<SystemMenuRouterVo> list1 = new ArrayList<>();
           list1.add(menuVo1);
           menuVo.setChildren(list1);
         }
         list.add(menuVo);
       }
-    });
+    }
     return list;
   }
 
@@ -371,8 +364,8 @@ public class SystemMenuService {
    * @param menuVo /
    * @return /
    */
-  private SystemMenuVo getMenuVo(SystemMenuTb menu, SystemMenuVo menuVo) {
-    SystemMenuVo menuVo1 = new SystemMenuVo();
+  private SystemMenuRouterVo getMenuVo(SystemMenuVo menu, SystemMenuRouterVo menuVo) {
+    SystemMenuRouterVo menuVo1 = new SystemMenuRouterVo();
     menuVo1.setMeta(menuVo.getMeta());
     // 非外链
     if (!menu.getIFrame()) {
@@ -385,8 +378,8 @@ public class SystemMenuService {
     return menuVo1;
   }
 
-  public List<SystemMenuTb> listMenuByIds(List<Long> ids) {
-    return systemMenuMapper.selectByIds(ids);
+  public List<SystemMenuVo> listMenuByIds(List<Long> ids) {
+    return KitBeanUtil.copyToList(systemMenuMapper.selectByIds(ids), SystemMenuVo.class);
   }
 
   private SystemMenuTb getMenuByComponentName(String componentName) {
@@ -408,52 +401,51 @@ public class SystemMenuService {
   }
 
   private List<SystemMenuTb> queryMenuByArgs(SystemQueryMenuArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid);
-      wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid());
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or()
-              .like(SystemMenuTb::getComponentName, args.getBlurry()).or()
-              .like(SystemMenuTb::getPermission, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.isNull(args.getPidIsNull() != null, SystemMenuTb::getPid);
+    wrapper.eq(args.getPid() != null, SystemMenuTb::getPid, args.getPid());
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemMenuTb::getTitle, args.getBlurry()).or()
+            .like(SystemMenuTb::getComponentName, args.getBlurry()).or()
+            .like(SystemMenuTb::getPermission, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemMenuTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);
     return systemMenuMapper.selectList(wrapper);
   }
 
-  private List<SystemMenuTb> listRootMenu() {
+  private List<SystemMenuVo> listRootMenu() {
     LambdaQueryWrapper<SystemMenuTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.isNull(SystemMenuTb::getPid);
     wrapper.orderByAsc(SystemMenuTb::getMenuSort);
-    return systemMenuMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemMenuMapper.selectList(wrapper), SystemMenuVo.class);
   }
 
-  public List<SystemMenuVo> buildFrontMenus() {
-    List<SystemMenuTb> menuList = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId());
-    List<SystemMenuTb> menus = this.buildMenuTree(menuList);
-    return this.buildMenuVo(menus);
+  public List<SystemMenuRouterVo> buildFrontMenus() {
+    List<SystemMenuVo> originMenus = this.listMenuByUserId(KitSecurityHelper.getCurrentUserId());
+    List<SystemMenuVo> targetMenus = this.buildMenuTree(originMenus);
+    return this.buildMenuVo(targetMenus);
   }
 
   public Set<Long> listChildMenuSetByMenuId(Long id) {
-    Set<SystemMenuTb> menuSet = new HashSet<>();
-    List<SystemMenuTb> menuList = this.listMenuByPid(id);
-    menuSet.add(systemMenuMapper.selectById(id));
+    Set<SystemMenuVo> menuSet = new HashSet<>();
+    List<SystemMenuVo> menuList = this.listMenuByPid(id);
+    menuSet.add(this.getMenuVoById(id));
     menuSet = this.queryChildMenuByArgs(menuList, menuSet);
-    return menuSet.stream().map(SystemMenuTb::getId).collect(Collectors.toSet());
+    return menuSet.stream().map(SystemMenuVo::getId).collect(Collectors.toSet());
   }
 
-  public List<SystemMenuTb> listMenuSuperior(List<Long> ids) {
-    Set<SystemMenuTb> menus;
-    List<SystemMenuTb> systemMenuTbs;
+  public List<SystemMenuVo> listMenuSuperior(List<Long> ids) {
+    Set<SystemMenuVo> menus;
+    List<SystemMenuVo> systemMenuTbs;
     if (CollectionUtil.isNotEmpty(ids)) {
       menus = new LinkedHashSet<>(this.listMenuByIds(ids));
-      for (SystemMenuTb menu : menus) {
-        List<SystemMenuTb> menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>());
-        for (SystemMenuTb data : menuList) {
+      for (SystemMenuVo menu : menus) {
+        List<SystemMenuVo> menuList = this.querySuperiorMenuByArgs(menu, new ArrayList<>());
+        for (SystemMenuVo data : menuList) {
           if (data.getId().equals(menu.getPid())) {
             data.setSubCount(data.getSubCount() - 1);
           }
@@ -462,7 +454,8 @@ public class SystemMenuService {
       }
       // 编辑菜单时不显示自己以及自己下级的数据, 避免出现PID数据环形问题
       menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet());
-      systemMenuTbs = this.buildMenuTree(new ArrayList<>(menus));
+      List<SystemMenuVo> newMenuList = new ArrayList<>(menus);
+      systemMenuTbs = this.buildMenuTree(newMenuList);
     } else {
       systemMenuTbs = this.listMenuByPid(null);
     }
@@ -471,17 +464,6 @@ public class SystemMenuService {
 
   public void exportMenuXlsx(HttpServletResponse response, SystemQueryMenuArgs args) throws Exception {
     List<SystemMenuTb> systemMenuTbs = this.queryAllMenu(args, false);
-//    KitXlsxExportUtil.exportFile(response, "菜单数据", systemMenuTbs, SystemMenuExportRowVo.class, (dataObject -> {
-//      SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo();
-//      rowVo.setTitle(dataObject.getTitle());
-//      rowVo.setType(dataObject.getType() == null ? "目录" : dataObject.getType() == 1 ? "菜单" : "按钮");
-//      rowVo.setPermission(dataObject.getPermission());
-//      rowVo.setIFrame(dataObject.getIFrame() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR);
-//      rowVo.setHidden(dataObject.getHidden() ? SystemYesOrNoChConst.NO_STR : SystemYesOrNoChConst.YES_STR);
-//      rowVo.setCache(dataObject.getCache() ? SystemYesOrNoChConst.YES_STR : SystemYesOrNoChConst.NO_STR);
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    }));
     List<SystemMenuExportRowVo> rowVos = new ArrayList<>();
     for (SystemMenuTb dataObject : systemMenuTbs) {
       SystemMenuExportRowVo rowVo = new SystemMenuExportRowVo();
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java
new file mode 100644
index 00000000..917696ca
--- /dev/null
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOperationLogService.java
@@ -0,0 +1,26 @@
+package cn.odboy.system.service;
+
+import cn.odboy.base.KitPageArgs;
+import cn.odboy.system.dal.dataobject.SystemOperationLogTb;
+import cn.odboy.system.dal.model.request.SystemQueryOperationLogArgs;
+import cn.odboy.system.dal.mysql.SystemOperationLogMapper;
+import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemOperationLogService {
+
+  @Autowired
+  private SystemOperationLogMapper systemOperationLogMapper;
+
+  public IPage<SystemOperationLogTb> searchUserLog(KitPageArgs<SystemQueryOperationLogArgs> pageArgs) {
+    LambdaQueryWrapper<SystemOperationLogTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemOperationLogTb::getUsername, KitSecurityHelper.getCurrentUsername());
+    Page<SystemOperationLogTb> page = new Page<>(pageArgs.getPage(), pageArgs.getSize());
+    return systemOperationLogMapper.selectPage(page, wrapper);
+  }
+}
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
index fc8b25c8..4b557483 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemOssStorageService.java
@@ -17,8 +17,8 @@ package cn.odboy.system.service;
 
 import cn.odboy.base.KitPageResult;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
index ddf4921d..88e500b4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemQuartzJobService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
@@ -25,14 +24,17 @@ import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.framework.redis.KitRedisHelper;
 import cn.odboy.system.dal.dataobject.SystemQuartzJobTb;
 import cn.odboy.system.dal.dataobject.SystemQuartzLogTb;
-import cn.odboy.system.dal.model.SystemQuartzJobExportRowVo;
-import cn.odboy.system.dal.model.SystemQuartzLogExportRowVo;
-import cn.odboy.system.dal.model.SystemQueryQuartzJobArgs;
-import cn.odboy.system.dal.model.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.export.SystemQuartzJobExportRowVo;
+import cn.odboy.system.dal.model.export.SystemQuartzLogExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryQuartzJobArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateQuartzJobArgs;
+import cn.odboy.system.dal.model.response.SystemQuartzJobVo;
 import cn.odboy.system.dal.mysql.SystemQuartzJobMapper;
 import cn.odboy.system.dal.mysql.SystemQuartzLogMapper;
 import cn.odboy.system.framework.quartz.QuartzManage;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -77,7 +79,7 @@ public class SystemQuartzJobService {
    * @param args /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void createJob(SystemQuartzJobTb args) {
+  public void createJob(SystemQuartzJobVo args) {
     if (args.getId() != null) {
       throw new BadRequestException("无效参数id");
     }
@@ -86,7 +88,8 @@ public class SystemQuartzJobService {
     if (!CronExpression.isValidExpression(args.getCronExpression())) {
       throw new BadRequestException("cron表达式格式错误");
     }
-    systemQuartzJobMapper.insert(args);
+    SystemQuartzJobTb record = KitBeanUtil.copyToClass(args, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insert(record);
     quartzManage.addJob(args);
   }
 
@@ -108,9 +111,10 @@ public class SystemQuartzJobService {
         throw new BadRequestException("子任务中不能添加当前任务ID");
       }
     }
-    SystemQuartzJobTb quartzJob = BeanUtil.copyProperties(args, SystemQuartzJobTb.class);
-    systemQuartzJobMapper.insertOrUpdate(quartzJob);
-    quartzManage.updateJobCron(quartzJob);
+    SystemQuartzJobTb jobTb = KitBeanUtil.copyToClass(args, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insertOrUpdate(jobTb);
+    SystemQuartzJobVo jobVo = KitBeanUtil.copyToClass(args, SystemQuartzJobVo.class);
+    quartzManage.updateJobCron(jobVo);
   }
 
   /**
@@ -119,7 +123,7 @@ public class SystemQuartzJobService {
    * @param quartzJob /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void switchQuartzJobStatus(SystemQuartzJobTb quartzJob) {
+  public void switchQuartzJobStatus(SystemQuartzJobVo quartzJob) {
     // 置换暂停状态
     if (quartzJob.getIsPause()) {
       quartzManage.resumeJob(quartzJob);
@@ -128,7 +132,8 @@ public class SystemQuartzJobService {
       quartzManage.pauseJob(quartzJob);
       quartzJob.setIsPause(true);
     }
-    systemQuartzJobMapper.insertOrUpdate(quartzJob);
+    SystemQuartzJobTb quartzJobTb = KitBeanUtil.copyToClass(quartzJob, SystemQuartzJobTb.class);
+    systemQuartzJobMapper.insertOrUpdate(quartzJobTb);
   }
 
   /**
@@ -136,7 +141,7 @@ public class SystemQuartzJobService {
    *
    * @param quartzJob /
    */
-  public void startQuartzJob(SystemQuartzJobTb quartzJob) {
+  public void startQuartzJob(SystemQuartzJobVo quartzJob) {
     quartzManage.runJobNow(quartzJob);
   }
 
@@ -167,7 +172,7 @@ public class SystemQuartzJobService {
         // 如果是手动清除子任务id, 会出现id为空字符串的问题
         continue;
       }
-      SystemQuartzJobTb quartzJob = systemQuartzJobMapper.selectById(Long.parseLong(id));
+      SystemQuartzJobVo quartzJob = systemQuartzJobMapper.selectVoById(id);
       if (quartzJob == null) {
         // 防止子任务不存在
         continue;
@@ -198,36 +203,27 @@ public class SystemQuartzJobService {
    * @param page 分页参数
    * @return /
    */
-  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args,
-      Page<SystemQuartzJobTb> page) {
+  public KitPageResult<SystemQuartzJobTb> searchQuartzJobByArgs(SystemQueryQuartzJobArgs args, Page<SystemQuartzJobTb> page) {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     this.injectQuartzJobQueryParams(args, wrapper);
     return KitPageUtil.toPage(systemQuartzJobMapper.selectPage(page, wrapper));
   }
 
-  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args,
-      LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName,
-          args.getJobName());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+  private void injectQuartzJobQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzJobTb> wrapper) {
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzJobTb::getJobName, args.getJobName());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemQuartzJobTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemQuartzJobTb::getId);
   }
 
-  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args,
-      LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
-    if (args != null) {
-      wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName,
-          args.getJobName());
-      wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess());
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+  private void injectQuartzLogQueryParams(SystemQueryQuartzJobArgs args, LambdaQueryWrapper<SystemQuartzLogTb> wrapper) {
+    KitValidUtil.notNull(args);
+    wrapper.like(StrUtil.isNotBlank(args.getJobName()), SystemQuartzLogTb::getJobName, args.getJobName());
+    wrapper.eq(args.getIsSuccess() != null, SystemQuartzLogTb::getIsSuccess, args.getIsSuccess());
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemQuartzLogTb::getCreateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemQuartzLogTb::getId);
   }
@@ -270,31 +266,18 @@ public class SystemQuartzJobService {
     return systemQuartzLogMapper.selectList(wrapper);
   }
 
-  public SystemQuartzJobTb getQuartzJobById(Long id) {
-    return systemQuartzJobMapper.selectById(id);
+  public SystemQuartzJobVo getQuartzJobById(Long id) {
+    return KitBeanUtil.copyToClass(systemQuartzJobMapper.selectById(id), SystemQuartzJobVo.class);
   }
 
-  public List<SystemQuartzJobTb> listEnableQuartzJob() {
+  public List<SystemQuartzJobVo> listEnableQuartzJob() {
     LambdaQueryWrapper<SystemQuartzJobTb> wrapper = new LambdaQueryWrapper<>();
     wrapper.eq(SystemQuartzJobTb::getIsPause, 0);
-    return systemQuartzJobMapper.selectList(wrapper);
+    return KitBeanUtil.copyToList(systemQuartzJobMapper.selectList(wrapper), SystemQuartzJobVo.class);
   }
 
   public void exportQuartzJobXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     List<SystemQuartzJobTb> systemQuartzJobTbs = this.queryQuartzJobByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "定时任务数据", systemQuartzJobTbs, SystemQuartzJobExportRowVo.class,
-//        (dataObject) -> {
-//          SystemQuartzJobExportRowVo rowVo = new SystemQuartzJobExportRowVo();
-//          rowVo.setJobName(dataObject.getJobName());
-//          rowVo.setBeanName(dataObject.getBeanName());
-//          rowVo.setMethodName(dataObject.getMethodName());
-//          rowVo.setParams(dataObject.getParams());
-//          rowVo.setCronExpression(dataObject.getCronExpression());
-//          rowVo.setIsPause(dataObject.getIsPause() ? "暂停中" : "运行中");
-//          rowVo.setDescription(dataObject.getDescription());
-//          rowVo.setCreateTime(dataObject.getCreateTime());
-//          return CollUtil.newArrayList(rowVo);
-//        });
     List<SystemQuartzJobExportRowVo> rowVos = new ArrayList<>();
     for (SystemQuartzJobTb dataObject : systemQuartzJobTbs) {
       SystemQuartzJobExportRowVo rowVo = new SystemQuartzJobExportRowVo();
@@ -313,20 +296,6 @@ public class SystemQuartzJobService {
 
   public void exportQuartzLogXlsx(HttpServletResponse response, SystemQueryQuartzJobArgs args) {
     List<SystemQuartzLogTb> systemQuartzLogTbs = this.queryQuartzLogByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "定时任务日志数据", systemQuartzLogTbs, SystemQuartzLogExportRowVo.class,
-//        (dataObject) -> {
-//          SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();
-//          rowVo.setJobName(dataObject.getJobName());
-//          rowVo.setBeanName(dataObject.getBeanName());
-//          rowVo.setMethodName(dataObject.getMethodName());
-//          rowVo.setParams(dataObject.getParams());
-//          rowVo.setCronExpression(dataObject.getCronExpression());
-//          rowVo.setExceptionDetail(dataObject.getExceptionDetail());
-//          rowVo.setTime(dataObject.getTime());
-//          rowVo.setStatus(dataObject.getIsSuccess() ? "成功" : "失败");
-//          rowVo.setCreateTime(dataObject.getCreateTime());
-//          return CollUtil.newArrayList(rowVo);
-//        });
     List<SystemQuartzLogExportRowVo> rowVos = new ArrayList<>();
     for (SystemQuartzLogTb dataObject : systemQuartzLogTbs) {
       SystemQuartzLogExportRowVo rowVo = new SystemQuartzLogExportRowVo();
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
index a631f3ff..2dde9009 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleMenuService.java
@@ -18,8 +18,10 @@ package cn.odboy.system.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleMenuTb;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
 import cn.odboy.system.dal.mysql.SystemMenuMapper;
 import cn.odboy.system.dal.mysql.SystemRoleMenuMapper;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -46,10 +48,10 @@ public class SystemRoleMenuService {
   }
 
   @Transactional(rollbackFor = Exception.class)
-  public void batchInsertRoleMenu(Set<SystemMenuTb> menus, Long roleId) {
+  public void batchInsertRoleMenu(Set<SystemMenuVo> menus, Long roleId) {
     if (CollUtil.isNotEmpty(menus)) {
       List<SystemRoleMenuTb> records = new ArrayList<>();
-      for (SystemMenuTb menu : menus) {
+      for (SystemMenuVo menu : menus) {
         SystemRoleMenuTb record = new SystemRoleMenuTb();
         record.setMenuId(menu.getId());
         record.setRoleId(roleId);
@@ -68,7 +70,7 @@ public class SystemRoleMenuService {
     }
   }
 
-  public LinkedHashSet<SystemMenuTb> queryMenuByRoleIds(Set<Long> roleIds) {
+  public LinkedHashSet<SystemMenuVo> queryMenuByRoleIds(Set<Long> roleIds) {
     if (CollUtil.isEmpty(roleIds)) {
       return new LinkedHashSet<>();
     }
@@ -84,6 +86,19 @@ public class SystemRoleMenuService {
     // 排除"按钮"
     menuWrapper.ne(SystemMenuTb::getType, 2);
     menuWrapper.orderByAsc(SystemMenuTb::getMenuSort);
-    return new LinkedHashSet<>(systemMenuMapper.selectList(menuWrapper));
+
+    List<SystemMenuTb> systemMenuTbs = systemMenuMapper.selectList(menuWrapper);
+    List<SystemMenuVo> systemMenuVos = KitBeanUtil.copyToList(systemMenuTbs, SystemMenuVo.class);
+    return new LinkedHashSet<>(systemMenuVos);
+  }
+
+  @Transactional(rollbackFor = Exception.class)
+  public void deleteRoleMenuByMenuIds(List<Long> menuIds) {
+    if (CollUtil.isEmpty(menuIds)) {
+      return;
+    }
+    LambdaQueryWrapper<SystemRoleMenuTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemRoleMenuTb::getMenuId, menuIds);
+    systemRoleMenuMapper.delete(wrapper);
   }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
index 83b1a73a..ac5bc2c0 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java
@@ -15,24 +15,25 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
 import cn.odboy.framework.exception.BadRequestException;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemCreateRoleArgs;
-import cn.odboy.system.dal.model.SystemQueryRoleArgs;
-import cn.odboy.system.dal.model.SystemRoleCodeVo;
-import cn.odboy.system.dal.model.SystemRoleExportRowVo;
-import cn.odboy.system.dal.model.SystemRoleVo;
+import cn.odboy.system.dal.model.export.SystemRoleExportRowVo;
+import cn.odboy.system.dal.model.request.SystemCreateRoleArgs;
+import cn.odboy.system.dal.model.request.SystemQueryRoleArgs;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleCodeVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
 import cn.odboy.system.dal.mysql.SystemRoleMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,8 +58,6 @@ public class SystemRoleService {
   @Autowired
   private SystemRoleDeptService systemRoleDeptService;
   @Autowired
-  private SystemUserService systemUserService;
-  @Autowired
   private SystemUserRoleService systemUserRoleService;
 
   /**
@@ -72,7 +71,8 @@ public class SystemRoleService {
     if (this.getRoleByName(args.getName()) != null) {
       throw new BadRequestException("角色名称已存在");
     }
-    systemRoleMapper.insert(BeanUtil.copyProperties(args, SystemRoleTb.class));
+    SystemRoleTb roleTb = KitBeanUtil.copyToClass(args, SystemRoleTb.class);
+    systemRoleMapper.insert(roleTb);
     // 判断是否有部门数据, 若有, 则需创建关联
     if (CollectionUtil.isNotEmpty(args.getDepts())) {
       systemRoleDeptService.batchInsertRoleDept(args.getDepts(), args.getId());
@@ -93,7 +93,7 @@ public class SystemRoleService {
   @Transactional(rollbackFor = Exception.class)
   public void updateRoleById(SystemRoleVo args) {
     checkRoleLevels(args.getLevel());
-    SystemRoleVo role = BeanUtil.copyProperties(systemRoleMapper.selectById(args.getId()), SystemRoleVo.class);
+    SystemRoleTb role = this.getRoleTbById(args.getId());
     SystemRoleTb role1 = this.getRoleByName(args.getName());
     if (role1 != null && !role1.getId().equals(role.getId())) {
       throw new BadRequestException("角色名称已存在");
@@ -101,7 +101,6 @@ public class SystemRoleService {
     role.setName(args.getName());
     role.setDescription(args.getDescription());
     role.setDataScope(args.getDataScope());
-    role.setDepts(args.getDepts());
     role.setLevel(args.getLevel());
     // 更新
     systemRoleMapper.insertOrUpdate(role);
@@ -113,19 +112,25 @@ public class SystemRoleService {
     }
   }
 
+  private SystemRoleTb getRoleTbById(Long id) {
+    return systemRoleMapper.selectById(id);
+  }
+
   /**
    * 修改绑定的菜单
    *
    * @param args /
    */
+  @Transactional(rollbackFor = Exception.class)
   public void updateBindMenuById(SystemRoleVo args) {
     SystemRoleTb role = systemRoleMapper.selectById(args.getId());
     checkRoleLevels(role.getLevel());
     // 更新菜单
     systemRoleMenuService.deleteRoleMenuByRoleId(role.getId());
     // 判断是否为空
-    if (CollUtil.isNotEmpty(args.getMenus())) {
-      systemRoleMenuService.batchInsertRoleMenu(args.getMenus(), role.getId());
+    Set<SystemMenuVo> menus = args.getMenus();
+    if (CollUtil.isNotEmpty(menus)) {
+      systemRoleMenuService.batchInsertRoleMenu(menus, role.getId());
     }
   }
 
@@ -165,19 +170,18 @@ public class SystemRoleService {
    * @return /
    */
   public List<SystemRoleVo> queryRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     // 查询角色基本信息
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+            .like(SystemRoleTb::getDescription, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemRoleTb::getLevel);
-    if (args != null && args.getSize() != null) {
+    if (args.getSize() != null) {
       Page<SystemRoleTb> rolePage = new Page<>(args.getPage(), args.getSize());
       Page<SystemRoleTb> page = systemRoleMapper.selectPage(rolePage, wrapper);
       List<SystemRoleTb> roles = page.getRecords();
@@ -217,7 +221,7 @@ public class SystemRoleService {
       return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
     }
     List<SystemRoleVo> roles = systemUserRoleService.queryRoleByUsersId(user.getId());
-    permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuTb::getPermission)
+    permissions = roles.stream().flatMap(role -> role.getMenus().stream()).map(SystemMenuVo::getPermission)
         .filter(StrUtil::isNotBlank).collect(Collectors.toSet());
     return permissions.stream().map(SystemRoleCodeVo::new).collect(Collectors.toList());
   }
@@ -228,21 +232,20 @@ public class SystemRoleService {
    * @param ids /
    */
   public void verifyBindRelationByIds(Set<Long> ids) {
-    if (systemUserService.countUserByRoleIds(ids) > 0) {
+    if (systemUserRoleService.countUserByRoleIds(ids) > 0) {
       throw new BadRequestException("所选角色存在用户关联, 请解除关联再试！");
     }
   }
 
   public Long countRoleByArgs(SystemQueryRoleArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemRoleTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
-              .like(SystemRoleTb::getDescription, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemRoleTb::getName, args.getBlurry()).or()
+            .like(SystemRoleTb::getDescription, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemRoleTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     return systemRoleMapper.selectCount(wrapper);
   }
@@ -255,7 +258,7 @@ public class SystemRoleService {
     return systemUserRoleService.convertToRoleVo(roleTb);
   }
 
-  public Dict getRoleLevel() {
+  public Dict getCurrentUserRoleLevel() {
     return Dict.create().set("level", checkRoleLevels(null));
   }
 
@@ -266,7 +269,7 @@ public class SystemRoleService {
    */
   private int checkRoleLevels(Integer level) {
     List<Integer> levels = systemUserRoleService.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream()
-        .map(SystemRoleTb::getLevel).collect(Collectors.toList());
+        .map(SystemRoleVo::getLevel).collect(Collectors.toList());
     int min = Collections.min(levels);
     if (level != null) {
       if (level < min) {
@@ -278,14 +281,6 @@ public class SystemRoleService {
 
   public void exportRoleXlsx(HttpServletResponse response, SystemQueryRoleArgs args) {
     List<SystemRoleVo> systemRoleVos = this.queryRoleByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "角色数据", systemRoleVos, SystemRoleExportRowVo.class, (dataObject) -> {
-//      SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
-//      rowVo.setName(dataObject.getName());
-//      rowVo.setLevel(dataObject.getLevel());
-//      rowVo.setDescription(dataObject.getDescription());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
     List<SystemRoleExportRowVo> rowVos = new ArrayList<>();
     for (SystemRoleVo dataObject : systemRoleVos) {
       SystemRoleExportRowVo rowVo = new SystemRoleExportRowVo();
@@ -297,4 +292,8 @@ public class SystemRoleService {
     }
     KitExcelExporter.exportSimple(response, "部门数据", SystemRoleExportRowVo.class, rowVos);
   }
+
+  public List<SystemRoleTb> listByIds(Set<Long> roleIds) {
+    return systemRoleMapper.selectByIds(roleIds);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
index 90c450a6..33ae7628 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserJobService.java
@@ -55,4 +55,25 @@ public class SystemUserJobService {
       systemUserJobMapper.delete(wrapper);
     }
   }
+
+  /**
+   * 根据岗位ID统计用户数量
+   *
+   * @param jobIds 岗位ID集合
+   * @return /
+   */
+  public Long countUserByJobIds(Set<Long> jobIds) {
+    if (CollUtil.isEmpty(jobIds)) {
+      return 0L;
+    }
+    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemUserJobTb::getJobId, jobIds);
+    return systemUserJobMapper.selectCount(wrapper);
+  }
+
+  public List<SystemUserJobTb> listUserJobByUserId(Long userId) {
+    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemUserJobTb::getUserId, userId);
+    return systemUserJobMapper.selectList(wrapper);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
index b2424f97..e389bda9 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserRoleService.java
@@ -15,18 +15,18 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.odboy.framework.exception.BadRequestException;
 import cn.odboy.system.dal.dataobject.SystemDeptTb;
-import cn.odboy.system.dal.dataobject.SystemMenuTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserRoleTb;
-import cn.odboy.system.dal.model.SystemRoleVo;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemMenuVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.mysql.SystemRoleMapper;
 import cn.odboy.system.dal.mysql.SystemUserRoleMapper;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -84,10 +84,9 @@ public class SystemUserRoleService {
     if (role == null) {
       return null;
     }
-    SystemRoleVo roleVo = BeanUtil.copyProperties(role, SystemRoleVo.class);
+    SystemRoleVo roleVo = KitBeanUtil.copyToClass(role, SystemRoleVo.class);
     // 查询关联的菜单信息
-    Set<SystemMenuTb> menus = systemRoleMenuService.queryMenuByRoleIds(
-        Collections.singleton(role.getId()));
+    Set<SystemMenuVo> menus = systemRoleMenuService.queryMenuByRoleIds(Collections.singleton(role.getId()));
     roleVo.setMenus(menus);
 
     // 查询关联的部门信息
@@ -141,10 +140,25 @@ public class SystemUserRoleService {
   public void checkLevel(SystemUserVo args) {
     Integer currentLevel = Collections.min(
         this.queryRoleByUsersId(KitSecurityHelper.getCurrentUserId()).stream()
-            .map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+            .map(SystemRoleVo::getLevel).collect(Collectors.toList()));
     Integer optLevel = this.getDeptLevelByRoles(args.getRoles());
     if (currentLevel > optLevel) {
       throw new BadRequestException("角色权限不足");
     }
   }
+
+  public List<SystemUserRoleTb> listUserRoleByUserId(Long userId) {
+    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.eq(SystemUserRoleTb::getUserId, userId);
+    return systemUserRoleMapper.selectList(wrapper);
+  }
+
+  public long countUserByRoleIds(Set<Long> ids) {
+    if (CollUtil.isEmpty(ids)) {
+      return 0L;
+    }
+    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
+    wrapper.in(SystemUserRoleTb::getRoleId, ids);
+    return systemUserRoleMapper.selectCount(wrapper);
+  }
 }
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
index f42d344e..473bdcc4 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
@@ -27,28 +26,26 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.constant.SystemCaptchaBizEnum;
 import cn.odboy.system.constant.SystemZhConst;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserJobTb;
 import cn.odboy.system.dal.dataobject.SystemUserRoleTb;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
-import cn.odboy.system.dal.model.SystemQueryUserArgs;
-import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
-import cn.odboy.system.dal.model.SystemUserExportRowVo;
-import cn.odboy.system.dal.model.SystemUserVo;
-import cn.odboy.system.dal.mysql.SystemDeptMapper;
-import cn.odboy.system.dal.mysql.SystemJobMapper;
-import cn.odboy.system.dal.mysql.SystemRoleMapper;
-import cn.odboy.system.dal.mysql.SystemUserJobMapper;
+import cn.odboy.system.dal.model.export.SystemUserExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryUserArgs;
+import cn.odboy.system.dal.model.request.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemRoleVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.dal.mysql.SystemUserMapper;
-import cn.odboy.system.dal.mysql.SystemUserRoleMapper;
 import cn.odboy.system.dal.redis.SystemUserInfoDAO;
 import cn.odboy.system.dal.redis.SystemUserOnlineInfoDAO;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
 import cn.odboy.util.KitRsaEncryptUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -78,11 +75,11 @@ public class SystemUserService {
   @Autowired
   private SystemUserMapper systemUserMapper;
   @Autowired
-  private SystemJobMapper systemJobMapper;
+  private SystemJobService systemJobService;
   @Autowired
-  private SystemRoleMapper systemRoleMapper;
+  private SystemRoleService systemRoleService;
   @Autowired
-  private SystemDeptMapper systemDeptMapper;
+  private SystemDeptService systemDeptService;
   @Autowired
   private SystemUserJobService systemUserJobService;
   @Autowired
@@ -90,8 +87,6 @@ public class SystemUserService {
   @Autowired
   private SystemEmailService systemEmailService;
   @Autowired
-  private SystemDeptService systemDeptService;
-  @Autowired
   private SystemDataService systemDataService;
   @Autowired
   private SystemUserInfoDAO systemUserInfoDAO;
@@ -100,10 +95,6 @@ public class SystemUserService {
   @Autowired
   private KitFileLocalUploadHelper fileUploadPathHelper;
   @Autowired
-  private SystemUserJobMapper systemUserJobMapper;
-  @Autowired
-  private SystemUserRoleMapper systemUserRoleMapper;
-  @Autowired
   private AppProperties properties;
   @Autowired
   private PasswordEncoder passwordEncoder;
@@ -166,7 +157,6 @@ public class SystemUserService {
     user.setUsername(args.getUsername());
     user.setEmail(args.getEmail());
     user.setEnabled(args.getEnabled());
-    user.setDept(args.getDept());
     user.setPhone(args.getPhone());
     user.setNickName(args.getNickName());
     user.setGender(args.getGender());
@@ -209,15 +199,15 @@ public class SystemUserService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeUserByIds(Set<Long> ids) {
+  public void deleteUserByIds(Set<Long> ids) {
     Long currentUserId = KitSecurityHelper.getCurrentUserId();
     // 校验权限
     for (Long id : ids) {
       Integer currentLevel = Collections.min(
           systemUserRoleService.queryRoleByUsersId(currentUserId).stream()
-              .map(SystemRoleTb::getLevel).collect(Collectors.toList()));
+              .map(SystemRoleVo::getLevel).collect(Collectors.toList()));
       Integer optLevel = Collections.min(
-          systemUserRoleService.queryRoleByUsersId(id).stream().map(SystemRoleTb::getLevel)
+          systemUserRoleService.queryRoleByUsersId(id).stream().map(SystemRoleVo::getLevel)
               .collect(Collectors.toList()));
       if (currentLevel > optLevel) {
         throw new BadRequestException(
@@ -353,20 +343,6 @@ public class SystemUserService {
     return KitPageUtil.toPage(userVos, userPage.getTotal());
   }
 
-//  /**
-//   * 查询全部不分页
-//   *
-//   * @param args 条件
-//   * @return /
-//   */
-//  public List<SystemUserVo> queryUserVoByArgs(SystemQueryUserArgs args) {
-//    // 查询用户基本信息
-//    LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
-//    List<SystemUserTb> users = systemUserMapper.selectList(wrapper);
-//    // 转换为SystemUserVo并关联查询
-//    return users.stream().map(this::convertToUserVo).collect(Collectors.toList());
-//  }
-
   public long countUserByArgs(SystemQueryUserArgs args) {
     LambdaQueryWrapper<SystemUserTb> wrapper = buildUserQueryWrapper(args);
     return systemUserMapper.selectCount(wrapper);
@@ -405,36 +381,6 @@ public class SystemUserService {
     }).collect(Collectors.toList());
   }
 
-  /**
-   * 根据岗位ID统计用户数量
-   *
-   * @param jobIds 岗位ID集合
-   * @return /
-   */
-  public Long countUserByJobIds(Set<Long> jobIds) {
-    if (CollUtil.isEmpty(jobIds)) {
-      return 0L;
-    }
-    LambdaQueryWrapper<SystemUserJobTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.in(SystemUserJobTb::getJobId, jobIds);
-    return systemUserJobMapper.selectCount(wrapper);
-  }
-
-  /**
-   * 根据角色ID统计用户数量
-   *
-   * @param roleIds 角色ID集合
-   * @return /
-   */
-  public Long countUserByRoleIds(Set<Long> roleIds) {
-    if (CollUtil.isEmpty(roleIds)) {
-      return 0L;
-    }
-    LambdaQueryWrapper<SystemUserRoleTb> wrapper = new LambdaQueryWrapper<>();
-    wrapper.in(SystemUserRoleTb::getRoleId, roleIds);
-    return systemUserRoleMapper.selectCount(wrapper);
-  }
-
   /**
    * 构建用户查询条件
    *
@@ -442,26 +388,25 @@ public class SystemUserService {
    * @return /
    */
   private LambdaQueryWrapper<SystemUserTb> buildUserQueryWrapper(SystemQueryUserArgs args) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemUserTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      if (args.getId() != null) {
-        wrapper.eq(SystemUserTb::getId, args.getId());
-      }
-      if (args.getEnabled() != null) {
-        wrapper.eq(SystemUserTb::getEnabled, args.getEnabled());
-      }
-      if (CollUtil.isNotEmpty(args.getDeptIds())) {
-        wrapper.in(SystemUserTb::getDeptId, args.getDeptIds());
-      }
-      if (StrUtil.isNotBlank(args.getBlurry())) {
-        wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry())
-            .or().like(SystemUserTb::getNickName, args.getBlurry())
-            .or().like(SystemUserTb::getEmail, args.getBlurry()));
-      }
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    if (args.getId() != null) {
+      wrapper.eq(SystemUserTb::getId, args.getId());
+    }
+    if (args.getEnabled() != null) {
+      wrapper.eq(SystemUserTb::getEnabled, args.getEnabled());
+    }
+    if (CollUtil.isNotEmpty(args.getDeptIds())) {
+      wrapper.in(SystemUserTb::getDeptId, args.getDeptIds());
+    }
+    if (StrUtil.isNotBlank(args.getBlurry())) {
+      wrapper.and(w -> w.like(SystemUserTb::getUsername, args.getBlurry())
+          .or().like(SystemUserTb::getNickName, args.getBlurry())
+          .or().like(SystemUserTb::getEmail, args.getBlurry()));
+    }
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemUserTb::getCreateTime, args.getCreateTime().get(0),
+          args.getCreateTime().get(1));
     }
     wrapper.orderByDesc(SystemUserTb::getCreateTime);
     return wrapper;
@@ -477,28 +422,24 @@ public class SystemUserService {
     if (user == null) {
       return null;
     }
-    SystemUserVo userVo = BeanUtil.copyProperties(user, SystemUserVo.class);
+    SystemUserVo userVo = KitBeanUtil.copyToClass(user, SystemUserVo.class);
     // 查询关联的部门信息
     if (user.getDeptId() != null) {
-      SystemDeptTb dept = systemDeptMapper.selectById(user.getDeptId());
+      SystemDeptVo dept = systemDeptService.getDeptVoById(user.getDeptId());
       userVo.setDept(dept);
     }
     // 查询关联的岗位信息
-    LambdaQueryWrapper<SystemUserJobTb> jobWrapper = new LambdaQueryWrapper<>();
-    jobWrapper.eq(SystemUserJobTb::getUserId, user.getId());
-    List<SystemUserJobTb> userJobs = systemUserJobMapper.selectList(jobWrapper);
+    List<SystemUserJobTb> userJobs = systemUserJobService.listUserJobByUserId(user.getId());
     if (CollUtil.isNotEmpty(userJobs)) {
       Set<Long> jobIds = userJobs.stream().map(SystemUserJobTb::getJobId).collect(Collectors.toSet());
-      List<SystemJobTb> jobs = systemJobMapper.selectByIds(jobIds);
+      List<SystemJobTb> jobs = systemJobService.listByIds(jobIds);
       userVo.setJobs(new LinkedHashSet<>(jobs));
     }
     // 查询关联的角色信息
-    LambdaQueryWrapper<SystemUserRoleTb> roleWrapper = new LambdaQueryWrapper<>();
-    roleWrapper.eq(SystemUserRoleTb::getUserId, user.getId());
-    List<SystemUserRoleTb> userRoles = systemUserRoleMapper.selectList(roleWrapper);
+    List<SystemUserRoleTb> userRoles = systemUserRoleService.listUserRoleByUserId(user.getId());
     if (CollUtil.isNotEmpty(userRoles)) {
       Set<Long> roleIds = userRoles.stream().map(SystemUserRoleTb::getRoleId).collect(Collectors.toSet());
-      List<SystemRoleTb> roles = systemRoleMapper.selectByIds(roleIds);
+      List<SystemRoleTb> roles = systemRoleService.listByIds(roleIds);
       userVo.setRoles(new LinkedHashSet<>(roles));
     }
     return userVo;
@@ -533,13 +474,12 @@ public class SystemUserService {
     if (!ObjectUtils.isEmpty(args.getDeptId())) {
       args.getDeptIds().add(args.getDeptId());
       // 先查找是否存在子节点
-      List<SystemDeptTb> data = systemDeptService.listDeptByPid(args.getDeptId());
+      List<SystemDeptVo> data = systemDeptService.listDeptByPid(args.getDeptId());
       // 然后把子节点的ID都加入到集合中
       args.getDeptIds().addAll(systemDeptService.queryChildDeptIdByDeptIds(data));
     }
     // 数据权限
-    List<Long> dataScopes = systemDataService.queryDeptIdByArgs(
-        this.getUserByUsername(currentUsername));
+    List<Long> dataScopes = systemDataService.queryDeptIdByArgs(this.getUserVoByUsername(currentUsername));
     // args.getDeptIds() 不为空并且数据权限不为空则取交集
     if (!CollectionUtils.isEmpty(args.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)) {
       // 取交集
@@ -556,35 +496,6 @@ public class SystemUserService {
   }
 
   public void exportUserXlsx(HttpServletResponse response, SystemQueryUserArgs args) {
-    //    List<SystemUserVo> systemUserVos = systemUserService.queryUserVoByArgs(args);
-//    KitXlsxExportUtil.exportFile(response, "用户数据", systemUserVos, SystemUserExportRowVo.class, (dataObject) -> {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      return CollUtil.newArrayList(rowVo);
-//    });
-//    List<SystemUserExportRowVo> rowVos = new ArrayList<>();
-//    for (SystemUserVo dataObject : systemUserVos) {
-//      SystemUserExportRowVo rowVo = new SystemUserExportRowVo();
-//      rowVo.setUsername(dataObject.getUsername());
-//      rowVo.setRoles(dataObject.getRoles().stream().map(SystemRoleTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setDept(dataObject.getDept().getName());
-//      rowVo.setJobs(dataObject.getJobs().stream().map(SystemJobTb::getName).collect(Collectors.joining(",")));
-//      rowVo.setEmail(dataObject.getEmail());
-//      rowVo.setStatus(dataObject.getEnabled() ? SystemZhConst.ENABLE_STR : SystemZhConst.DISABLE_STR);
-//      rowVo.setMobile(dataObject.getPhone());
-//      rowVo.setUpdatePwdTime(dataObject.getPwdResetTime());
-//      rowVo.setCreateTime(dataObject.getCreateTime());
-//      rowVos.add(rowVo);
-//    }
-//    KitExcelExporter.exportSimple(response, "用户数据", SystemUserExportRowVo.class, rowVos);
     long totalCount = this.countUserByArgs(args);
     KitExcelExporter.exportByPage(response, "用户数据", SystemUserExportRowVo.class, totalCount, (long pageNum, long pageSize) -> {
       KitPageResult<SystemUserVo> pageResult = this.searchUserByArgs(args, new Page<>(pageNum, pageSize));
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
index c28e6731..2d9c8145 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/impl/SystemMinioStorageServiceImpl.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.system.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.base.KitPageResult;
@@ -24,15 +23,17 @@ import cn.odboy.framework.properties.AppProperties;
 import cn.odboy.framework.properties.model.StorageOSSModel;
 import cn.odboy.framework.server.core.KitFileLocalUploadHelper;
 import cn.odboy.system.dal.dataobject.SystemOssStorageTb;
-import cn.odboy.system.dal.model.SystemOssStorageExportRowVo;
-import cn.odboy.system.dal.model.SystemOssStorageVo;
-import cn.odboy.system.dal.model.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.export.SystemOssStorageExportRowVo;
+import cn.odboy.system.dal.model.request.SystemQueryStorageArgs;
+import cn.odboy.system.dal.model.response.SystemOssStorageVo;
 import cn.odboy.system.dal.mysql.SystemOssStorageMapper;
 import cn.odboy.system.framework.storage.minio.MinioRepository;
 import cn.odboy.system.service.SystemOssStorageService;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitDateUtil;
 import cn.odboy.util.KitFileUtil;
 import cn.odboy.util.KitPageUtil;
+import cn.odboy.util.KitValidUtil;
 import cn.odboy.util.xlsx.KitExcelExporter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -68,33 +69,27 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
   private SystemOssStorageMapper systemOssStorageMapper;
 
   @Override
-  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args,
-      Page<SystemOssStorageTb> page) {
-    IPage<SystemOssStorageTb> ossStorageTbs = this.selectOssStorageByArgs(args, page);
-    IPage<SystemOssStorageVo> convert = ossStorageTbs.convert(c -> {
-      SystemOssStorageVo storageVo = BeanUtil.copyProperties(c, SystemOssStorageVo.class);
+  public KitPageResult<SystemOssStorageVo> searchOssStorage(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
+    IPage<SystemOssStorageVo> ossStorageTbs = this.selectOssStorageByArgs(args, page);
+    for (SystemOssStorageVo storageVo : ossStorageTbs.getRecords()) {
       storageVo.setFileSizeDesc(KitFileUtil.getSize(storageVo.getFileSize()));
-      return storageVo;
-    });
-    return KitPageUtil.toPage(convert);
+    }
+    return KitPageUtil.toPage(ossStorageTbs);
   }
 
-  private IPage<SystemOssStorageTb> selectOssStorageByArgs(SystemQueryStorageArgs args,
-      Page<SystemOssStorageTb> page) {
+  private IPage<SystemOssStorageVo> selectOssStorageByArgs(SystemQueryStorageArgs args, Page<SystemOssStorageTb> page) {
+    KitValidUtil.notNull(args);
     LambdaQueryWrapper<SystemOssStorageTb> wrapper = new LambdaQueryWrapper<>();
-    if (args != null) {
-      wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
-          c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or()
-              .like(SystemOssStorageTb::getFileMd5, args.getBlurry()));
-      if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
-        wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0),
-            args.getCreateTime().get(1));
-      }
+    wrapper.and(StrUtil.isNotBlank(args.getBlurry()),
+        c -> c.like(SystemOssStorageTb::getFileName, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFilePrefix, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFileMime, args.getBlurry()).or()
+            .like(SystemOssStorageTb::getFileMd5, args.getBlurry()));
+    if (CollUtil.isNotEmpty(args.getCreateTime()) && args.getCreateTime().size() >= 2) {
+      wrapper.between(SystemOssStorageTb::getUpdateTime, args.getCreateTime().get(0), args.getCreateTime().get(1));
     }
     wrapper.orderByAsc(SystemOssStorageTb::getId);
-    return systemOssStorageMapper.selectPage(page, wrapper);
+    return systemOssStorageMapper.selectPage(page, wrapper).convert(i -> KitBeanUtil.copyToClass(i, SystemOssStorageVo.class));
   }
 
   @Override
@@ -157,8 +152,8 @@ public class SystemMinioStorageServiceImpl extends ServiceImpl<SystemOssStorageM
   public void exportOssStorageXlsx(HttpServletResponse response, SystemQueryStorageArgs args) {
     List<SystemOssStorageVo> systemOssStorageVos = this.queryOssStorage(args);
 //    KitXlsxExportUtil.exportFile(response, "OSS文件上传记录数据", systemOssStorageVos, SystemOssStorageExportRowVo.class,
-//        (dataObject) -> CollUtil.newArrayList(BeanUtil.copyProperties(dataObject, SystemOssStorageExportRowVo.class)));
-    List<SystemOssStorageExportRowVo> rowVos = BeanUtil.copyToList(systemOssStorageVos, SystemOssStorageExportRowVo.class);
+//        (dataObject) -> CollUtil.newArrayList(KitBeanUtil.copyProperties(dataObject, SystemOssStorageExportRowVo.class)));
+    List<SystemOssStorageExportRowVo> rowVos = KitBeanUtil.copyToList(systemOssStorageVos, SystemOssStorageExportRowVo.class);
     KitExcelExporter.exportSimple(response, "OSS文件上传记录数据", SystemOssStorageExportRowVo.class, rowVos);
   }
 
diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
index 0d443168..4c08c8a6 100644
--- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
+++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/util/KitSqlUtil.java
@@ -34,6 +34,9 @@ import java.util.List;
 import javax.sql.DataSource;
 import lombok.extern.slf4j.Slf4j;
 
+/**
+ * 不建议在生产环境使用
+ */
 @Slf4j
 public final class KitSqlUtil {
 
diff --git a/cutejava/cutejava-module-task-v1/pom.xml b/cutejava/cutejava-module-task-v1/pom.xml
index c622cdf1..02bf309a 100644
--- a/cutejava/cutejava-module-task-v1/pom.xml
+++ b/cutejava/cutejava-module-task-v1/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-module-task-v1</artifactId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-module-system</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/core/TaskManage.java b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/core/TaskManage.java
index 231f2886..a722d520 100644
--- a/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/core/TaskManage.java
+++ b/cutejava/cutejava-module-task-v1/src/main/java/cn/odboy/task/core/TaskManage.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.task.core;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
@@ -31,6 +30,7 @@ import cn.odboy.task.dal.model.TaskTemplateNodeVo;
 import cn.odboy.task.service.TaskInstanceDetailService;
 import cn.odboy.task.service.TaskInstanceInfoService;
 import cn.odboy.task.service.TaskTemplateInfoService;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitDateUtil;
 import com.alibaba.fastjson2.JSON;
 import java.util.ArrayList;
@@ -228,12 +228,11 @@ public class TaskManage {
       record.setTemplate(templateInfo.getTemplateInfo());
       return record;
     }
-    record = BeanUtil.copyProperties(historyInstance, TaskInstanceInfoVo.class);
+    record = KitBeanUtil.copyToClass(historyInstance, TaskInstanceInfoVo.class);
     record.setHistory(buildNodeList(record));
-    TaskInstanceInfoTb runningInstance =
-        taskInstanceInfoService.getLastRunningInstance(contextName, language, envAlias, changeType);
+    TaskInstanceInfoTb runningInstance = taskInstanceInfoService.getLastRunningInstance(contextName, language, envAlias, changeType);
     if (runningInstance != null) {
-      TaskInstanceInfoVo taskInstanceInfoVo = BeanUtil.copyProperties(runningInstance, TaskInstanceInfoVo.class);
+      TaskInstanceInfoVo taskInstanceInfoVo = KitBeanUtil.copyToClass(runningInstance, TaskInstanceInfoVo.class);
       record.setCurrent(buildNodeList(taskInstanceInfoVo));
     }
     return record;
diff --git a/cutejava/cutejava-module-task-v2/pom.xml b/cutejava/cutejava-module-task-v2/pom.xml
index 36f6c9f3..044fbf4d 100644
--- a/cutejava/cutejava-module-task-v2/pom.xml
+++ b/cutejava/cutejava-module-task-v2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-module-task-v2</artifactId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-module-system</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/core/TaskManage.java b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/core/TaskManage.java
index 31a7a163..0bc73a1b 100644
--- a/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/core/TaskManage.java
+++ b/cutejava/cutejava-module-task-v2/src/main/java/cn/odboy/task/core/TaskManage.java
@@ -15,7 +15,6 @@
  */
 package cn.odboy.task.core;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.odboy.framework.context.KitSpringBeanHolder;
 import cn.odboy.framework.exception.BadRequestException;
@@ -31,6 +30,7 @@ import cn.odboy.task.dal.model.TaskTemplateNodeVo;
 import cn.odboy.task.service.TaskInstanceDetailService;
 import cn.odboy.task.service.TaskInstanceInfoService;
 import cn.odboy.task.service.TaskTemplateInfoService;
+import cn.odboy.util.KitBeanUtil;
 import cn.odboy.util.KitDateUtil;
 import com.alibaba.fastjson2.JSON;
 import java.util.ArrayList;
@@ -228,12 +228,11 @@ public class TaskManage {
       record.setTemplate(templateInfo.getTemplateInfo());
       return record;
     }
-    record = BeanUtil.copyProperties(historyInstance, TaskInstanceInfoVo.class);
+    record = KitBeanUtil.copyToClass(historyInstance, TaskInstanceInfoVo.class);
     record.setHistory(buildNodeList(record));
-    TaskInstanceInfoTb runningInstance =
-        taskInstanceInfoService.getLastRunningInstance(contextName, language, envAlias, changeType);
+    TaskInstanceInfoTb runningInstance = taskInstanceInfoService.getLastRunningInstance(contextName, language, envAlias, changeType);
     if (runningInstance != null) {
-      TaskInstanceInfoVo taskInstanceInfoVo = BeanUtil.copyProperties(runningInstance, TaskInstanceInfoVo.class);
+      TaskInstanceInfoVo taskInstanceInfoVo = KitBeanUtil.copyToClass(runningInstance, TaskInstanceInfoVo.class);
       record.setCurrent(buildNodeList(taskInstanceInfoVo));
     }
     return record;
diff --git a/cutejava/cutejava-starter/pom.xml b/cutejava/cutejava-starter/pom.xml
index 02821544..cf08c991 100644
--- a/cutejava/cutejava-starter/pom.xml
+++ b/cutejava/cutejava-starter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cutejava</artifactId>
     <groupId>cn.odboy</groupId>
-    <version>1.4.1</version>
+    <version>1.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cutejava-starter</artifactId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>cn.odboy</groupId>
       <artifactId>cutejava-module-task-v1</artifactId>
-      <version>1.4.1</version>
+      <version>1.5.0</version>
     </dependency>
   </dependencies>
   <!-- 打包 -->
diff --git a/cutejava/cutejava-starter/src/main/resources/banner.txt b/cutejava/cutejava-starter/src/main/resources/banner.txt
index 1fc3ccc4..3de8b5ba 100644
--- a/cutejava/cutejava-starter/src/main/resources/banner.txt
+++ b/cutejava/cutejava-starter/src/main/resources/banner.txt
@@ -5,4 +5,4 @@
 | |___  | |_| |   | |   | |___  | |_| |  / /  | | | |/ /     / /  | |
 \_____| \_____/   |_|   |_____| \_____/ /_/   |_| |___/     /_/   |_|
 
-Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.4.1)
\ No newline at end of file
+Spring Boot Version: (${spring-boot.version})，CuteJava Version: (1.5.0)
\ No newline at end of file
diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
index a5302327..fb91edb9 100644
--- a/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
+++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/SystemApplicationTests.java
@@ -16,10 +16,10 @@
 package cn.odboy;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.odboy.system.dal.dataobject.SystemDeptTb;
 import cn.odboy.system.dal.dataobject.SystemJobTb;
 import cn.odboy.system.dal.dataobject.SystemRoleTb;
-import cn.odboy.system.dal.model.SystemUserVo;
+import cn.odboy.system.dal.model.response.SystemDeptVo;
+import cn.odboy.system.dal.model.response.SystemUserVo;
 import cn.odboy.system.service.SystemUserService;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@ public class SystemApplicationTests {
 
   @Test
   public void contextLoads() {
-    SystemDeptTb systemDept = new SystemDeptTb();
+    SystemDeptVo systemDept = new SystemDeptVo();
     systemDept.setId(2L);
     SystemJobTb systemJob = new SystemJobTb();
     systemJob.setId(11L);
diff --git a/cutejava/pom.xml b/cutejava/pom.xml
index 424a5895..b22b9168 100644
--- a/cutejava/pom.xml
+++ b/cutejava/pom.xml
@@ -5,7 +5,7 @@
   <groupId>cn.odboy</groupId>
   <artifactId>cutejava</artifactId>
   <packaging>pom</packaging>
-  <version>1.4.1</version>
+  <version>1.5.0</version>
 
   <modules>
     <!-- 基础设施 -->