diff --git a/cutejava-ui/public/favicon.ico b/cutejava-ui/public/favicon.ico index fcb69992..71483780 100644 Binary files a/cutejava-ui/public/favicon.ico and b/cutejava-ui/public/favicon.ico differ diff --git a/cutejava-ui/src/api/system/code.js b/cutejava-ui/src/api/system/code.js index 0d2e4c27..5202be2d 100644 --- a/cutejava-ui/src/api/system/code.js +++ b/cutejava-ui/src/api/system/code.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function resetEmail(data) { +export function sendCaptcha(data) { return request({ - url: 'api/code/resetEmail?email=' + data, + url: 'api/code/sendCaptcha?email=' + data, method: 'post' }) } diff --git a/cutejava-ui/src/api/system/user.js b/cutejava-ui/src/api/system/user.js index fee2d844..81caa68a 100644 --- a/cutejava-ui/src/api/system/user.js +++ b/cutejava-ui/src/api/system/user.js @@ -65,5 +65,17 @@ export function updateEmail(form) { }) } -export default { add, edit, del, resetPwd } +export function queryUserMetaPage(query) { + return request({ + url: 'api/users/queryUserMetaPage', + method: 'post', + data: { + page: 1, + pageSize: 50, + blurry: query + } + }) +} + +export default { add, edit, del, resetPwd, queryUserMetaPage } diff --git a/cutejava-ui/src/assets/icons/svg/Cronometer.svg b/cutejava-ui/src/assets/icons/svg/Cronometer.svg new file mode 100644 index 00000000..5980483a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/Cronometer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/Insurance.svg b/cutejava-ui/src/assets/icons/svg/Insurance.svg new file mode 100644 index 00000000..fd66e860 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/Insurance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/Sign.svg b/cutejava-ui/src/assets/icons/svg/Sign.svg new file mode 100644 index 00000000..59c9e6f2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/Sign.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/account.svg b/cutejava-ui/src/assets/icons/svg/account.svg new file mode 100644 index 00000000..0499445a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/account.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/activity.svg b/cutejava-ui/src/assets/icons/svg/activity.svg new file mode 100644 index 00000000..0608eed4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/activity.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/add-file.svg b/cutejava-ui/src/assets/icons/svg/add-file.svg new file mode 100644 index 00000000..eccbdcb8 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/add-file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/add.svg b/cutejava-ui/src/assets/icons/svg/add.svg new file mode 100644 index 00000000..2ddbd0bf --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/add.svg @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/aim.svg b/cutejava-ui/src/assets/icons/svg/aim.svg new file mode 100644 index 00000000..59dbc1b0 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/aim.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/alarm.svg b/cutejava-ui/src/assets/icons/svg/alarm.svg new file mode 100644 index 00000000..f6453405 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/alarm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/archives.svg b/cutejava-ui/src/assets/icons/svg/archives.svg new file mode 100644 index 00000000..0c280b74 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/archives.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/article.svg b/cutejava-ui/src/assets/icons/svg/article.svg new file mode 100644 index 00000000..2df901d5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/article.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/asset-income.svg b/cutejava-ui/src/assets/icons/svg/asset-income.svg new file mode 100644 index 00000000..ce25f908 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/asset-income.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/audit-log.svg b/cutejava-ui/src/assets/icons/svg/audit-log.svg new file mode 100644 index 00000000..7c3e5220 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/audit-log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/authority.svg b/cutejava-ui/src/assets/icons/svg/authority.svg new file mode 100644 index 00000000..09810e63 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/authority.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/bak.svg b/cutejava-ui/src/assets/icons/svg/bak.svg new file mode 100644 index 00000000..4610dcb5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/bak.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/banner.svg b/cutejava-ui/src/assets/icons/svg/banner.svg new file mode 100644 index 00000000..dc9b7c03 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/banner.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/bargain.svg b/cutejava-ui/src/assets/icons/svg/bargain.svg new file mode 100644 index 00000000..c12661ba --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/bargain.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/bigdata-screen.svg b/cutejava-ui/src/assets/icons/svg/bigdata-screen.svg new file mode 100644 index 00000000..1648c7f9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/bigdata-screen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/bill.svg b/cutejava-ui/src/assets/icons/svg/bill.svg new file mode 100644 index 00000000..01827a04 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/bill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/bp.svg b/cutejava-ui/src/assets/icons/svg/bp.svg new file mode 100644 index 00000000..84db1d92 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/bp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/briefcase.svg b/cutejava-ui/src/assets/icons/svg/briefcase.svg new file mode 100644 index 00000000..dbc08acb --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/briefcase.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/build.svg b/cutejava-ui/src/assets/icons/svg/build.svg new file mode 100644 index 00000000..05dba9e2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/build.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/business.svg b/cutejava-ui/src/assets/icons/svg/business.svg new file mode 100644 index 00000000..14d189ec --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/business.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/button.svg b/cutejava-ui/src/assets/icons/svg/button.svg new file mode 100644 index 00000000..972e2631 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/button.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/calendar.svg b/cutejava-ui/src/assets/icons/svg/calendar.svg new file mode 100644 index 00000000..f355e6f2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/calendar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/capital.svg b/cutejava-ui/src/assets/icons/svg/capital.svg new file mode 100644 index 00000000..271e9f6d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/capital.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/captcha.svg b/cutejava-ui/src/assets/icons/svg/captcha.svg new file mode 100644 index 00000000..d793e9a2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/captcha.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/close.svg b/cutejava-ui/src/assets/icons/svg/close.svg new file mode 100644 index 00000000..f8a4b0ec --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/collect.svg b/cutejava-ui/src/assets/icons/svg/collect.svg new file mode 100644 index 00000000..38f267e6 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/collect.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/comment.svg b/cutejava-ui/src/assets/icons/svg/comment.svg new file mode 100644 index 00000000..fad4b679 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/comment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/compass.svg b/cutejava-ui/src/assets/icons/svg/compass.svg new file mode 100644 index 00000000..9415742d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/compass.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/configure.svg b/cutejava-ui/src/assets/icons/svg/configure.svg new file mode 100644 index 00000000..0b0591d5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/configure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/contract.svg b/cutejava-ui/src/assets/icons/svg/contract.svg new file mode 100644 index 00000000..624c6010 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/contract.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/copy.svg b/cutejava-ui/src/assets/icons/svg/copy.svg new file mode 100644 index 00000000..55c197c9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/coupon.svg b/cutejava-ui/src/assets/icons/svg/coupon.svg new file mode 100644 index 00000000..5a025651 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/coupon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/coupon2.svg b/cutejava-ui/src/assets/icons/svg/coupon2.svg new file mode 100644 index 00000000..b3a003e7 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/coupon2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/cpu.svg b/cutejava-ui/src/assets/icons/svg/cpu.svg new file mode 100644 index 00000000..af69b338 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/cpu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/crm.svg b/cutejava-ui/src/assets/icons/svg/crm.svg new file mode 100644 index 00000000..3b407d3e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/crm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/custom-manage.svg b/cutejava-ui/src/assets/icons/svg/custom-manage.svg new file mode 100644 index 00000000..76db5ec8 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/custom-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/custom.svg b/cutejava-ui/src/assets/icons/svg/custom.svg new file mode 100644 index 00000000..7b479a87 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/custom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/dairy.svg b/cutejava-ui/src/assets/icons/svg/dairy.svg new file mode 100644 index 00000000..cf3a694d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/dairy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/data-analysis.svg b/cutejava-ui/src/assets/icons/svg/data-analysis.svg new file mode 100644 index 00000000..adf1cf4f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/data-analysis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/data.svg b/cutejava-ui/src/assets/icons/svg/data.svg new file mode 100644 index 00000000..6a88e50e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/data.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/debt.svg b/cutejava-ui/src/assets/icons/svg/debt.svg new file mode 100644 index 00000000..cba05a85 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/debt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/dengji.svg b/cutejava-ui/src/assets/icons/svg/dengji.svg new file mode 100644 index 00000000..e2cd8cfe --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/dengji.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/device.svg b/cutejava-ui/src/assets/icons/svg/device.svg new file mode 100644 index 00000000..a192cb93 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/device.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/disc.svg b/cutejava-ui/src/assets/icons/svg/disc.svg new file mode 100644 index 00000000..d28447a0 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/disc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/document.svg b/cutejava-ui/src/assets/icons/svg/document.svg new file mode 100644 index 00000000..2e073647 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/document.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/dot.svg b/cutejava-ui/src/assets/icons/svg/dot.svg new file mode 100644 index 00000000..1e9d9b97 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/dot.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/end.svg b/cutejava-ui/src/assets/icons/svg/end.svg new file mode 100644 index 00000000..21f457ce --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/end.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/energy-manage.svg b/cutejava-ui/src/assets/icons/svg/energy-manage.svg new file mode 100644 index 00000000..1301f18b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/energy-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/enlarge.svg b/cutejava-ui/src/assets/icons/svg/enlarge.svg new file mode 100644 index 00000000..bce8376e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/enlarge.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/excellence.svg b/cutejava-ui/src/assets/icons/svg/excellence.svg new file mode 100644 index 00000000..e83360f1 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/excellence.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/exit.svg b/cutejava-ui/src/assets/icons/svg/exit.svg new file mode 100644 index 00000000..81460821 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/exit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/expenses.svg b/cutejava-ui/src/assets/icons/svg/expenses.svg new file mode 100644 index 00000000..fb9fa11e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/expenses.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/exporting.svg b/cutejava-ui/src/assets/icons/svg/exporting.svg new file mode 100644 index 00000000..1eeaee7c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/exporting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/express.svg b/cutejava-ui/src/assets/icons/svg/express.svg new file mode 100644 index 00000000..667528ef --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/express.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/eye.svg b/cutejava-ui/src/assets/icons/svg/eye.svg new file mode 100644 index 00000000..4f9086b4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/fee.svg b/cutejava-ui/src/assets/icons/svg/fee.svg new file mode 100644 index 00000000..518879f3 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/fee.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/fenxiao.svg b/cutejava-ui/src/assets/icons/svg/fenxiao.svg new file mode 100644 index 00000000..943263d3 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/fenxiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/fiance.svg b/cutejava-ui/src/assets/icons/svg/fiance.svg new file mode 100644 index 00000000..f7e5b9a9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/fiance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/file.svg b/cutejava-ui/src/assets/icons/svg/file.svg new file mode 100644 index 00000000..cf13d2c0 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/file.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/filter.svg b/cutejava-ui/src/assets/icons/svg/filter.svg new file mode 100644 index 00000000..b01d6266 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/filter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/finance-debt.svg b/cutejava-ui/src/assets/icons/svg/finance-debt.svg new file mode 100644 index 00000000..4bb5948d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/finance-debt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/finance-repaylog.svg b/cutejava-ui/src/assets/icons/svg/finance-repaylog.svg new file mode 100644 index 00000000..6371fd3d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/finance-repaylog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/finance.svg b/cutejava-ui/src/assets/icons/svg/finance.svg new file mode 100644 index 00000000..89149d09 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/finance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/fingerprint.svg b/cutejava-ui/src/assets/icons/svg/fingerprint.svg new file mode 100644 index 00000000..e3911ce3 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/fingerprint.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/finish.svg b/cutejava-ui/src/assets/icons/svg/finish.svg new file mode 100644 index 00000000..c1947fb4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/finish.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/fixed-assets.svg b/cutejava-ui/src/assets/icons/svg/fixed-assets.svg new file mode 100644 index 00000000..90b0e925 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/fixed-assets.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/folder.svg b/cutejava-ui/src/assets/icons/svg/folder.svg new file mode 100644 index 00000000..2e3c9f22 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/gateway.svg b/cutejava-ui/src/assets/icons/svg/gateway.svg new file mode 100644 index 00000000..dcf48279 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/gateway.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/generated.svg b/cutejava-ui/src/assets/icons/svg/generated.svg new file mode 100644 index 00000000..c40e9237 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/generated.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/gift.svg b/cutejava-ui/src/assets/icons/svg/gift.svg new file mode 100644 index 00000000..6587643e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/gift.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/goods.svg b/cutejava-ui/src/assets/icons/svg/goods.svg new file mode 100644 index 00000000..0294e022 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/goods.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/history.svg b/cutejava-ui/src/assets/icons/svg/history.svg new file mode 100644 index 00000000..19ee9e53 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/history.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/ic-yesterday.svg b/cutejava-ui/src/assets/icons/svg/ic-yesterday.svg new file mode 100644 index 00000000..fae35c23 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/ic-yesterday.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/import.svg b/cutejava-ui/src/assets/icons/svg/import.svg new file mode 100644 index 00000000..cc8cd953 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/import.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/info.svg b/cutejava-ui/src/assets/icons/svg/info.svg new file mode 100644 index 00000000..47417202 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/interface.svg b/cutejava-ui/src/assets/icons/svg/interface.svg new file mode 100644 index 00000000..bd3a08ac --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/interface.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/invisible.svg b/cutejava-ui/src/assets/icons/svg/invisible.svg new file mode 100644 index 00000000..9cf919e5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/invisible.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/iot.svg b/cutejava-ui/src/assets/icons/svg/iot.svg new file mode 100644 index 00000000..73adadda --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/iot.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/knowledge-base.svg b/cutejava-ui/src/assets/icons/svg/knowledge-base.svg new file mode 100644 index 00000000..54b2bddb --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/knowledge-base.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/lease.svg b/cutejava-ui/src/assets/icons/svg/lease.svg new file mode 100644 index 00000000..15c88a7e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/lease.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/life-dairy.svg b/cutejava-ui/src/assets/icons/svg/life-dairy.svg new file mode 100644 index 00000000..a5f2f5a7 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/life-dairy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/life-journal.svg b/cutejava-ui/src/assets/icons/svg/life-journal.svg new file mode 100644 index 00000000..4ccbeb78 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/life-journal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/life.svg b/cutejava-ui/src/assets/icons/svg/life.svg new file mode 100644 index 00000000..8f1234d9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/life.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/loan.svg b/cutejava-ui/src/assets/icons/svg/loan.svg new file mode 100644 index 00000000..c807fe93 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/loan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/location.svg b/cutejava-ui/src/assets/icons/svg/location.svg new file mode 100644 index 00000000..6926a9a7 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/location.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/login-log.svg b/cutejava-ui/src/assets/icons/svg/login-log.svg new file mode 100644 index 00000000..1c30fb49 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/login-log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/logistics.svg b/cutejava-ui/src/assets/icons/svg/logistics.svg new file mode 100644 index 00000000..72a37408 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/logistics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/love-hobby.svg b/cutejava-ui/src/assets/icons/svg/love-hobby.svg new file mode 100644 index 00000000..6a716f91 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/love-hobby.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/love-log.svg b/cutejava-ui/src/assets/icons/svg/love-log.svg new file mode 100644 index 00000000..f226362c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/love-log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/m-cockpit.svg b/cutejava-ui/src/assets/icons/svg/m-cockpit.svg new file mode 100644 index 00000000..3a3ce28b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/m-cockpit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/mail.svg b/cutejava-ui/src/assets/icons/svg/mail.svg new file mode 100644 index 00000000..e1cc4e8e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/mail.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/mapPin.svg b/cutejava-ui/src/assets/icons/svg/mapPin.svg new file mode 100644 index 00000000..bf72488f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/mapPin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/mc.svg b/cutejava-ui/src/assets/icons/svg/mc.svg new file mode 100644 index 00000000..8a9c482a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/mc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/minus-sign.svg b/cutejava-ui/src/assets/icons/svg/minus-sign.svg new file mode 100644 index 00000000..4e7eda29 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/minus-sign.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/mircrophone.svg b/cutejava-ui/src/assets/icons/svg/mircrophone.svg new file mode 100644 index 00000000..7b01e0a1 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/mircrophone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/monthlyview.svg b/cutejava-ui/src/assets/icons/svg/monthlyview.svg new file mode 100644 index 00000000..8657dd5b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/monthlyview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/music.svg b/cutejava-ui/src/assets/icons/svg/music.svg new file mode 100644 index 00000000..0eb52c03 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/music.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/narrow.svg b/cutejava-ui/src/assets/icons/svg/narrow.svg new file mode 100644 index 00000000..98ca8546 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/narrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/news.svg b/cutejava-ui/src/assets/icons/svg/news.svg new file mode 100644 index 00000000..b26e1e3b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/news.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/online_user.svg b/cutejava-ui/src/assets/icons/svg/online_user.svg new file mode 100644 index 00000000..f934aca3 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/online_user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/ops.svg b/cutejava-ui/src/assets/icons/svg/ops.svg new file mode 100644 index 00000000..87d5d7e6 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/ops.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/opus.svg b/cutejava-ui/src/assets/icons/svg/opus.svg new file mode 100644 index 00000000..d28e4dc9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/opus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/order.svg b/cutejava-ui/src/assets/icons/svg/order.svg new file mode 100644 index 00000000..df06451d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/order.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/orderinfo.svg b/cutejava-ui/src/assets/icons/svg/orderinfo.svg new file mode 100644 index 00000000..86e919fd --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/orderinfo.svg @@ -0,0 +1 @@ + diff --git a/cutejava-ui/src/assets/icons/svg/performance.svg b/cutejava-ui/src/assets/icons/svg/performance.svg new file mode 100644 index 00000000..4848f766 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/performance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/phonecall.svg b/cutejava-ui/src/assets/icons/svg/phonecall.svg new file mode 100644 index 00000000..e213baed --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/phonecall.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/picture.svg b/cutejava-ui/src/assets/icons/svg/picture.svg new file mode 100644 index 00000000..2c31589d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/picture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/plan.svg b/cutejava-ui/src/assets/icons/svg/plan.svg new file mode 100644 index 00000000..8708ca8f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/plan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/plateform.svg b/cutejava-ui/src/assets/icons/svg/plateform.svg new file mode 100644 index 00000000..eefe95b4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/plateform.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/plmt.svg b/cutejava-ui/src/assets/icons/svg/plmt.svg new file mode 100644 index 00000000..91d012b5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/plmt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/plus.svg b/cutejava-ui/src/assets/icons/svg/plus.svg new file mode 100644 index 00000000..07b396fb --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/pm.svg b/cutejava-ui/src/assets/icons/svg/pm.svg new file mode 100644 index 00000000..079a1fd6 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/pm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/points.svg b/cutejava-ui/src/assets/icons/svg/points.svg new file mode 100644 index 00000000..7c450d5c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/points.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/post.svg b/cutejava-ui/src/assets/icons/svg/post.svg new file mode 100644 index 00000000..62b4b33b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/post.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/preview.svg b/cutejava-ui/src/assets/icons/svg/preview.svg new file mode 100644 index 00000000..1c880a80 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/preview.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/price.svg b/cutejava-ui/src/assets/icons/svg/price.svg new file mode 100644 index 00000000..952f8ac1 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/price.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/printer.svg b/cutejava-ui/src/assets/icons/svg/printer.svg new file mode 100644 index 00000000..8203afad --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/printer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/pt.svg b/cutejava-ui/src/assets/icons/svg/pt.svg new file mode 100644 index 00000000..d357865f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/pt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/qr-code.svg b/cutejava-ui/src/assets/icons/svg/qr-code.svg new file mode 100644 index 00000000..b7daff9b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/qr-code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/question-answer.svg b/cutejava-ui/src/assets/icons/svg/question-answer.svg new file mode 100644 index 00000000..4dace76a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/question-answer.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/read.svg b/cutejava-ui/src/assets/icons/svg/read.svg new file mode 100644 index 00000000..900afb39 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/read.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/rec.svg b/cutejava-ui/src/assets/icons/svg/rec.svg new file mode 100644 index 00000000..18339da9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/rec.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/record.svg b/cutejava-ui/src/assets/icons/svg/record.svg new file mode 100644 index 00000000..1c030b9b --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/record.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/refresh.svg b/cutejava-ui/src/assets/icons/svg/refresh.svg new file mode 100644 index 00000000..31217add --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/release.svg b/cutejava-ui/src/assets/icons/svg/release.svg new file mode 100644 index 00000000..2a02af97 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/release.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/reply.svg b/cutejava-ui/src/assets/icons/svg/reply.svg new file mode 100644 index 00000000..3be88d41 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/reply.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/report.svg b/cutejava-ui/src/assets/icons/svg/report.svg new file mode 100644 index 00000000..444f5bee --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/report.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/revoke.svg b/cutejava-ui/src/assets/icons/svg/revoke.svg new file mode 100644 index 00000000..d1aafe1a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/revoke.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/risk-manage.svg b/cutejava-ui/src/assets/icons/svg/risk-manage.svg new file mode 100644 index 00000000..260769e2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/risk-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/rule.svg b/cutejava-ui/src/assets/icons/svg/rule.svg new file mode 100644 index 00000000..a1bbb6a6 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/rule.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/run.svg b/cutejava-ui/src/assets/icons/svg/run.svg new file mode 100644 index 00000000..c90ff44d --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/run.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/running.svg b/cutejava-ui/src/assets/icons/svg/running.svg new file mode 100644 index 00000000..b95cb88c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/running.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/salary.svg b/cutejava-ui/src/assets/icons/svg/salary.svg new file mode 100644 index 00000000..8f5ff994 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/salary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/save.svg b/cutejava-ui/src/assets/icons/svg/save.svg new file mode 100644 index 00000000..8d7ae1e0 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/scan.svg b/cutejava-ui/src/assets/icons/svg/scan.svg new file mode 100644 index 00000000..2c2b722f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/scan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/school-cert.svg b/cutejava-ui/src/assets/icons/svg/school-cert.svg new file mode 100644 index 00000000..54e3fdfb --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/school-cert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/school-citation.svg b/cutejava-ui/src/assets/icons/svg/school-citation.svg new file mode 100644 index 00000000..62c573cd --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/school-citation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/school-resume.svg b/cutejava-ui/src/assets/icons/svg/school-resume.svg new file mode 100644 index 00000000..368adba7 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/school-resume.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/scm.svg b/cutejava-ui/src/assets/icons/svg/scm.svg new file mode 100644 index 00000000..455c7fee --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/scm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/seckill.svg b/cutejava-ui/src/assets/icons/svg/seckill.svg new file mode 100644 index 00000000..dcd59e9a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/seckill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/server_monitor.svg b/cutejava-ui/src/assets/icons/svg/server_monitor.svg new file mode 100644 index 00000000..c13cc19c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/server_monitor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/service-center.svg b/cutejava-ui/src/assets/icons/svg/service-center.svg new file mode 100644 index 00000000..b29b84d4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/service-center.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/setting.svg b/cutejava-ui/src/assets/icons/svg/setting.svg new file mode 100644 index 00000000..148b393c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/seven.svg b/cutejava-ui/src/assets/icons/svg/seven.svg new file mode 100644 index 00000000..d2df729a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/seven.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/share.svg b/cutejava-ui/src/assets/icons/svg/share.svg new file mode 100644 index 00000000..1fea5094 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/share.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/shop-manage.svg b/cutejava-ui/src/assets/icons/svg/shop-manage.svg new file mode 100644 index 00000000..cf008dbc --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/shop-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/shop.svg b/cutejava-ui/src/assets/icons/svg/shop.svg new file mode 100644 index 00000000..7e644c65 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/shop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/sign2.svg b/cutejava-ui/src/assets/icons/svg/sign2.svg new file mode 100644 index 00000000..73e61068 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/sign2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/smile.svg b/cutejava-ui/src/assets/icons/svg/smile.svg new file mode 100644 index 00000000..db227597 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/smile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/space-alloc.svg b/cutejava-ui/src/assets/icons/svg/space-alloc.svg new file mode 100644 index 00000000..1cecc207 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/space-alloc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/space-manage.svg b/cutejava-ui/src/assets/icons/svg/space-manage.svg new file mode 100644 index 00000000..7ba5dc71 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/space-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/special.svg b/cutejava-ui/src/assets/icons/svg/special.svg new file mode 100644 index 00000000..707bbf50 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/special.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/star.svg b/cutejava-ui/src/assets/icons/svg/star.svg new file mode 100644 index 00000000..9a714dbd --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/star.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/storage-space.svg b/cutejava-ui/src/assets/icons/svg/storage-space.svg new file mode 100644 index 00000000..a80368b5 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/storage-space.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/storage.svg b/cutejava-ui/src/assets/icons/svg/storage.svg new file mode 100644 index 00000000..c68dd43e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/storage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/store.svg b/cutejava-ui/src/assets/icons/svg/store.svg new file mode 100644 index 00000000..65d1f136 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/store.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/storehouse.svg b/cutejava-ui/src/assets/icons/svg/storehouse.svg new file mode 100644 index 00000000..b5e89e78 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/storehouse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/student.svg b/cutejava-ui/src/assets/icons/svg/student.svg new file mode 100644 index 00000000..fdd368ad --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/student.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/system-config.svg b/cutejava-ui/src/assets/icons/svg/system-config.svg new file mode 100644 index 00000000..64c8abb2 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/system-config.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/take-photo.svg b/cutejava-ui/src/assets/icons/svg/take-photo.svg new file mode 100644 index 00000000..5120f2a0 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/take-photo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/task manege.svg b/cutejava-ui/src/assets/icons/svg/task manege.svg new file mode 100644 index 00000000..91c986ab --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/task manege.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/tem.svg b/cutejava-ui/src/assets/icons/svg/tem.svg new file mode 100644 index 00000000..90a53ef9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/tem.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/temp.svg b/cutejava-ui/src/assets/icons/svg/temp.svg new file mode 100644 index 00000000..c18d6d9a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/temp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/thumbs-up.svg b/cutejava-ui/src/assets/icons/svg/thumbs-up.svg new file mode 100644 index 00000000..60bfb208 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/thumbs-up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/time-birthday.svg b/cutejava-ui/src/assets/icons/svg/time-birthday.svg new file mode 100644 index 00000000..8ad5706a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/time-birthday.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/time-downcount.svg b/cutejava-ui/src/assets/icons/svg/time-downcount.svg new file mode 100644 index 00000000..a42de3da --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/time-downcount.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/tixian.svg b/cutejava-ui/src/assets/icons/svg/tixian.svg new file mode 100644 index 00000000..9363bd9c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/tixian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/today.svg b/cutejava-ui/src/assets/icons/svg/today.svg new file mode 100644 index 00000000..3ab4d15c --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/today.svg @@ -0,0 +1 @@ + diff --git a/cutejava-ui/src/assets/icons/svg/upload.svg b/cutejava-ui/src/assets/icons/svg/upload.svg new file mode 100644 index 00000000..a0f13e2e --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/upload.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/version.svg b/cutejava-ui/src/assets/icons/svg/version.svg new file mode 100644 index 00000000..e6004dd1 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/version.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/visitor.svg b/cutejava-ui/src/assets/icons/svg/visitor.svg new file mode 100644 index 00000000..d7af05f8 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/visitor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/warning.svg b/cutejava-ui/src/assets/icons/svg/warning.svg new file mode 100644 index 00000000..e6cc4548 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/warning.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work-joblog.svg b/cutejava-ui/src/assets/icons/svg/work-joblog.svg new file mode 100644 index 00000000..10d5c5d9 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work-joblog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work-manage.svg b/cutejava-ui/src/assets/icons/svg/work-manage.svg new file mode 100644 index 00000000..e82ea0cb --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work-manage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work-order.svg b/cutejava-ui/src/assets/icons/svg/work-order.svg new file mode 100644 index 00000000..3a711be4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work-order.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work-plan.svg b/cutejava-ui/src/assets/icons/svg/work-plan.svg new file mode 100644 index 00000000..70dd9f92 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work-plan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work-resume.svg b/cutejava-ui/src/assets/icons/svg/work-resume.svg new file mode 100644 index 00000000..231948db --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work-resume.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/work.svg b/cutejava-ui/src/assets/icons/svg/work.svg new file mode 100644 index 00000000..5bbb31b8 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/work.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/wxapp.svg b/cutejava-ui/src/assets/icons/svg/wxapp.svg new file mode 100644 index 00000000..8d3af3a4 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/wxapp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/wxpay.svg b/cutejava-ui/src/assets/icons/svg/wxpay.svg new file mode 100644 index 00000000..d3e4d16a --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/wxpay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/yingxiao.svg b/cutejava-ui/src/assets/icons/svg/yingxiao.svg new file mode 100644 index 00000000..8b7d1f1f --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/yingxiao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/icons/svg/yuan-141.svg b/cutejava-ui/src/assets/icons/svg/yuan-141.svg new file mode 100644 index 00000000..86010a97 --- /dev/null +++ b/cutejava-ui/src/assets/icons/svg/yuan-141.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/cutejava-ui/src/assets/images/avatar.png b/cutejava-ui/src/assets/images/avatar.png index 997732a4..d51b7177 100644 Binary files a/cutejava-ui/src/assets/images/avatar.png and b/cutejava-ui/src/assets/images/avatar.png differ diff --git a/cutejava-ui/src/assets/images/logo.png b/cutejava-ui/src/assets/images/logo.png index f7577109..b48bbced 100644 Binary files a/cutejava-ui/src/assets/images/logo.png and b/cutejava-ui/src/assets/images/logo.png differ diff --git a/cutejava-ui/src/layout/components/Sidebar/Logo.vue b/cutejava-ui/src/layout/components/Sidebar/Logo.vue index effc55d7..c5d2217c 100644 --- a/cutejava-ui/src/layout/components/Sidebar/Logo.vue +++ b/cutejava-ui/src/layout/components/Sidebar/Logo.vue @@ -59,6 +59,7 @@ export default { height: 32px; vertical-align: middle; margin-right: 6px; + border-radius: 50%; } & .sidebar-title { @@ -76,6 +77,7 @@ export default { &.collapse { .sidebar-logo { margin-right: 0px; + border-radius: 50%; } } } diff --git a/cutejava-ui/src/views/components/ClipboardDemo.vue b/cutejava-ui/src/views/components/base/ClipboardDemo.vue similarity index 95% rename from cutejava-ui/src/views/components/ClipboardDemo.vue rename to cutejava-ui/src/views/components/base/ClipboardDemo.vue index 94ca03b2..c979eb49 100644 --- a/cutejava-ui/src/views/components/ClipboardDemo.vue +++ b/cutejava-ui/src/views/components/base/ClipboardDemo.vue @@ -10,7 +10,7 @@ + diff --git a/cutejava-ui/src/views/components/business/CuteUserSelect.vue b/cutejava-ui/src/views/components/business/CuteUserSelect.vue new file mode 100644 index 00000000..2b5a6829 --- /dev/null +++ b/cutejava-ui/src/views/components/business/CuteUserSelect.vue @@ -0,0 +1,74 @@ + + + + diff --git a/cutejava-ui/src/views/components/business/DemoShow.vue b/cutejava-ui/src/views/components/business/DemoShow.vue new file mode 100644 index 00000000..7b2e13d8 --- /dev/null +++ b/cutejava-ui/src/views/components/business/DemoShow.vue @@ -0,0 +1,52 @@ + + + + diff --git a/cutejava-ui/src/views/system/job/module/form.vue b/cutejava-ui/src/views/system/job/module/form.vue index aa538fb1..eac3b928 100644 --- a/cutejava-ui/src/views/system/job/module/form.vue +++ b/cutejava-ui/src/views/system/job/module/form.vue @@ -15,7 +15,7 @@ label-width="80px" > { + sendCaptcha(this.form.email).then(res => { this.$message({ showClose: true, message: '发送成功，验证码有效期5分钟', diff --git a/cutejava-ui/src/views/system/user/index.vue b/cutejava-ui/src/views/system/user/index.vue index aa867a1a..e88aed86 100644 --- a/cutejava-ui/src/views/system/user/index.vue +++ b/cutejava-ui/src/views/system/user/index.vue @@ -2,27 +2,7 @@
- -
- -
- - + @@ -216,12 +196,13 @@ import Treeselect from '@riophae/vue-treeselect' import { mapGetters } from 'vuex' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' +import CuteDeptTree from '@/views/components/business/CuteDeptTree' let userRoles = [] let userJobs = [] const defaultForm = { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 'false', roles: [], jobs: [], dept: { id: null }, phone: null } export default { name: 'User', - components: { Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, + components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, cruds() { return CRUD({ title: '用户', url: 'api/users', crudMethod: { ...crudUser }}) }, @@ -241,9 +222,8 @@ export default { } return { height: document.documentElement.clientHeight - 180 + 'px;', - deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [], + deptName: '', depts: [], jobs: [], level: 3, roles: [], jobDatas: [], roleDatas: [], // 多选时使用 - defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' }, permission: { add: ['admin', 'user:add'], edit: ['admin', 'user:edit'], @@ -386,25 +366,14 @@ export default { console.log(this.jobDatas) return true }, - // 获取左侧部门数据 - getDeptDatas(node, resolve) { - const params = {} - if (typeof node !== 'object') { - if (node) { - params['name'] = node - } - } else if (node.level !== 0) { - params['pid'] = node.data.id + // 切换部门 + handleNodeClick(data) { + if (data.pid === 0) { + this.query.deptId = null + } else { + this.query.deptId = data.id } - setTimeout(() => { - getDepts(params).then(res => { - if (resolve) { - resolve(res.content) - } else { - this.deptDatas = res.content - } - }) - }, 100) + this.crud.toQuery() }, getDepts() { getDepts({ enabled: true }).then(res => { @@ -449,15 +418,6 @@ export default { }) } }, - // 切换部门 - handleNodeClick(data) { - if (data.pid === 0) { - this.query.deptId = null - } else { - this.query.deptId = data.id - } - this.crud.toQuery() - }, // 改变状态 changeEnabled(data, val) { this.$confirm('此操作将 "' + this.dict.label.user_status[val] + '" ' + data.username + ', 是否继续？', '提示', { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseResult.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseResult.java index fe51e10b..18c2bcae 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseResult.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/BaseResult.java @@ -5,8 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.util.List; - /** * 结果封装类 */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java index 6d53bb66..b546dbf5 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java @@ -1,8 +1,8 @@ package cn.odboy.base; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -32,16 +32,12 @@ public class MyEntity extends MyObject { @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - // @JSONField(format = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") - // @JSONField(format = "yyyy-MM-dd HH:mm:ss") -// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Timestamp updateTime; /* 分组校验 */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java b/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java index afefc9cf..5995a527 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemConst.java @@ -23,4 +23,15 @@ public class SystemConst { * Token前缀 */ public static final String TOKEN_PREFIX = "Bearer"; + + /** + * 小数点 + */ + public static final String SYMBOL_DOT = "."; + public static final String SYMBOL_EQUAL = "="; + public static final String SYMBOL_ADD = "+"; + public static final String SYMBOL_SUBTRACT = "-"; + public static final String SYMBOL_AT = "@"; + public static final String PROPERTY_OS_NAME = "os.name"; + public static final String OS_NAME_WINDOWS = "Windows"; } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java b/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java index 49ca967f..c1e9af70 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/constant/SystemRedisKey.java @@ -56,4 +56,9 @@ public interface SystemRedisKey { * 登录验证码 */ String CAPTCHA_LOGIN = "captcha::login:"; + + /** + * 用户信息 + */ + String USER_INFO = "user::info:"; } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java index 871d1c06..fc3c0d25 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/interfaces/EasyMapper.java @@ -89,11 +89,11 @@ public interface EasyMapper extends BaseMapper { Map result = new ConcurrentHashMap<>(1); List list = this.selectList(wrapper); if (CollUtil.isEmpty(list)) { - return new HashMap<>(); + return new HashMap<>(3); } E tempObj = list.stream().findFirst().orElse(null); if (tempObj == null) { - return new HashMap<>(); + return new HashMap<>(3); } Field[] fields = ReflectUtil.getFields(tempObj.getClass()); for (E e : list) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java index 78abfbe9..fbe86507 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/CmdGenHelper.java @@ -109,10 +109,7 @@ public class CmdGenHelper { // 5.2.Controller策略配置 // 开启生成@RestController控制器 fastAutoGenerator.strategyConfig(strategyConfigBuilder -> strategyConfigBuilder.controllerBuilder().enableRestStyle()); - // 如果不需要生成Controller - // fastAutoGenerator.templateConfig(templateConfig -> templateConfig.controller("")); - // 5.3.Service策略配置 - // 格式化service接口和实现类的文件名称, 去掉默认的ServiceName前面的I + // 如果不需要生成Controller，fastAutoGenerator.templateConfig(templateConfig -> templateConfig.controller(""))。5.3.Service策略配置：格式化service接口和实现类的文件名称, 去掉默认的ServiceName前面的I fastAutoGenerator.strategyConfig(strategyConfigBuilder -> strategyConfigBuilder .serviceBuilder() .formatServiceFileName("%sService") diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java index 88079801..d8281411 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/mybatis/util/MybatisHelper.java @@ -110,10 +110,11 @@ public class MybatisHelper { if (fieldVal instanceof List) { List between = new ArrayList<>((List) fieldVal); if (CollectionUtil.isNotEmpty(between)) { - if (between.size() >= 2) { + int minSize = 2; + if (between.size() >= minSize) { queryWrapper.between(finalAttributeName, between.get(0), between.get(1)); } else { - throw new BadRequestException("BETWEEN类型的对象列表长度必须 >= 2"); + throw new BadRequestException("BETWEEN类型的对象列表长度必须 >= " + minSize); } } } else { @@ -215,16 +216,9 @@ public class MybatisHelper { public static void main(String[] args) { QueryWrapper query = new QueryWrapper(); - //query.or(); query.or(wrapper -> wrapper.eq("username", 1).or().eq("nickname", 2)); - //query.like("a",1); - //query.or(); - //query.like("b",2); - //query.and(wrapper->wrapper.eq("c",1)); query.eq("id", 1); query.orderByDesc("id"); -// query.apply("left join student t1 on t1.id = t1.id"); -// query.last("left join student t1 on t1.id = t1.id"); System.err.println("getSqlSelect================================="); System.err.println(query.getSqlSelect()); System.err.println("getSqlSegment================================="); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java index d97a2e8c..7c6179f0 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/redis/RedisConfiguration.java @@ -181,8 +181,8 @@ public class RedisConfiguration extends CachingConfigurerSupport { return null; } String str = new String(bytes, StandardCharsets.UTF_8); - // 支持AutoType - return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType); + // 移除对 SupportAutoType 的使用 + return JSON.parseObject(str, clazz); } } } \ No newline at end of file diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java b/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java index 23ce43b9..9824e9fa 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/server/SwaggerConfig.java @@ -2,7 +2,6 @@ package cn.odboy.server; import cn.odboy.constant.SystemConst; import cn.odboy.util.AnonTagUtil; -import cn.odboy.util.SecurityUtil; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Value; @@ -85,7 +84,7 @@ public class SwaggerConfig { private SecurityContext getContextByPath() { Set urls = AnonTagUtil.getAllAnonymousUrl(applicationContext); - urls = urls.stream().filter(url -> !url.equals("/")).collect(Collectors.toSet()); + urls = urls.stream().filter(url -> !"/".equals(url)).collect(Collectors.toSet()); String regExp = "^(?!" + apiPath + String.join("|" + apiPath, urls) + ").*$"; return SecurityContext.builder() .securityReferences(defaultAuth()) diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java index 6e4f8994..a296da6c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/thread/AsyncExecutor.java @@ -63,10 +63,10 @@ public class AsyncExecutor implements AsyncConfigurer { /** * 自定义线程池，用法，注入到类中使用 - * private ThreadPoolTaskExecutor taskExecutor; */ @Bean("taskAsync") public ThreadPoolTaskExecutor taskAsync() { + // 用法 private ThreadPoolTaskExecutor taskExecutor ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setCorePoolSize(AsyncExecutor.corePoolSize); executor.setMaxPoolSize(AsyncExecutor.maxPoolSize); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java index 50b13536..bc2cdfb1 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/CollUtil.java @@ -17,9 +17,6 @@ package cn.odboy.util; import cn.odboy.base.MyMetaOption; import com.alibaba.fastjson2.JSON; -import com.google.common.base.Joiner; -import com.google.common.base.Splitter; -import com.google.common.collect.Lists; import java.lang.reflect.Field; import java.math.BigDecimal; @@ -37,7 +34,7 @@ import java.util.stream.Collectors; */ public class CollUtil extends cn.hutool.core.collection.CollUtil { private static Predicate distinctPredicate(Function keyMapper) { - Map map = new HashMap<>(); + Map map = new HashMap<>(3); return (t) -> null == map.putIfAbsent(keyMapper.apply(t), true); } diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DESEncryptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java similarity index 98% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/DESEncryptUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java index 10799b3c..74c14a9f 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/DESEncryptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/DesEncryptUtil.java @@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets; /** * DES加密 */ -public class DESEncryptUtil { +public class DesEncryptUtil { private static final String STR_PARAM = "Passw0rd"; private static final IvParameterSpec IV = new IvParameterSpec(STR_PARAM.getBytes(StandardCharsets.UTF_8)); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java index 896f135a..3d1a4e9b 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/FileUtil.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import cn.odboy.constant.FileTypeEnum; +import cn.odboy.constant.SystemConst; import cn.odboy.exception.BadRequestException; import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; @@ -25,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static cn.odboy.constant.SystemConst.*; + /** * File工具类，扩展 hutool 工具包 */ @@ -175,8 +178,10 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { if (value instanceof String) { String strValue = (String) value; // 检查并处理以特殊字符开头的值 - if (strValue.startsWith("=") || strValue.startsWith("+") || strValue.startsWith("-") || strValue.startsWith("@")) { - strValue = "'" + strValue; // 添加单引号前缀 + if (strValue.startsWith(SYMBOL_EQUAL) || strValue.startsWith(SYMBOL_ADD) + || strValue.startsWith(SYMBOL_SUBTRACT) || strValue.startsWith(SYMBOL_AT)) { + // 添加单引号前缀 + strValue = "'" + strValue; } sanitizedMap.put(key, strValue); } else { @@ -346,7 +351,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 不允许文件名超过255（在Mac和Linux中）或260（在Windows中）个字符 int maxFileNameLength = 255; - if (System.getProperty("os.name").startsWith("Windows")) { + if (System.getProperty(SystemConst.PROPERTY_OS_NAME).startsWith(SystemConst.OS_NAME_WINDOWS)) { maxFileNameLength = 260; } if (fileName.length() > maxFileNameLength) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IPUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java similarity index 99% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/IPUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java index 665532af..0d687bcf 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/IPUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/IpUtil.java @@ -11,7 +11,7 @@ import java.util.Enumeration; /** * IP地址 相关 */ -public class IPUtil { +public class IpUtil { /** * 注入bean */ diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java index 6ff293f6..19a2ade8 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ListUtil.java @@ -50,7 +50,8 @@ public class ListUtil { */ public static void main(String[] args) { List entities = new ArrayList<>(); - for (int i = 0; i < 50; i++) { + int total = 50; + for (int i = 0; i < total; i++) { MyEntity entity = new MyEntity(); if (i % 2 == 0) { entity.setCreateBy("odboy"); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RSAEncryptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java similarity index 96% rename from cutejava/cutejava-common/src/main/java/cn/odboy/util/RSAEncryptUtil.java rename to cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java index dd11b26b..82eeb138 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/RSAEncryptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/RsaEncryptUtil.java @@ -13,7 +13,7 @@ import java.security.spec.X509EncodedKeySpec; /** * Rsa 工具类，公钥私钥生成，加解密 */ -public class RSAEncryptUtil { +public class RsaEncryptUtil { private static final String SRC = "123456"; @@ -34,12 +34,12 @@ public class RSAEncryptUtil { */ private static void test1(RsaKeyPair keyPair) throws Exception { System.out.println("***************** 公钥加密私钥解密开始 *****************"); - String text1 = encryptByPublicKey(keyPair.getPublicKey(), RSAEncryptUtil.SRC); + String text1 = encryptByPublicKey(keyPair.getPublicKey(), RsaEncryptUtil.SRC); String text2 = decryptByPrivateKey(keyPair.getPrivateKey(), text1); - System.out.println("加密前：" + RSAEncryptUtil.SRC); + System.out.println("加密前：" + RsaEncryptUtil.SRC); System.out.println("加密后：" + text1); System.out.println("解密后：" + text2); - if (RSAEncryptUtil.SRC.equals(text2)) { + if (RsaEncryptUtil.SRC.equals(text2)) { System.out.println("解密字符串和原始字符串一致，解密成功"); } else { System.out.println("解密字符串和原始字符串不一致，解密失败"); @@ -54,12 +54,12 @@ public class RSAEncryptUtil { */ private static void test2(RsaKeyPair keyPair) throws Exception { System.out.println("***************** 私钥加密公钥解密开始 *****************"); - String text1 = encryptByPrivateKey(keyPair.getPrivateKey(), RSAEncryptUtil.SRC); + String text1 = encryptByPrivateKey(keyPair.getPrivateKey(), RsaEncryptUtil.SRC); String text2 = decryptByPublicKey(keyPair.getPublicKey(), text1); - System.out.println("加密前：" + RSAEncryptUtil.SRC); + System.out.println("加密前：" + RsaEncryptUtil.SRC); System.out.println("加密后：" + text1); System.out.println("解密后：" + text2); - if (RSAEncryptUtil.SRC.equals(text2)) { + if (RsaEncryptUtil.SRC.equals(text2)) { System.out.println("解密字符串和原始字符串一致，解密成功"); } else { System.out.println("解密字符串和原始字符串不一致，解密失败"); diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java index 8baf55ea..947eb41a 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/ScriptUtil.java @@ -50,7 +50,7 @@ public class ScriptUtil { ScriptContext newContext = new SimpleScriptContext(); if (compareObj != null) { Field[] fields = ReflectUtil.getFields(compareObj.getClass()); - Map filedNameValueMap = new HashMap<>(); + Map filedNameValueMap = new HashMap<>(3); Arrays.stream(fields).parallel().forEach(f -> filedNameValueMap.put(f.getName(), ReflectUtil.getFieldValue(compareObj, f))); Set> entries = filedNameValueMap.entrySet(); long count = entries.stream().filter(f -> f.getValue() != null).count(); @@ -64,12 +64,6 @@ public class ScriptUtil { }); newContext.setBindings(engineScope, ScriptContext.ENGINE_SCOPE); } -// if (script.contains(FUNCTION_TAG)) { -// // 由ScriptEngines实现的接口, 其方法允许调用以前已执行的脚本中的过程 -// Invocable inv = (Invocable) engine; -// // 调用全局函数, 并传入参数 -// inv.invokeFunction("hello", "测试"); -// } // 执行脚本, 注意这里指定新的执行作用域上下文 return engine.eval(script, newContext); } catch (ScriptException e) { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java index 03cc9f4a..f6d3fc75 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SecurityUtil.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java index d25fc285..389e1248 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/SqlUtil.java @@ -18,9 +18,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; -/** - * @author / - */ @Slf4j public class SqlUtil { /** diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketClientManager.java b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketClientManager.java index 5bae834b..ee389d83 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketClientManager.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketClientManager.java @@ -1,4 +1,5 @@ package cn.odboy.websocket.context; + import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java index 577e815e..348b5429 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/websocket/context/WebSocketServer.java @@ -3,16 +3,13 @@ package cn.odboy.websocket.context; import cn.odboy.websocket.dto.WebSocketMsgDto; import com.alibaba.fastjson2.JSON; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.websocket.*; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; import java.io.IOException; -import java.util.Map; import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; @Slf4j diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/dto/QuartzJobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/dto/QuartzJobQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java index 61197890..d3239ca2 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/dto/QuartzJobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/job/request/QuartzJobQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.job.dto; +package cn.odboy.model.job.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java new file mode 100644 index 00000000..7a3d8c14 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDeptRequest.java @@ -0,0 +1,21 @@ +package cn.odboy.model.system.request; + +import cn.odboy.base.MyObject; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +@EqualsAndHashCode(callSuper = false) +public class CreateDeptRequest extends MyObject { + @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-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java new file mode 100644 index 00000000..ad7a91c4 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictDetailRequest.java @@ -0,0 +1,22 @@ +package cn.odboy.model.system.request; + +import cn.odboy.base.MyObject; +import cn.odboy.model.system.domain.Dict; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +@EqualsAndHashCode(callSuper = false) +public class CreateDictDetailRequest extends MyObject { + @NotBlank(message = "参数dict必填") + private Dict dict; + @NotBlank(message = "字典标签必填") + private String label; + @NotBlank(message = "字典值必填") + private String value; + @NotNull(message = "字典排序必填") + private Integer dictSort; +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java new file mode 100644 index 00000000..66a21e11 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateDictRequest.java @@ -0,0 +1,15 @@ +package cn.odboy.model.system.request; + +import cn.odboy.base.MyObject; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; + +@Data +@EqualsAndHashCode(callSuper = false) +public class CreateDictRequest extends MyObject { + @NotBlank(message = "字典名称必填") + private String name; + private String description; +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java new file mode 100644 index 00000000..da2f7a8c --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateJobRequest.java @@ -0,0 +1,18 @@ +package cn.odboy.model.system.request; + +import cn.odboy.base.MyObject; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +@EqualsAndHashCode(callSuper = false) +public class CreateJobRequest extends MyObject { + @NotBlank(message = "职位名称必填") + private String name; + @NotNull(message = "职位排序必填") + private Integer jobSort; + private Boolean enabled; +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java new file mode 100644 index 00000000..628c2623 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/CreateRoleRequest.java @@ -0,0 +1,27 @@ +package cn.odboy.model.system.request; + +import cn.odboy.base.MyObject; +import cn.odboy.model.system.domain.Dept; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Set; + +@Data +@EqualsAndHashCode(callSuper = false) +public class CreateRoleRequest extends MyObject { + @NotBlank(message = "角色名称必填") + private String name; + @NotNull(message = "角色级别必填") + private Integer level; + @NotBlank(message = "数据范围必填") + private String dataScope; + private String description; + /** + * 关联的部门 + */ + private Long id; + private Set depts; +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DeptQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DeptQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java index 18f0717c..bb0deb37 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DeptQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DeptQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictDetailQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java similarity index 91% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictDetailQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java index 0c8b6eaa..c17b3388 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictDetailQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictDetailQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java similarity index 90% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java index e9270f73..67d731fe 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/DictQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/DictQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/JobQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java similarity index 94% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/JobQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java index 8c5bc48f..825aab9e 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/JobQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/JobQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java index 27e7001a..b3d835e8 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/MenuQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/RoleQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/RoleQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java index c6b50627..e76d9ca6 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/RoleQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/RoleQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserAuthDto.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java similarity index 87% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserAuthDto.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java index 375dee40..03ce05a5 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserAuthDto.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserLoginRequest.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; @Getter @Setter -public class UserAuthDto { +public class UserLoginRequest { @NotBlank @ApiModelProperty(value = "用户名") diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java similarity index 96% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java index f747284c..1f74de45 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/request/UserQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.request; import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuMetaVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java similarity index 92% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuMetaVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java index 6f2b2316..5a8f0bf5 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuMetaVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuMetaVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.response; import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java similarity index 95% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java index c2d61b87..3e61b318 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/MenuVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/MenuVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.response; import cn.odboy.base.MyObject; import io.swagger.annotations.ApiModelProperty; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java new file mode 100644 index 00000000..c308cfa5 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/SimpleUserVo.java @@ -0,0 +1,42 @@ +package cn.odboy.model.system.response; + +import cn.odboy.base.MyObject; +import cn.odboy.model.system.domain.Dept; +import cn.odboy.model.system.domain.Job; +import cn.odboy.model.system.domain.Role; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Set; + +@Data +@EqualsAndHashCode(callSuper = false) +public class SimpleUserVo extends MyObject { + @ApiModelProperty(value = "ID", hidden = true) + private Long id; + @ApiModelProperty(value = "用户角色") + private Set roles; + @ApiModelProperty(value = "用户岗位") + private Set jobs; + private Long deptId; + @TableField(exist = false) + private Dept 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-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java new file mode 100644 index 00000000..87ecf094 --- /dev/null +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserInfoVo.java @@ -0,0 +1,22 @@ +package cn.odboy.model.system.response; + +import cn.odboy.base.MyObject; +import cn.odboy.model.system.dto.RoleCodeDto; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Data +@EqualsAndHashCode(callSuper = false) +public class UserInfoVo extends MyObject { + private SimpleUserVo user; + private List dataScopes; + private List authorities; + + public Set getRoles() { + return authorities.stream().map(RoleCodeDto::getAuthority).collect(Collectors.toSet()); + } +} diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserPassVo.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java similarity index 87% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserPassVo.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java index 418bc14a..242f721a 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/dto/UserPassVo.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/system/response/UserPassVo.java @@ -1,4 +1,4 @@ -package cn.odboy.model.system.dto; +package cn.odboy.model.system.response; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/LocalStorageQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/LocalStorageQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java index 5002987e..c7831cd0 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/LocalStorageQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/LocalStorageQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.dto; +package cn.odboy.model.tools.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/QiniuQueryCriteria.java b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java similarity index 93% rename from cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/QiniuQueryCriteria.java rename to cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java index 7c67674d..180fea38 100644 --- a/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/dto/QiniuQueryCriteria.java +++ b/cutejava/cutejava-domain/src/main/java/cn/odboy/model/tools/request/QiniuQueryCriteria.java @@ -1,4 +1,4 @@ -package cn.odboy.model.tools.dto; +package cn.odboy.model.tools.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java index 94402992..04edb814 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzJobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.job.mapper; import cn.odboy.model.job.domain.QuartzJob; -import cn.odboy.model.job.dto.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QuartzJobQueryCriteria; 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-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java index c8083c58..3f76cd77 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/mapper/QuartzLogMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.job.mapper; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.dto.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QuartzJobQueryCriteria; 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-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java index 8ba2e512..9c2d7cd6 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/rest/QuartzJobController.java @@ -6,7 +6,7 @@ import cn.odboy.context.SpringBeanHolder; import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.dto.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QuartzJobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java index d04789bc..18695f30 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/QuartzJobService.java @@ -3,7 +3,7 @@ package cn.odboy.application.job.service; import cn.odboy.base.PageResult; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.dto.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QuartzJobQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java index 581cc2b0..47f29f45 100644 --- a/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java +++ b/cutejava/cutejava-job/src/main/java/cn/odboy/application/job/service/impl/QuartzJobServiceImpl.java @@ -10,7 +10,7 @@ import cn.odboy.base.PageResult; import cn.odboy.exception.BadRequestException; import cn.odboy.model.job.domain.QuartzJob; import cn.odboy.model.job.domain.QuartzLog; -import cn.odboy.model.job.dto.QuartzJobQueryCriteria; +import cn.odboy.model.job.request.QuartzJobQueryCriteria; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import cn.odboy.util.RedisUtil; diff --git a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/DESEncryptUtilTest.java b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/DesEncryptUtilTest.java similarity index 84% rename from cutejava/cutejava-starter/src/test/java/cn/odboy/util/DESEncryptUtilTest.java rename to cutejava/cutejava-starter/src/test/java/cn/odboy/util/DesEncryptUtilTest.java index c65b4e66..eabc2f27 100644 --- a/cutejava/cutejava-starter/src/test/java/cn/odboy/util/DESEncryptUtilTest.java +++ b/cutejava/cutejava-starter/src/test/java/cn/odboy/util/DesEncryptUtilTest.java @@ -3,11 +3,11 @@ package cn.odboy.util; import lombok.SneakyThrows; import org.junit.jupiter.api.Test; -import static cn.odboy.util.DESEncryptUtil.desDecrypt; -import static cn.odboy.util.DESEncryptUtil.desEncrypt; +import static cn.odboy.util.DesEncryptUtil.desDecrypt; +import static cn.odboy.util.DesEncryptUtil.desEncrypt; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DESEncryptUtilTest { +public class DesEncryptUtilTest { @SneakyThrows public static void main(String[] args) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/LoginProperties.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/LoginProperties.java index ffb60b05..7446531a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/LoginProperties.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/LoginProperties.java @@ -16,6 +16,4 @@ public class LoginProperties { * 账号单用户 登录 */ private boolean singleLogin = false; - - public static final String cacheKey = "user_login_cache:"; } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SecurityProperties.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SecurityProperties.java index 2ba56014..b7fdbc25 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SecurityProperties.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/config/SecurityProperties.java @@ -1,6 +1,5 @@ package cn.odboy.application.core.config; -import cn.odboy.util.SecurityUtil; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java index 1fd644b2..c1b2df9b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenFilter.java @@ -5,7 +5,6 @@ import cn.odboy.application.core.config.SecurityProperties; import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; import cn.odboy.constant.SystemConst; import cn.odboy.model.system.dto.UserOnlineDto; -import cn.odboy.util.SecurityUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java index 1816fed8..e1699e54 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/TokenProvider.java @@ -8,7 +8,6 @@ import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.dto.UserJwtDto; import cn.odboy.util.RedisUtil; -import cn.odboy.util.SecurityUtil; import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java index 01131f19..971e7f1f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/AuthController.java @@ -1,23 +1,24 @@ package cn.odboy.application.core.rest; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.odboy.annotation.AnonymousDeleteMapping; import cn.odboy.annotation.AnonymousGetMapping; import cn.odboy.annotation.AnonymousPostMapping; import cn.odboy.application.core.config.CaptchaConfig; import cn.odboy.application.core.config.LoginProperties; -import cn.odboy.application.core.config.SecurityProperties; import cn.odboy.application.core.constant.LoginCodeEnum; import cn.odboy.application.core.context.TokenProvider; -import cn.odboy.application.core.context.UserDetailsHelper; +import cn.odboy.application.core.service.impl.UserDetailsServiceImpl; import cn.odboy.application.core.service.impl.UserOnlineServiceImpl; import cn.odboy.constant.SystemConst; import cn.odboy.constant.SystemRedisKey; import cn.odboy.exception.BadRequestException; -import cn.odboy.model.system.dto.UserAuthDto; +import cn.odboy.model.system.response.UserInfoVo; import cn.odboy.model.system.dto.UserJwtDto; +import cn.odboy.model.system.request.UserLoginRequest; import cn.odboy.properties.RsaProperties; -import cn.odboy.util.RSAEncryptUtil; +import cn.odboy.util.RsaEncryptUtil; import cn.odboy.util.RedisUtil; import cn.odboy.util.SecurityUtil; import cn.odboy.util.StringUtil; @@ -31,7 +32,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -53,32 +53,31 @@ import java.util.concurrent.TimeUnit; @RequiredArgsConstructor @Api(tags = "系统：系统授权接口") public class AuthController { - private final SecurityProperties properties; private final RedisUtil redisUtil; private final UserOnlineServiceImpl onlineUserService; private final TokenProvider tokenProvider; private final CaptchaConfig captchaConfig; private final LoginProperties loginProperties; private final PasswordEncoder passwordEncoder; - private final UserDetailsHelper userDetailsService; + private final UserDetailsServiceImpl userDetailsService; @ApiOperation("登录授权") @AnonymousPostMapping(value = "/login") - public ResponseEntity login(@Validated @RequestBody UserAuthDto authUser, HttpServletRequest request) throws Exception { + public ResponseEntity login(@Validated @RequestBody UserLoginRequest loginRequest, HttpServletRequest request) throws Exception { // 密码解密 - String password = RSAEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); + String password = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, loginRequest.getPassword()); // 查询验证码 - String code = redisUtil.get(authUser.getUuid(), String.class); + String code = redisUtil.get(loginRequest.getUuid(), String.class); // 清除验证码 - redisUtil.del(authUser.getUuid()); + redisUtil.del(loginRequest.getUuid()); if (StringUtil.isBlank(code)) { throw new BadRequestException("验证码不存在或已过期"); } - if (StringUtil.isBlank(authUser.getCode()) || !authUser.getCode().equalsIgnoreCase(code)) { + if (StringUtil.isBlank(loginRequest.getCode()) || !loginRequest.getCode().equalsIgnoreCase(code)) { throw new BadRequestException("验证码错误"); } // 获取用户信息 - UserJwtDto jwtUser = userDetailsService.loadUserByUsername(authUser.getUsername()); + UserJwtDto jwtUser = userDetailsService.loadUserByUsername(loginRequest.getUsername()); // 验证用户密码 if (!passwordEncoder.matches(password, jwtUser.getPassword())) { throw new BadRequestException("登录密码错误"); @@ -90,11 +89,11 @@ public class AuthController { // 返回 token 与 用户信息 Map authInfo = new HashMap<>(2) {{ put("token", String.format("%s %s", SystemConst.TOKEN_PREFIX, token)); - put("user", jwtUser); + put("user", BeanUtil.copyProperties(jwtUser, UserInfoVo.class)); }}; if (loginProperties.isSingleLogin()) { // 踢掉之前已经登录的token - onlineUserService.kickOutByUsername(authUser.getUsername()); + onlineUserService.kickOutByUsername(loginRequest.getUsername()); } // 保存在线信息 onlineUserService.save(jwtUser, token, request); @@ -104,9 +103,10 @@ public class AuthController { @ApiOperation("获取用户信息") @GetMapping(value = "/info") - public ResponseEntity getUserInfo() { + public ResponseEntity getUserInfo() { UserJwtDto jwtUser = (UserJwtDto) SecurityUtil.getCurrentUser(); - return ResponseEntity.ok(jwtUser); + UserInfoVo userInfoVo = BeanUtil.copyProperties(jwtUser, UserInfoVo.class); + return ResponseEntity.ok(userInfoVo); } @ApiOperation("获取验证码") @@ -117,7 +117,7 @@ public class AuthController { String uuid = SystemRedisKey.CAPTCHA_LOGIN + IdUtil.simpleUUID(); //当验证码类型为 arithmetic时且长度 >= 2 时，captcha.text()的结果有几率为浮点型 String captchaValue = captcha.text(); - if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(".")) { + if (captcha.getCharType() - 1 == LoginCodeEnum.ARITHMETIC.ordinal() && captchaValue.contains(SystemConst.SYMBOL_DOT)) { captchaValue = captchaValue.split("\\.")[0]; } // 保存 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java index dc33b80d..8a58ccbc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/rest/OnlineController.java @@ -3,7 +3,7 @@ package cn.odboy.application.core.rest; import cn.odboy.application.core.service.UserOnlineService; import cn.odboy.base.PageResult; import cn.odboy.model.system.dto.UserOnlineDto; -import cn.odboy.util.DESEncryptUtil; +import cn.odboy.util.DesEncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -45,7 +45,7 @@ public class OnlineController { public ResponseEntity deleteOnlineUser(@RequestBody Set keys) throws Exception { for (String token : keys) { // 解密Key - token = DESEncryptUtil.desDecrypt(token); + token = DesEncryptUtil.desDecrypt(token); userOnlineService.logoutByToken(token); } return new ResponseEntity<>(HttpStatus.OK); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java index 646a6ff3..fd8dcb10 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserCacheServiceImpl.java @@ -1,8 +1,8 @@ package cn.odboy.application.core.service.impl; import cn.hutool.core.util.RandomUtil; -import cn.odboy.application.core.config.LoginProperties; import cn.odboy.application.core.service.UserCacheService; +import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.dto.UserJwtDto; import cn.odboy.util.RedisUtil; import cn.odboy.util.StringUtil; @@ -24,7 +24,7 @@ public class UserCacheServiceImpl implements UserCacheService { username = StringUtil.lowerCase(username); if (StringUtil.isNotEmpty(username)) { // 获取数据 - return redisUtil.get(LoginProperties.cacheKey + username, UserJwtDto.class); + return redisUtil.get(SystemRedisKey.USER_INFO + username, UserJwtDto.class); } return null; } @@ -37,7 +37,7 @@ public class UserCacheServiceImpl implements UserCacheService { if (StringUtil.isNotEmpty(userName)) { // 添加数据, 避免数据同时过期（2小时左右） long time = 7200 + RandomUtil.randomInt(900, 1800); - redisUtil.set(LoginProperties.cacheKey + userName, user, time); + redisUtil.set(SystemRedisKey.USER_INFO + userName, user, time); } } @@ -48,7 +48,7 @@ public class UserCacheServiceImpl implements UserCacheService { userName = StringUtil.lowerCase(userName); if (StringUtil.isNotEmpty(userName)) { // 清除数据 - redisUtil.del(LoginProperties.cacheKey + userName); + redisUtil.del(SystemRedisKey.USER_INFO + userName); } } } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/UserDetailsHelper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java similarity index 94% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/UserDetailsHelper.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java index 0cdcf6c1..1cf8b173 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/context/UserDetailsHelper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.odboy.application.core.context; +package cn.odboy.application.core.service.impl; import cn.odboy.application.core.service.UserCacheService; import cn.odboy.application.system.service.DataService; @@ -18,7 +18,7 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service("userDetailsService") -public class UserDetailsHelper implements UserDetailsService { +public class UserDetailsServiceImpl implements UserDetailsService { private final UserService userService; private final RoleService roleService; private final DataService dataService; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java index 3064994e..fc438d60 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/core/service/impl/UserOnlineServiceImpl.java @@ -34,7 +34,7 @@ public class UserOnlineServiceImpl implements UserOnlineService { String ip = BrowserUtil.getIp(request); String id = tokenProvider.getId(token); String version = BrowserUtil.getVersion(request); - String address = IPUtil.getCityInfo(ip); + String address = IpUtil.getCityInfo(ip); UserOnlineDto userOnlineDto = null; try { userOnlineDto = new UserOnlineDto(); @@ -45,7 +45,7 @@ public class UserOnlineServiceImpl implements UserOnlineService { userOnlineDto.setBrowser(version); userOnlineDto.setIp(ip); userOnlineDto.setAddress(address); - userOnlineDto.setKey(DESEncryptUtil.desEncrypt(token)); + userOnlineDto.setKey(DesEncryptUtil.desEncrypt(token)); userOnlineDto.setLoginTime(new Date()); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java index 767aec6a..9b337e8b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DeptMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.dto.DeptQueryCriteria; +import cn.odboy.model.system.request.DeptQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java index 97745ee5..ff32baf0 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.dto.DictDetailQueryCriteria; +import cn.odboy.model.system.request.DictDetailQueryCriteria; 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-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java index 995b3d37..3784d254 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.dto.DictQueryCriteria; +import cn.odboy.model.system.request.DictQueryCriteria; 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-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java index 6d969e88..1083e2d7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/JobMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.dto.JobQueryCriteria; +import cn.odboy.model.system.request.JobQueryCriteria; 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-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java index f5c70653..abb3f154 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/MenuMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.dto.MenuQueryCriteria; +import cn.odboy.model.system.request.MenuQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,7 +25,7 @@ public interface MenuMapper extends BaseMapper { Menu getMenuByComponentName(@Param("name") String name); - int getMenuCountByPid(@Param("pid") Long pid); + Integer getMenuCountByPid(@Param("pid") Long pid); void updateSubCntById(@Param("count") int count, @Param("menuId") Long menuId); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java index c721e577..bf0189f5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/RoleMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.dto.RoleQueryCriteria; +import cn.odboy.model.system.request.RoleQueryCriteria; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java index c5787a7f..481cf918 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.mapper; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.UserQueryCriteria; +import cn.odboy.model.system.request.UserQueryCriteria; 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-system/src/main/java/cn/odboy/application/system/rest/VerifyController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java similarity index 64% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/VerifyController.java rename to cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java index 9a555ea8..73854d9c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/VerifyController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/CaptchaController.java @@ -1,10 +1,9 @@ package cn.odboy.application.system.rest; -import cn.odboy.application.system.service.VerifyService; +import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.application.tools.service.EmailService; import cn.odboy.constant.CodeBiEnum; import cn.odboy.constant.CodeEnum; -import cn.odboy.model.tools.dto.EmailDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -14,29 +13,30 @@ import org.springframework.web.bind.annotation.*; import java.util.Objects; - @RestController @RequiredArgsConstructor @RequestMapping("/api/code") @Api(tags = "系统：验证码管理") -public class VerifyController { - - private final VerifyService verificationCodeService; +public class CaptchaController { + private final CaptchaService captchaService; private final EmailService emailService; - @PostMapping(value = "/resetEmail") + /** + * 除了这个其他的接口都没有用上 + * + * @param email 邮件地址 + */ + @PostMapping(value = "/sendCaptcha") @ApiOperation("重置邮箱，发送验证码") public ResponseEntity resetEmail(@RequestParam String email) { - EmailDto emailDto = verificationCodeService.sendEmailCode(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey()); - emailService.sendEmail(emailDto); + emailService.sendCaptcha(email, CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey()); return new ResponseEntity<>(HttpStatus.OK); } - @PostMapping(value = "/email/resetPass") + @PostMapping(value = "/resetPass") @ApiOperation("重置密码，发送验证码") public ResponseEntity resetPass(@RequestParam String email) { - EmailDto emailDto = verificationCodeService.sendEmailCode(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey()); - emailService.sendEmail(emailDto); + emailService.sendCaptcha(email, CodeEnum.EMAIL_RESET_PWD_CODE.getKey()); return new ResponseEntity<>(HttpStatus.OK); } @@ -46,10 +46,10 @@ public class VerifyController { CodeBiEnum biEnum = CodeBiEnum.find(codeBi); switch (Objects.requireNonNull(biEnum)) { case ONE: - verificationCodeService.validateEmailCode(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey(), email, code); + captchaService.checkCode(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey(), email, code); break; case TWO: - verificationCodeService.validateEmailCode(CodeEnum.EMAIL_RESET_PWD_CODE.getKey(), email, code); + captchaService.checkCode(CodeEnum.EMAIL_RESET_PWD_CODE.getKey(), email, code); break; default: break; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java index 184b1a97..cea02c6a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DeptController.java @@ -2,9 +2,9 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DeptService; import cn.odboy.base.PageResult; -import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.dto.DeptQueryCriteria; +import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.CreateDeptRequest; import cn.odboy.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,9 +24,7 @@ import java.util.stream.Collectors; @Api(tags = "系统：部门管理") @RequestMapping("/api/dept") public class DeptController { - private final DeptService deptService; - private static final String ENTITY_NAME = "dept"; @ApiOperation("导出部门数据") @GetMapping(value = "/download") @@ -68,10 +66,7 @@ public class DeptController { @ApiOperation("新增部门") @PostMapping @PreAuthorize("@el.check('dept:add')") - public ResponseEntity createDept(@Validated @RequestBody Dept resources) { - if (resources.getId() != null) { - throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); - } + public ResponseEntity createDept(@Validated @RequestBody CreateDeptRequest resources) { deptService.createDept(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java index 8ca61e07..92e03160 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictController.java @@ -2,9 +2,9 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DictService; import cn.odboy.base.PageResult; -import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.dto.DictQueryCriteria; +import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.CreateDictRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,9 +25,7 @@ import java.util.Set; @Api(tags = "系统：字典管理") @RequestMapping("/api/dict") public class DictController { - private final DictService dictService; - private static final String ENTITY_NAME = "dict"; @ApiOperation("导出字典数据") @GetMapping(value = "/download") @@ -54,10 +52,7 @@ public class DictController { @ApiOperation("新增字典") @PostMapping @PreAuthorize("@el.check('dict:add')") - public ResponseEntity createDict(@Validated @RequestBody Dict resources) { - if (resources.getId() != null) { - throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); - } + public ResponseEntity createDict(@Validated @RequestBody CreateDictRequest resources) { dictService.saveDict(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java index 3045bb70..39f0c589 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/DictDetailController.java @@ -2,9 +2,9 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.DictDetailService; import cn.odboy.base.PageResult; -import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.dto.DictDetailQueryCriteria; +import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.CreateDictDetailRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,9 +24,7 @@ import java.util.Map; @Api(tags = "系统：字典详情管理") @RequestMapping("/api/dictDetail") public class DictDetailController { - private final DictDetailService dictDetailService; - private static final String ENTITY_NAME = "dictDetail"; @ApiOperation("查询字典详情") @GetMapping @@ -49,10 +47,7 @@ public class DictDetailController { @ApiOperation("新增字典详情") @PostMapping @PreAuthorize("@el.check('dict:add')") - public ResponseEntity createDictDetail(@Validated @RequestBody DictDetail resources) { - if (resources.getId() != null) { - throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); - } + public ResponseEntity createDictDetail(@Validated @RequestBody CreateDictDetailRequest resources) { dictDetailService.saveDictDetail(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java index 07deba0d..e3e94c8c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/JobController.java @@ -2,9 +2,9 @@ package cn.odboy.application.system.rest; import cn.odboy.application.system.service.JobService; import cn.odboy.base.PageResult; -import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.dto.JobQueryCriteria; +import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.CreateJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,9 +25,7 @@ import java.util.Set; @Api(tags = "系统：岗位管理") @RequestMapping("/api/job") public class JobController { - private final JobService jobService; - private static final String ENTITY_NAME = "job"; @ApiOperation("导出岗位数据") @GetMapping(value = "/download") @@ -47,11 +45,8 @@ public class JobController { @ApiOperation("新增岗位") @PostMapping @PreAuthorize("@el.check('job:add')") - public ResponseEntity createJob(@Validated @RequestBody Job resources) { - if (resources.getId() != null) { - throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); - } - jobService.saveJob(resources); + public ResponseEntity createJob(@Validated @RequestBody CreateJobRequest resources) { + jobService.createJob(resources); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java index 6fd7f709..344cf3af 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/MenuController.java @@ -5,8 +5,8 @@ import cn.odboy.application.system.service.MenuService; import cn.odboy.base.PageResult; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.dto.MenuQueryCriteria; -import cn.odboy.model.system.dto.MenuVo; +import cn.odboy.model.system.request.MenuQueryCriteria; +import cn.odboy.model.system.response.MenuVo; import cn.odboy.util.PageUtil; import cn.odboy.util.SecurityUtil; import io.swagger.annotations.Api; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java index c08938cb..97788089 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/RoleController.java @@ -5,7 +5,8 @@ import cn.odboy.application.system.service.RoleService; import cn.odboy.base.PageResult; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Role; -import cn.odboy.model.system.dto.RoleQueryCriteria; +import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.CreateRoleRequest; import cn.odboy.util.SecurityUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -30,11 +31,8 @@ import java.util.stream.Collectors; @Api(tags = "系统：角色管理") @RequestMapping("/api/roles") public class RoleController { - private final RoleService roleService; - private static final String ENTITY_NAME = "role"; - @ApiOperation("获取单个role") @GetMapping(value = "/{id}") @PreAuthorize("@el.check('roles:list')") @@ -73,10 +71,7 @@ public class RoleController { @ApiOperation("新增角色") @PostMapping @PreAuthorize("@el.check('roles:add')") - public ResponseEntity createRole(@Validated @RequestBody Role resources) { - if (resources.getId() != null) { - throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID"); - } + public ResponseEntity createRole(@Validated @RequestBody CreateRoleRequest resources) { getLevels(resources.getLevel()); roleService.createRole(resources); return new ResponseEntity<>(HttpStatus.CREATED); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java index f3ed16d4..f8b71386 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/rest/UserController.java @@ -1,19 +1,25 @@ package cn.odboy.application.system.rest; import cn.hutool.core.collection.CollectionUtil; -import cn.odboy.application.system.service.*; +import cn.odboy.application.system.service.DataService; +import cn.odboy.application.system.service.DeptService; +import cn.odboy.application.system.service.RoleService; +import cn.odboy.application.system.service.UserService; +import cn.odboy.application.tools.service.CaptchaService; +import cn.odboy.base.MyMetaOption; import cn.odboy.base.PageResult; import cn.odboy.constant.CodeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.UserPassVo; -import cn.odboy.model.system.dto.UserQueryCriteria; +import cn.odboy.model.system.response.UserPassVo; +import cn.odboy.model.system.request.UserQueryCriteria; import cn.odboy.properties.RsaProperties; import cn.odboy.util.PageUtil; -import cn.odboy.util.RSAEncryptUtil; +import cn.odboy.util.RsaEncryptUtil; import cn.odboy.util.SecurityUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,9 +36,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Api(tags = "系统：用户管理") @@ -40,13 +44,12 @@ import java.util.stream.Collectors; @RequestMapping("/api/users") @RequiredArgsConstructor public class UserController { - private final PasswordEncoder passwordEncoder; private final UserService userService; private final DataService dataService; private final DeptService deptService; private final RoleService roleService; - private final VerifyService verificationCodeService; + private final CaptchaService verificationCodeService; @ApiOperation("导出用户数据") @GetMapping(value = "/download") @@ -132,8 +135,8 @@ public class UserController { @ApiOperation("修改密码") @PostMapping(value = "/updatePass") public ResponseEntity updateUserPassword(@RequestBody UserPassVo passVo) throws Exception { - String oldPass = RSAEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass()); - String newPass = RSAEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass()); + String oldPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getOldPass()); + String newPass = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, passVo.getNewPass()); User user = userService.getUserByUsername(SecurityUtil.getCurrentUsername()); if (!passwordEncoder.matches(oldPass, user.getPassword())) { throw new BadRequestException("修改失败，旧密码错误"); @@ -162,12 +165,12 @@ public class UserController { @ApiOperation("修改邮箱") @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateUserEmail(@PathVariable String code, @RequestBody User resources) throws Exception { - String password = RSAEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, resources.getPassword()); + String password = RsaEncryptUtil.decryptByPrivateKey(RsaProperties.privateKey, resources.getPassword()); User user = userService.getUserByUsername(SecurityUtil.getCurrentUsername()); if (!passwordEncoder.matches(password, user.getPassword())) { throw new BadRequestException("密码错误"); } - verificationCodeService.validateEmailCode(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey(), resources.getEmail(), code); + verificationCodeService.checkCode(CodeEnum.EMAIL_RESET_EMAIL_CODE.getKey(), resources.getEmail(), code); userService.updateEmailByUsername(user.getUsername(), resources.getEmail()); return new ResponseEntity<>(HttpStatus.OK); } @@ -184,4 +187,33 @@ public class UserController { throw new BadRequestException("角色权限不足"); } } + + @ApiOperation("查询用户基础数据") + @PostMapping(value = "/queryUserMetaPage") + @PreAuthorize("@el.check('user:list')") + public ResponseEntity> queryUserMetaPage(@Validated @RequestBody UserQueryCriteria criteria) { + int maxPageSize = 50; + return new ResponseEntity<>(userService.page(new Page<>(criteria.getPage(), maxPageSize), new LambdaQueryWrapper() + .and(c -> { + c.eq(User::getPhone, criteria.getBlurry()); + c.or(); + c.eq(User::getEmail, criteria.getBlurry()); + c.or(); + c.like(User::getUsername, criteria.getBlurry()); + c.or(); + c.like(User::getNickName, criteria.getBlurry()); + }) + ).getRecords().stream().map(m -> { + Map ext = new HashMap<>(1); + ext.put("id", m.getId()); + ext.put("deptId", m.getDeptId()); + ext.put("email", m.getEmail()); + ext.put("phone", m.getPhone()); + return MyMetaOption.builder() + .label(m.getNickName()) + .value(m.getUsername()) + .ext(ext) + .build(); + }).collect(Collectors.toList()), HttpStatus.OK); + } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java index 15f5fa73..03a6f510 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DeptService.java @@ -2,13 +2,13 @@ package cn.odboy.application.system.service; import cn.odboy.base.BaseResult; import cn.odboy.model.system.domain.Dept; -import cn.odboy.model.system.dto.DeptQueryCriteria; +import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.CreateDeptRequest; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Map; import java.util.Set; public interface DeptService extends IService { @@ -36,7 +36,7 @@ public interface DeptService extends IService { * * @param resources / */ - void createDept(Dept resources); + void createDept(CreateDeptRequest resources); /** * 编辑 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java index 902db6d0..0329212c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictDetailService.java @@ -2,7 +2,8 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.dto.DictDetailQueryCriteria; +import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.CreateDictDetailRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,7 +17,7 @@ public interface DictDetailService extends IService { * * @param resources / */ - void saveDictDetail(DictDetail resources); + void saveDictDetail(CreateDictDetailRequest resources); /** * 编辑 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java index afe54678..20aa831e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/DictService.java @@ -2,7 +2,8 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Dict; -import cn.odboy.model.system.dto.DictQueryCriteria; +import cn.odboy.model.system.request.DictQueryCriteria; +import cn.odboy.model.system.request.CreateDictRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -36,7 +37,7 @@ public interface DictService extends IService { * * @param resources / */ - void saveDict(Dict resources); + void saveDict(CreateDictRequest resources); /** * 编辑 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java index e9a260b0..f358e2bc 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/JobService.java @@ -2,7 +2,8 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.dto.JobQueryCriteria; +import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.CreateJobRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -27,7 +28,7 @@ public interface JobService extends IService { * * @param resources / */ - void saveJob(Job resources); + void createJob(CreateJobRequest resources); /** * 编辑 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java index de8c8b8d..0a064999 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/MenuService.java @@ -1,8 +1,8 @@ package cn.odboy.application.system.service; import cn.odboy.model.system.domain.Menu; -import cn.odboy.model.system.dto.MenuQueryCriteria; -import cn.odboy.model.system.dto.MenuVo; +import cn.odboy.model.system.request.MenuQueryCriteria; +import cn.odboy.model.system.response.MenuVo; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletResponse; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java index b084c359..8945514f 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/RoleService.java @@ -4,7 +4,8 @@ import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; -import cn.odboy.model.system.dto.RoleQueryCriteria; +import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.CreateRoleRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -53,7 +54,7 @@ public interface RoleService extends IService { * * @param resources / */ - void createRole(Role resources); + void createRole(CreateRoleRequest resources); /** * 编辑 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java index cbbb2013..b0521a1c 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/UserService.java @@ -2,7 +2,7 @@ package cn.odboy.application.system.service; import cn.odboy.base.PageResult; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.UserQueryCriteria; +import cn.odboy.model.system.request.UserQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java index 9067ceeb..24685e05 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DataServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.odboy.application.system.service.DataService; import cn.odboy.application.system.service.DeptService; import cn.odboy.application.system.service.RoleService; -import cn.odboy.constant.SystemRedisKey; import cn.odboy.constant.DataScopeEnum; +import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java index 4185c147..5bf2ba93 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java @@ -1,5 +1,6 @@ package cn.odboy.application.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,12 +9,13 @@ import cn.odboy.application.system.mapper.RoleMapper; import cn.odboy.application.system.mapper.UserMapper; import cn.odboy.application.system.service.DeptService; import cn.odboy.base.BaseResult; -import cn.odboy.constant.SystemRedisKey; import cn.odboy.constant.DataScopeEnum; +import cn.odboy.constant.SystemRedisKey; import cn.odboy.exception.BadRequestException; import cn.odboy.model.system.domain.Dept; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.DeptQueryCriteria; +import cn.odboy.model.system.request.DeptQueryCriteria; +import cn.odboy.model.system.request.CreateDeptRequest; import cn.odboy.util.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; @@ -93,8 +95,8 @@ public class DeptServiceImpl extends ServiceImpl implements De @Override @Transactional(rollbackFor = Exception.class) - public void createDept(Dept resources) { - save(resources); + public void createDept(CreateDeptRequest resources) { + save(BeanUtil.copyProperties(resources, Dept.class)); // 清理缓存 updateSubCnt(resources.getPid()); // 清理自定义角色权限的DataScope缓存 diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java index bd2a4d19..0df2e0ff 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java @@ -1,5 +1,6 @@ package cn.odboy.application.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.odboy.application.system.mapper.DictDetailMapper; import cn.odboy.application.system.mapper.DictMapper; @@ -8,7 +9,8 @@ import cn.odboy.base.PageResult; import cn.odboy.constant.SystemRedisKey; import cn.odboy.model.system.domain.Dict; import cn.odboy.model.system.domain.DictDetail; -import cn.odboy.model.system.dto.DictDetailQueryCriteria; +import cn.odboy.model.system.request.DictDetailQueryCriteria; +import cn.odboy.model.system.request.CreateDictDetailRequest; import cn.odboy.util.PageUtil; import cn.odboy.util.RedisUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -34,11 +36,12 @@ public class DictDetailServiceImpl extends ServiceImpl implements Di @Override @Transactional(rollbackFor = Exception.class) - public void saveDict(Dict resources) { - save(resources); + public void saveDict(CreateDictRequest resources) { + save(BeanUtil.copyProperties(resources, Dict.class)); } @Override diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java index 59cc35bc..c185d4f1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java @@ -1,5 +1,6 @@ package cn.odboy.application.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.odboy.application.system.mapper.JobMapper; import cn.odboy.application.system.mapper.UserMapper; import cn.odboy.application.system.service.JobService; @@ -8,7 +9,8 @@ import cn.odboy.constant.SystemRedisKey; import cn.odboy.exception.BadRequestException; import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; -import cn.odboy.model.system.dto.JobQueryCriteria; +import cn.odboy.model.system.request.JobQueryCriteria; +import cn.odboy.model.system.request.CreateJobRequest; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import cn.odboy.util.RedisUtil; @@ -53,12 +55,12 @@ public class JobServiceImpl extends ServiceImpl implements JobSe @Override @Transactional(rollbackFor = Exception.class) - public void saveJob(Job resources) { + public void createJob(CreateJobRequest resources) { Job job = jobMapper.getJobByName(resources.getName()); if (job != null) { throw new EntityExistException(Job.class, "name", resources.getName()); } - save(resources); + save(BeanUtil.copyProperties(resources, Job.class)); } @Override diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java index aa937c5b..835487e5 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java @@ -15,9 +15,9 @@ import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.MenuMetaVo; -import cn.odboy.model.system.dto.MenuQueryCriteria; -import cn.odboy.model.system.dto.MenuVo; +import cn.odboy.model.system.response.MenuMetaVo; +import cn.odboy.model.system.request.MenuQueryCriteria; +import cn.odboy.model.system.response.MenuVo; import cn.odboy.util.ClassUtil; import cn.odboy.util.FileUtil; import cn.odboy.util.RedisUtil; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java index 7add4fe9..cdf21ee9 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MonitorServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.odboy.application.system.service.MonitorService; import cn.odboy.constant.SystemConst; import cn.odboy.util.FileUtil; -import cn.odboy.util.IPUtil; +import cn.odboy.util.IpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import oshi.SystemInfo; @@ -178,7 +178,7 @@ public class MonitorServiceImpl implements MonitorService { // 系统信息 systemInfo.put("os", os.toString()); systemInfo.put("day", formatBetween); - systemInfo.put("ip", IPUtil.getLocalIp()); + systemInfo.put("ip", IpUtil.getLocalIp()); return systemInfo; } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java index 65474174..e40722a2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java @@ -1,5 +1,6 @@ package cn.odboy.application.system.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.odboy.application.core.service.UserCacheService; @@ -16,7 +17,8 @@ import cn.odboy.model.system.domain.Menu; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; import cn.odboy.model.system.dto.RoleCodeDto; -import cn.odboy.model.system.dto.RoleQueryCriteria; +import cn.odboy.model.system.request.RoleQueryCriteria; +import cn.odboy.model.system.request.CreateRoleRequest; import cn.odboy.util.FileUtil; import cn.odboy.util.PageUtil; import cn.odboy.util.RedisUtil; @@ -74,11 +76,11 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override @Transactional(rollbackFor = Exception.class) - public void createRole(Role resources) { + public void createRole(CreateRoleRequest resources) { if (roleMapper.getRoleByName(resources.getName()) != null) { - throw new EntityExistException(Role.class, "username", resources.getName()); + throw new EntityExistException(Role.class, "name", resources.getName()); } - save(resources); + save(BeanUtil.copyProperties(resources, Role.class)); // 判断是否有部门数据，若有，则需创建关联 if (CollectionUtil.isNotEmpty(resources.getDepts())) { roleDeptMapper.insertBatchByRoleId(resources.getId(), resources.getDepts()); @@ -91,7 +93,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro Role role = getById(resources.getId()); Role role1 = roleMapper.getRoleByName(resources.getName()); if (role1 != null && !role1.getId().equals(role.getId())) { - throw new EntityExistException(Role.class, "username", resources.getName()); + throw new EntityExistException(Role.class, "name", resources.getName()); } role.setName(resources.getName()); role.setDescription(resources.getDescription()); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java index a483edb4..0fb4f33d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java @@ -1,7 +1,7 @@ package cn.odboy.application.system.service.impl; -import cn.odboy.application.core.service.UserOnlineService; import cn.odboy.application.core.service.UserCacheService; +import cn.odboy.application.core.service.UserOnlineService; import cn.odboy.application.system.mapper.UserJobMapper; import cn.odboy.application.system.mapper.UserMapper; import cn.odboy.application.system.mapper.UserRoleMapper; @@ -13,7 +13,7 @@ import cn.odboy.exception.EntityExistException; import cn.odboy.model.system.domain.Job; import cn.odboy.model.system.domain.Role; import cn.odboy.model.system.domain.User; -import cn.odboy.model.system.dto.UserQueryCriteria; +import cn.odboy.model.system.request.UserQueryCriteria; import cn.odboy.properties.FileProperties; import cn.odboy.util.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml index d3c022e4..435c2530 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/MenuMapper.xml @@ -111,11 +111,11 @@ FROM sys_menu WHERE name = #{name} - + update sys_menu set sub_count = #{count} diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java index 21919350..88a8de24 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/LocalStorageMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.mapper; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.dto.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.LocalStorageQueryCriteria; 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-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java index d46c2daf..993fb55e 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/mapper/QiniuContentMapper.java @@ -1,7 +1,7 @@ package cn.odboy.application.tools.mapper; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.dto.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QiniuQueryCriteria; 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-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java index f33ef0ec..1fe99f6a 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/LocalStorageController.java @@ -5,7 +5,7 @@ import cn.odboy.base.PageResult; import cn.odboy.constant.FileTypeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.dto.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.LocalStorageQueryCriteria; import cn.odboy.util.FileUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -26,7 +26,6 @@ import java.io.IOException; @Api(tags = "工具：本地存储管理") @RequestMapping("/api/localStorage") public class LocalStorageController { - private final LocalStorageService localStorageService; @GetMapping diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java index ca208ec1..f3f2f54c 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/rest/QiniuController.java @@ -5,7 +5,7 @@ import cn.odboy.application.tools.service.QiniuContentService; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.QiniuConfig; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.dto.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QiniuQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,7 +31,6 @@ import java.util.Map; @RequestMapping("/api/qiNiuContent") @Api(tags = "工具：七牛云存储管理") public class QiniuController { - private final QiniuContentService qiniuContentService; private final QiNiuConfigService qiNiuConfigService; @@ -90,7 +89,7 @@ public class QiniuController { @ApiOperation("删除文件") @DeleteMapping(value = "/{id}") public ResponseEntity deleteQiNiu(@PathVariable Long id) { - qiniuContentService.delete(qiniuContentService.getById(id)); + qiniuContentService.deleteFileById(id); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/VerifyService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java similarity index 54% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/VerifyService.java rename to cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java index f3d3add1..0494d336 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/VerifyService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/CaptchaService.java @@ -1,9 +1,9 @@ -package cn.odboy.application.system.service; +package cn.odboy.application.tools.service; import cn.odboy.model.tools.dto.EmailDto; -public interface VerifyService { +public interface CaptchaService { /** * 发送验证码 * @@ -11,7 +11,7 @@ public interface VerifyService { * @param key / * @return / */ - EmailDto sendEmailCode(String email, String key); + EmailDto renderCode(String email, String key); /** @@ -20,5 +20,5 @@ public interface VerifyService { * @param code / * @param key / */ - void validateEmailCode(String key, String email, String code); + void checkCode(String key, String email, String code); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java index 741a3183..d20c802f 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/EmailService.java @@ -29,4 +29,12 @@ public interface EmailService extends IService { * @param emailDto 邮件发送的内容 */ void sendEmail(EmailDto emailDto); + + /** + * 发送邮件验证码 + * + * @param email 邮箱地址 + * @param key 类型 + */ + void sendCaptcha(String email, String key); } diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java index c3446db3..dba343e2 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/LocalStorageService.java @@ -2,7 +2,7 @@ package cn.odboy.application.tools.service; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.LocalStorage; -import cn.odboy.model.tools.dto.LocalStorageQueryCriteria; +import cn.odboy.model.tools.request.LocalStorageQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java index 304f4531..7c651d36 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/QiniuContentService.java @@ -2,7 +2,7 @@ package cn.odboy.application.tools.service; import cn.odboy.base.PageResult; import cn.odboy.model.tools.domain.QiniuContent; -import cn.odboy.model.tools.dto.QiniuQueryCriteria; +import cn.odboy.model.tools.request.QiniuQueryCriteria; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.multipart.MultipartFile; @@ -47,13 +47,6 @@ public interface QiniuContentService extends IService { */ String download(QiniuContent content); - /** - * 删除文件 - * - * @param content 文件 - */ - void delete(QiniuContent content); - /** * 同步数据 */ @@ -74,4 +67,11 @@ public interface QiniuContentService extends IService { * @throws IOException / */ void downloadExcel(List queryAll, HttpServletResponse response) throws IOException; + + /** + * 删除文件 + * + * @param id 文件id + */ + void deleteFileById(Long id); } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/VerifyServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java similarity index 87% rename from cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/VerifyServiceImpl.java rename to cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java index b7c9a3d7..c07d1c12 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/VerifyServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/CaptchaServiceImpl.java @@ -1,4 +1,4 @@ -package cn.odboy.application.system.service.impl; +package cn.odboy.application.tools.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -6,7 +6,7 @@ import cn.hutool.extra.template.Template; import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; -import cn.odboy.application.system.service.VerifyService; +import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.dto.EmailDto; import cn.odboy.util.RedisUtil; @@ -19,15 +19,14 @@ import java.util.Collections; @Service @RequiredArgsConstructor -public class VerifyServiceImpl implements VerifyService { +public class CaptchaServiceImpl implements CaptchaService { private final RedisUtil redisUtil; - @Value("${code.expiration}") private Long expiration; @Override @Transactional(rollbackFor = Exception.class) - public EmailDto sendEmailCode(String email, String key) { + public EmailDto renderCode(String email, String key) { EmailDto emailDto; String content; String redisKey = key + email; @@ -41,8 +40,8 @@ public class VerifyServiceImpl implements VerifyService { if (!redisUtil.set(redisKey, code, expiration)) { throw new BadRequestException("服务异常，请联系网站负责人"); } - content = template.render(Dict.create().set("code", code)); // 存在就再次发送原来的验证码 + content = template.render(Dict.create().set("code", code)); } else { content = template.render(Dict.create().set("code", oldCode)); } @@ -51,7 +50,7 @@ public class VerifyServiceImpl implements VerifyService { } @Override - public void validateEmailCode(String key, String email, String code) { + public void checkCode(String key, String email, String code) { String value = redisUtil.get(key + email, String.class); if (value == null || !value.equals(code)) { throw new BadRequestException("无效验证码"); diff --git a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java index 9939e93d..1587a4f1 100644 --- a/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java +++ b/cutejava/cutejava-tools/src/main/java/cn/odboy/application/tools/service/impl/EmailServiceImpl.java @@ -3,11 +3,13 @@ package cn.odboy.application.tools.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; import cn.odboy.application.tools.mapper.EmailConfigMapper; +import cn.odboy.application.tools.service.CaptchaService; import cn.odboy.application.tools.service.EmailService; +import cn.odboy.constant.CodeEnum; import cn.odboy.exception.BadRequestException; import cn.odboy.model.tools.domain.EmailConfig; import cn.odboy.model.tools.dto.EmailDto; -import cn.odboy.util.DESEncryptUtil; +import cn.odboy.util.DesEncryptUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheConfig; @@ -23,6 +25,8 @@ public class EmailServiceImpl extends ServiceImpl