diff --git a/README.MD b/README.MD index 0f716881..b7a91c2c 100644 --- a/README.MD +++ b/README.MD @@ -8,7 +8,10 @@ #### 项目源码 -https://github.com/odboy-tianjun/cutejava +[https://github.com/odboy-tianjun/cutejava](https://github.com/odboy-tianjun/cutejava) + +#### 项目文档 +[https://cutejava-doc.odboy.cn/](https://cutejava-doc.odboy.cn/) #### 编码规范 @@ -52,35 +55,6 @@ https://github.com/odboy-tianjun/cutejava - 存储管理：本地存储、Minio存储 - 服务监控：监控服务器的负载情况 -#### 前端基础组件 - -> 组件所在路径：cutejava-front/src/views/components/dev - -- CuteSimpleTable 简单表格 -- CuteDragTable 支持拖拽的表格 -- CuteFormDialog 支持表单的对话框 -- CuteFormDrawer 支持表单的抽屉 -- CuteRichTextEditor 富文本编辑器 -- CuteOneKeyCopy 一键复制 -- CuteMarkdown Markdown编辑器 -- CuteJavaEditor Java编辑器（已弃用） -- CuteYamlEditor Yaml编辑器（已弃用） -- CuteCodeEditor 多语言编辑器（支持yaml、java、go、swift、dockerfile、groovy、lua、perl、python、ruby、sql、xml、vue） - -#### 前端业务组件 - -> 组件所在路径：cutejava-front/src/views/components/business - -- CuteDeptTree 部门树 -- CuteProductLineSelect 产品线选择框 -- CuteProductLineSelectPro 产品线级联选择框 -- CuteUserSelect 用户多选框 - ![CuteBusiness](./cutejava-front/docs/images/CuteBusiness.png) -- CuteFileUpload 上传文件到OSS, 必须结合Minio使用（上传完成后必须销毁组件） - ![CuteFileUpload](./cutejava-front/docs/images/CuteFileUpload.png) -- CuteFileDragUpload 支持拖拽上传文件到OSS, 必须结合Minio使用（上传完成后必须销毁组件） - ![CuteFileDragUpload](./cutejava-front/docs/images/CuteFileDragUpload.png) - #### 系统模块 - cutejava-framework：系统基础框架。提供核心功能，如：权限、数据权限、异常处理、缓存、工具类、接口限流、接口防重、接口幂等。 diff --git a/commit.sh b/commit.sh deleted file mode 100644 index ce2dfad4..00000000 --- a/commit.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -is_weekend() { - day=$(date +%u) - [ "$day" -eq 6 ] || [ "$day" -eq 7 ] -} - -if is_weekend; then - # 如果是周末，使用当前时间 - git add . - git commit -m "$1" - git push -else - # 如果不是周末，设置为最近的周末时间 - day=$(date +%u) - if [ "$day" -le 5 ]; then - # 周一到周五，设置为即将到来的周六 - days_until_saturday=$((6 - day)) - weekend_date=$(date -d "$days_until_saturday days" "+%Y-%m-%d 12:00:00") - else - # 周日，使用昨天（周六） - weekend_date=$(date -d "yesterday" "+%Y-%m-%d 12:00:00") - fi - - export GIT_AUTHOR_DATE="$weekend_date" - export GIT_COMMITTER_DATE="$weekend_date" - - git add . - git commit -m "$1" - git push - - unset GIT_AUTHOR_DATE - unset GIT_COMMITTER_DATE -fi diff --git a/cutejava-front/LICENSE b/cutejava-front/LICENSE index 94343fa3..78a36cb2 100644 --- a/cutejava-front/LICENSE +++ b/cutejava-front/LICENSE @@ -1,191 +1,191 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "{}" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright 2022 Odboy - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "{}" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright 2019 Zheng Jie + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cutejava-front/docs/images/CuteBusiness.png b/cutejava-front/docs/images/CuteBusiness.png deleted file mode 100644 index 3a451819..00000000 Binary files a/cutejava-front/docs/images/CuteBusiness.png and /dev/null differ diff --git a/cutejava-front/docs/images/CuteFileDragUpload.png b/cutejava-front/docs/images/CuteFileDragUpload.png deleted file mode 100644 index aae6a418..00000000 Binary files a/cutejava-front/docs/images/CuteFileDragUpload.png and /dev/null differ diff --git a/cutejava-front/docs/images/CuteFileUpload.png b/cutejava-front/docs/images/CuteFileUpload.png deleted file mode 100644 index 98abcdfb..00000000 Binary files a/cutejava-front/docs/images/CuteFileUpload.png and /dev/null differ diff --git a/cutejava-front/package.json b/cutejava-front/package.json index d0c24bd8..01ec023d 100644 --- a/cutejava-front/package.json +++ b/cutejava-front/package.json @@ -1,6 +1,6 @@ { "name": "cutejava-front", - "version": "1.4.0", + "version": "1.4.1", "description": "CuteJava 前端源码", "author": "Odboy", "license": "Apache-2.0", diff --git a/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue b/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue index ad44cf74..98f951f0 100644 --- a/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue +++ b/cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue @@ -10,6 +10,7 @@ :disabled="disabled" :options="deptOptions" style="width: 100%" + placeholder="请选择产品线" @change="handleChange" /> diff --git a/cutejava-front/src/views/components/business/CuteOneUserSelect.vue b/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue similarity index 93% rename from cutejava-front/src/views/components/business/CuteOneUserSelect.vue rename to cutejava-front/src/views/components/business/CuteSingleUserSelect.vue index 412907af..336cd080 100644 --- a/cutejava-front/src/views/components/business/CuteOneUserSelect.vue +++ b/cutejava-front/src/views/components/business/CuteSingleUserSelect.vue @@ -1,81 +1,81 @@ - - - - - + + + + + diff --git a/cutejava-front/src/views/components/dev/CuteNoData.vue b/cutejava-front/src/views/components/dev/CuteNoData.vue index b2b2b71e..44b81547 100644 --- a/cutejava-front/src/views/components/dev/CuteNoData.vue +++ b/cutejava-front/src/views/components/dev/CuteNoData.vue @@ -15,7 +15,7 @@ export default { props: { desc: { type: String, - required: true, + required: false, default: '暂无匹配数据' } } diff --git a/cutejava-front/src/views/components/dev/CuteScreenShot.vue b/cutejava-front/src/views/components/dev/CuteScreenShot.vue index 44874780..974a63c5 100644 --- a/cutejava-front/src/views/components/dev/CuteScreenShot.vue +++ b/cutejava-front/src/views/components/dev/CuteScreenShot.vue @@ -17,7 +17,7 @@ 截图并下载 -
+
diff --git a/cutejava-front/src/views/componentsDemo/CuteMarkdownDemo.vue b/cutejava-front/src/views/componentsDemo/CuteMarkdownDemo.vue index c1529b5c..651545fe 100644 --- a/cutejava-front/src/views/componentsDemo/CuteMarkdownDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteMarkdownDemo.vue @@ -3,7 +3,7 @@ @@ -18,10 +18,7 @@ export default { components: { CuteMarkdown }, data() { return { - markdown: { - height: '200px', - content: '初始化内容' - } + content: '初始化内容' } }, methods: { diff --git a/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue b/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue new file mode 100644 index 00000000..5f4a830b --- /dev/null +++ b/cutejava-front/src/views/componentsDemo/CuteOtherDemo.vue @@ -0,0 +1,91 @@ + + + + diff --git a/cutejava-front/src/views/componentsDemo/CuteRichTextEditorDemo.vue b/cutejava-front/src/views/componentsDemo/CuteRichTextEditorDemo.vue index 14ca3af0..13ce75af 100644 --- a/cutejava-front/src/views/componentsDemo/CuteRichTextEditorDemo.vue +++ b/cutejava-front/src/views/componentsDemo/CuteRichTextEditorDemo.vue @@ -1,9 +1,6 @@ @@ -13,13 +10,6 @@ import CuteRichTextEditor from '@/views/components/dev/CuteRichTextEditor' export default { name: 'CuteRichTextEditorDemo', components: { CuteRichTextEditor }, - data() { - return { - html: { - height: '200px' - } - } - }, methods: { onChange(html, text) { console.log('onChange:html', html) diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue index f120cfff..272bbd4a 100644 --- a/cutejava-front/src/views/system/user/index.vue +++ b/cutejava-front/src/views/system/user/index.vue @@ -312,6 +312,7 @@ export default { }, created() { this.crud.msg.add = '新增成功，默认密码：123456' + console.log('======== this.dict', this.dict) }, mounted: function() { const that = this diff --git a/cutejava/LICENSE b/cutejava/LICENSE index fe57103d..78a36cb2 100644 --- a/cutejava/LICENSE +++ b/cutejava/LICENSE @@ -1,191 +1,191 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "{}" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright 2022-2025 Odboy - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "{}" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright 2019 Zheng Jie + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdApiExceptionCatch.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdApiExceptionCatch.java deleted file mode 100644 index e7752f43..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdApiExceptionCatch.java +++ /dev/null @@ -1,50 +0,0 @@ -// /* -// * Copyright 2021-2025 Odboy -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -// package cn.odboy.framework.exception.thirdapi; -// -// import java.lang.annotation.Documented; -// import java.lang.annotation.ElementType; -// import java.lang.annotation.Inherited; -// import java.lang.annotation.Retention; -// import java.lang.annotation.RetentionPolicy; -// import java.lang.annotation.Target; -// -// /** -// * 用于捕捉三方异常 -// * -// * @author odboy -// */ -// @Inherited -// @Documented -// @Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) -// @Retention(RetentionPolicy.RUNTIME) -// public @interface ThirdApiExceptionCatch { -// /** -// * 模块名称 -// */ -// String modelName(); -// -// /** -// * 接口描述 -// */ -// String description(); -// -// /** -// * 是否抛出异常 -// */ -// boolean throwException() default true; -// } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdExceptionCatchAspect.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdExceptionCatchAspect.java deleted file mode 100644 index e6aeae41..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/ThirdExceptionCatchAspect.java +++ /dev/null @@ -1,148 +0,0 @@ -// /* -// * Copyright 2021-2025 Odboy -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -// package cn.odboy.framework.exception.thirdapi; -// -// import cn.hutool.core.date.TimeInterval; -// import cn.odboy.framework.exception.thirdapi.vo.KubernetesApiExceptionVo; -// import cn.odboy.framework.exception.web.BadRequestException; -// import cn.odboy.util.CsReturnValueHandleUtil; -// import cn.odboy.util.LogFmtUtil; -// import com.alibaba.fastjson2.JSON; -// import com.aliyun.tea.TeaException; -// import io.kubernetes.client.openapi.ApiException; -// import lombok.extern.slf4j.Slf4j; -// import org.aspectj.lang.ProceedingJoinPoint; -// import org.aspectj.lang.annotation.Around; -// import org.aspectj.lang.annotation.Aspect; -// import org.gitlab4j.api.GitLabApiException; -// import org.springframework.stereotype.Component; -// -// /** -// * DingtalkApi调用异常 -// * -// * @author odboy -// * @date 2025-05-07 -// */ -// @Slf4j -// @Aspect -// @Component -// public class ThirdExceptionCatchAspect { -// @Around("@annotation(thirdApiExceptionCatch)") -// public Object aroundDingtalkApiExceptionCatch(ProceedingJoinPoint joinPoint, ThirdApiExceptionCatch thirdApiExceptionCatch) throws Throwable { -// return handleThirdApiException(joinPoint, thirdApiExceptionCatch); -// } -// -// /** -// * 三方服务调用异常处理 -// */ -// private Object handleThirdApiException(ProceedingJoinPoint joinPoint, ThirdApiExceptionCatch annotation) { -// if ("dingtalk".equals(annotation.modelName())) { -// return handleDingtalkApiException(joinPoint, annotation); -// } -// if ("gitlab".equals(annotation.modelName())) { -// return handleGitlabApiException(joinPoint, annotation); -// } -// if ("kubernetes".equals(annotation.modelName())) { -// return handleKubernetesApiException(joinPoint, annotation); -// } -// return null; -// } -// -// private Object handleDingtalkApiException(ProceedingJoinPoint joinPoint, ThirdApiExceptionCatch annotation) { -// TimeInterval timeInterval = new TimeInterval(); -// try { -// Object result = joinPoint.proceed(); -// log.info("接口 [{}] 执行耗时: {} ms", annotation.description(), timeInterval.intervalMs()); -// return result; -// } catch (TeaException teaException) { -// if (!com.aliyun.teautil.Common.empty(teaException.code) && !com.aliyun.teautil.Common.empty(teaException.message)) { -// String exceptionMessage = annotation.description() + "失败, code={}, message={}"; -// log.error(exceptionMessage, teaException.code, teaException.message, teaException); -// if (annotation.throwException()) { -// throw new BadRequestException(LogFmtUtil.format(exceptionMessage, teaException.code, teaException.message)); -// } -// } -// String exceptionMessage = annotation.description() + "失败"; -// log.error(exceptionMessage, teaException); -// if (annotation.throwException()) { -// throw new BadRequestException(exceptionMessage); -// } -// } catch (Throwable exception) { -// TeaException err = new TeaException(exception.getMessage(), exception); -// if (!com.aliyun.teautil.Common.empty(err.code) && !com.aliyun.teautil.Common.empty(err.message)) { -// String exceptionMessage = annotation.description() + "失败, code={}, message={}"; -// log.error(exceptionMessage, err.code, err.message, err); -// if (annotation.throwException()) { -// throw new BadRequestException(LogFmtUtil.format(exceptionMessage, err.code, err.message)); -// } -// } -// String exceptionMessage = annotation.description() + "失败"; -// log.error(exceptionMessage, exception); -// if (annotation.throwException()) { -// throw new BadRequestException(exceptionMessage); -// } -// } -// return CsReturnValueHandleUtil.getDefaultValue(joinPoint); -// } -// -// private Object handleGitlabApiException(ProceedingJoinPoint joinPoint, ThirdApiExceptionCatch annotation) { -// TimeInterval timeInterval = new TimeInterval(); -// try { -// Object result = joinPoint.proceed(); -// log.info("接口 [{}] 执行耗时: {} ms", annotation.description(), timeInterval.intervalMs()); -// return result; -// } catch (GitLabApiException gitLabApiException) { -// String exceptionMessage = annotation.description() + "失败，原因：" + gitLabApiException.getMessage(); -// log.error(exceptionMessage, gitLabApiException); -// if (annotation.throwException()) { -// throw new BadRequestException(exceptionMessage); -// } -// } catch (Throwable exception) { -// String exceptionMessage = annotation.description() + "失败"; -// log.error(exceptionMessage, exception); -// if (annotation.throwException()) { -// throw new BadRequestException(exceptionMessage); -// } -// } -// return CsReturnValueHandleUtil.getDefaultValue(joinPoint); -// } -// -// private Object handleKubernetesApiException(ProceedingJoinPoint joinPoint, ThirdApiExceptionCatch annotation) { -// TimeInterval timeInterval = new TimeInterval(); -// try { -// Object result = joinPoint.proceed(); -// log.info("接口 [{}] 执行耗时: {} ms", annotation.description(), timeInterval.intervalMs()); -// return result; -// } catch (ApiException e) { -// String responseBody = e.getResponseBody(); -// log.error("接口 [{}] 执行异常，耗时: {} ms，异常信息: {}", annotation.description(), timeInterval.intervalMs(), responseBody, e); -// if (annotation.throwException()) { -// KubernetesApiExceptionVo actionExceptionBody = JSON.parseObject(responseBody, KubernetesApiExceptionVo.class); -// if (actionExceptionBody != null) { -// throw new BadRequestException(annotation.description() + "失败, 原因：" + actionExceptionBody.getReason()); -// } -// throw new BadRequestException(annotation.description() + "失败"); -// } -// } catch (Throwable e) { -// log.error("接口 [{}] 执行异常，耗时: {} ms", annotation.description(), timeInterval.intervalMs(), e); -// if (annotation.throwException()) { -// throw new BadRequestException(annotation.description() + "失败"); -// } -// } -// return CsReturnValueHandleUtil.getDefaultValue(joinPoint); -// } -// } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/vo/KubernetesApiExceptionVo.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/vo/KubernetesApiExceptionVo.java deleted file mode 100644 index 8d16fdd4..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/exception/thirdapi/vo/KubernetesApiExceptionVo.java +++ /dev/null @@ -1,46 +0,0 @@ -// -// /* -// * Copyright 2021-2025 Odboy -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -// package cn.odboy.framework.exception.thirdapi.vo; -// -// import cn.odboy.base.CsObject; -// import lombok.Data; -// import lombok.EqualsAndHashCode; -// -// /** -// * Kubernetes异常信息 -// * -// * @author odboy -// * @date 2025-08-03 -// */ -// @Data -// @EqualsAndHashCode(callSuper = false) -// public class KubernetesApiExceptionVo extends CsObject { -// private String kind; -// private String apiVersion; -// private String status; -// private String message; -// private String reason; -// private Details details; -// private int code; -// -// @Data -// public static class Details { -// private String name; -// private String kind; -// } -// } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java index debc46b7..e395b380 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFace.java @@ -36,5 +36,5 @@ public @interface ExecutionTimeStatisticsFace { /** * 是否展示异常日志 */ - boolean errorLog() default false; + boolean showErrLog() default true; } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java index e9d0b0b5..fcc4b259 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/logging/ExecutionTimeStatisticsFaceAspect.java @@ -24,7 +24,7 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; /** - * DingtalkApi调用异常 + * 执行时间统计 * * @author odboy * @date 2025-05-07 @@ -41,7 +41,7 @@ public class ExecutionTimeStatisticsFaceAspect { log.info("[{}] 接口执行成功，耗时: {} ms", executionTimeStatisticsFace.description(), timeInterval.intervalMs()); return proceed; } catch (Exception e) { - if (executionTimeStatisticsFace.errorLog()) { + if (executionTimeStatisticsFace.showErrLog()) { log.info("[{}] 接口执行失败，耗时: {} ms", executionTimeStatisticsFace.description(), timeInterval.intervalMs()); } throw e; diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java index 68f87c9c..be0f2628 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/config/CsMpQuery.java @@ -39,36 +39,8 @@ public @interface CsMpQuery { */ CsMpQTypeEnum type() default CsMpQTypeEnum.EQUAL; - /** - * 连接查询的属性名, 如User类中的dept - */ - String joinName() default ""; - - /** - * 默认左连接 - */ - Join join() default Join.LEFT; - /** * 多字段模糊搜索, 仅支持String类型字段, 多个用逗号隔开, 如@MpQuery(blurry = "email,username") */ String blurry() default ""; - - /** - * 适用于简单连接查询, 复杂的请自定义该注解, 或者使用sql查询 - */ - enum Join { - /** - * 左连接 - */ - LEFT, - /** - * 右连接 - */ - RIGHT, - /** - * 内连接 - */ - INNER - } } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpService.java similarity index 93% rename from cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java rename to cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpService.java index 63da48c0..07e3bffe 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpEasyService.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/mybatisplus/core/interfaces/CsMpService.java @@ -1,74 +1,74 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.odboy.framework.mybatisplus.core.interfaces; - -import cn.odboy.base.CsPageResult; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.io.Serializable; -import java.util.Collection; -import java.util.List; - -/** - * 公共抽象Mapper接口类 - * - * @author odboy - * @date 2022-04-03 - */ -public interface CsMpEasyService extends IService { - int saveFeatureClazz(G resources); - - int saveFeatureClazzList(List resources); - - int modifyFeatureClazzById(G resources); - - boolean modifyFeatureClazzListById(Collection resources, int batchSize); - - G queryFeatureClazzById(Serializable id, Class targetClazz); - - T queryClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); - - G queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz); - - List queryFeatureClazzListByIds(List ids, Class targetClazz); - - List queryClazzListByArgs(Q criteria); - - List queryClazzListByArgs(LambdaQueryWrapper wrapper); - - List queryFeatureClazzListByArgs(Q criteria, Class targetClazz); - - List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); - - CsPageResult queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); - - CsPageResult queryFeatureClazzPageByArgs( - LambdaQueryWrapper wrapper, - IPage pageable, - Class targetClazz); - - CsPageResult queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); - - CsPageResult queryClazzPageByArgs(Q criteria, IPage pageable); - - int modifyClazzByArgs(LambdaQueryWrapper wrapper, T entity); - - int removeClazzByArgs(LambdaQueryWrapper wrapper); -} +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.odboy.framework.mybatisplus.core.interfaces; + +import cn.odboy.base.CsPageResult; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.support.SFunction; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; + +/** + * 公共抽象Service接口类 + * + * @author odboy + * @date 2022-04-03 + */ +public interface CsMpService extends IService { + int saveFeatureClazz(G resources); + + int saveFeatureClazzList(List resources); + + int modifyFeatureClazzById(G resources); + + boolean modifyFeatureClazzListById(Collection resources, int batchSize); + + G queryFeatureClazzById(Serializable id, Class targetClazz); + + T queryClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn); + + G queryFeatureClazzByArgs(LambdaQueryWrapper wrapper, SFunction orderColumn, Class clazz); + + List queryFeatureClazzListByIds(List ids, Class targetClazz); + + List queryClazzListByArgs(Q criteria); + + List queryClazzListByArgs(LambdaQueryWrapper wrapper); + + List queryFeatureClazzListByArgs(Q criteria, Class targetClazz); + + List queryFeatureClazzListByArgs(LambdaQueryWrapper wrapper, Class targetClazz); + + CsPageResult queryClazzPageByArgs(LambdaQueryWrapper wrapper, IPage pageable); + + CsPageResult queryFeatureClazzPageByArgs( + LambdaQueryWrapper wrapper, + IPage pageable, + Class targetClazz); + + CsPageResult queryFeatureClazzPageByArgs(Q criteria, IPage pageable, Class targetClazz); + + CsPageResult queryClazzPageByArgs(Q criteria, IPage pageable); + + int modifyClazzByArgs(LambdaQueryWrapper wrapper, T entity); + + int removeClazzByArgs(LambdaQueryWrapper wrapper); +} diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java index 8b91b67e..c937bc9f 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedisConfiguration.java @@ -53,10 +53,7 @@ public class RedisConfiguration extends CachingConfigurerSupport { /** * 自动识别json对象白名单配置（仅允许解析的包名, 范围越小越安全）
未配置可能导致, 登录失败, 反复登录等问题 */ - private static final String[] WHITELIST_STR = - {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model", - "cn.odboy.pipeline" + ".dal.dataobject", "cn.odboy.pipeline.dal.model", - "cn.odboy.pipeline.framework.pipeline.model", "cn.odboy.framework.exception.thirdapi.vo"}; + private static final String[] WHITELIST_STR = {"org.springframework", "cn.odboy.system.dal.dataobject", "cn.odboy.system.dal.model", "cn.odboy.pipeline" + ".dal.dataobject", "cn.odboy.pipeline.dal.model", "cn.odboy.pipeline.framework.pipeline.model", "cn.odboy.framework.exception.thirdapi.vo"}; /** * 设置 redis 数据默认过期时间，默认2小时 设置@cacheable 序列化方式 @@ -65,8 +62,7 @@ public class RedisConfiguration extends CachingConfigurerSupport { public RedisCacheConfiguration redisCacheConfiguration() { FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig(); - configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer( - fastJsonRedisSerializer)).entryTtl(Duration.ofHours(2)); + configuration = configuration.serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJsonRedisSerializer)).entryTtl(Duration.ofHours(2)); return configuration; } diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java deleted file mode 100644 index 597ea7c9..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/redis/RedissonConfiguration.java +++ /dev/null @@ -1,97 +0,0 @@ -///* -// * Copyright 2021-2025 Odboy -// * -// * Licensed under the Apache License, Version 2.0 (the "License"); -// * you may not use this file except in compliance with the License. -// * You may obtain a copy of the License at -// * -// * http://www.apache.org/licenses/LICENSE-2.0 -// * -// * Unless required by applicable law or agreed to in writing, software -// * distributed under the License is distributed on an "AS IS" BASIS, -// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// * See the License for the specific language governing permissions and -// * limitations under the License. -// */ -// -//package cn.odboy.framework.redis; -// -//import cn.hutool.core.util.StrUtil; -//import cn.odboy.util.CsSystemUtil; -//import lombok.extern.slf4j.Slf4j; -//import org.redisson.Redisson; -//import org.redisson.api.RedissonClient; -//import org.redisson.client.codec.StringCodec; -//import org.redisson.config.Config; -//import org.redisson.config.EqualJitterDelay; -//import org.redisson.config.SingleServerConfig; -//import org.redisson.config.TransportMode; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.boot.autoconfigure.AutoConfigureBefore; -//import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -// -//import java.time.Duration; -// -//@Slf4j -//@Configuration -//@AutoConfigureBefore(RedisAutoConfiguration.class) -//public class RedissonConfiguration { -// -// @Value("${spring.redis.host}") -// private String redisHost; -// -// @Value("${spring.redis.port}") -// private int redisPort; -// -// @Value("${spring.redis.database}") -// private int redisDatabase; -// -// @Value("${spring.redis.password:}") -// private String redisPassword; -// -// @Value("${spring.redis.timeout:5000}") -// private int timeout; -// -// @Value("${spring.redis.lettuce.pool.max-active:64}") -// private int connectionPoolSize; -// -// @Value("${spring.redis.lettuce.pool.min-idle:16}") -// private int connectionMinimumIdleSize; -// -// @Bean -// public RedissonClient redissonClient() { -// Config config = new Config(); -// config.setThreads(CsSystemUtil.getCpuCount()); -// config.setNettyThreads(0); -// config.setCodec(new StringCodec()); -// config.setTransportMode(TransportMode.NIO); -// SingleServerConfig singleServerConfig = config.useSingleServer(); -// singleServerConfig.setAddress("redis://" + redisHost + ":" + redisPort); -// singleServerConfig.setDatabase(redisDatabase); -// singleServerConfig.setTimeout(timeout); -// singleServerConfig.setConnectionPoolSize(connectionPoolSize); -// singleServerConfig.setConnectionMinimumIdleSize(connectionMinimumIdleSize); -// if (StrUtil.isNotBlank(redisPassword)) { -// singleServerConfig.setPassword(redisPassword); -// } -// singleServerConfig.setIdleConnectionTimeout(10000); -// singleServerConfig.setConnectTimeout(10000); -// singleServerConfig.setTimeout(3000); -// singleServerConfig.setRetryAttempts(3); -// // singleServerConfig.setRetryInterval(1500); -// singleServerConfig.setRetryDelay(new EqualJitterDelay(Duration.ofSeconds(3), Duration.ofSeconds(5))); -// singleServerConfig.setSubscriptionsPerConnection(5); -// singleServerConfig.setSubscriptionConnectionMinimumIdleSize(1); -// singleServerConfig.setSubscriptionConnectionPoolSize(50); -// singleServerConfig.setConnectionMinimumIdleSize(32); -// singleServerConfig.setConnectionPoolSize(64); -// singleServerConfig.setDnsMonitoringInterval(5000); -// RedissonClient redissonClient = Redisson.create(config); -// log.info("Redisson客户端 初始化完毕"); -// return redissonClient; -// } -//} -// -// diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java index 21975eb1..157cfcb1 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/CsDistributedIdUtil.java @@ -21,7 +21,7 @@ import cn.odboy.framework.exception.web.BadRequestException; import java.util.concurrent.atomic.AtomicLong; /** - * 分布式id生成工具 + * 分布式id生成工具（不建议用，仅供参考） * * @author odboy * @date 2025-04-05 diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/LogFmtUtil.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/util/LogFmtUtil.java deleted file mode 100644 index 4ba2518b..00000000 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/util/LogFmtUtil.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2021-2025 Odboy - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.odboy.util; - -/** - * 适配 logger 占位符 - * - * @author odboy - * @date 2025-01-13 - */ -public class LogFmtUtil { - /** - * 替换字符串中的占位符 {} 为传入的参数 - * - * @param message 消息模板 - * @param args 替换占位符的参数 - * @return 替换后的消息 - */ - public static String format(String message, Object... args) { - if (message == null || args == null || args.length == 0) { - return message; - } - // 使用 String.format 替换占位符 - return String.format(message.replace("{}", "%s"), args); - } - - public static void main(String[] args) { - // 示例用法 - String messageTemplate = "获取dingtalk accessToken失败, code={}, message={}"; - String formattedMessage = format(messageTemplate, 400, "Bad Request"); - // 输出: 获取dingtalk accessToken失败, code=400, message=Bad Request - System.out.println(formattedMessage); - } -} diff --git a/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java index b08c07f3..5a97ca35 100644 --- a/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java +++ b/cutejava/cutejava-starter/src/main/java/cn/odboy/HealthCheckPointer.java @@ -27,11 +27,17 @@ public class HealthCheckPointer implements CsHealthCheckPointService { @Autowired private SystemDictService systemDictService; + /** + * 系统准备就绪 + */ @Override public ResponseEntity doReadiness() { return ResponseEntity.ok(null); } + /** + * 系统是否正常 + */ @Override public ResponseEntity doLiveness() { return ResponseEntity.ok(systemDictService.getById(1)); diff --git a/cutejava/cutejava-starter/src/main/resources/application-dev.yml b/cutejava/cutejava-starter/src/main/resources/application-dev.yml index 06362108..b317af3c 100644 --- a/cutejava/cutejava-starter/src/main/resources/application-dev.yml +++ b/cutejava/cutejava-starter/src/main/resources/application-dev.yml @@ -193,8 +193,8 @@ app: private-key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== # 鉴权 jwt: - # 必须使用最少88位的Base64对该令牌进行编码 - base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI= + # 必须使用最少88位的Base64对该令牌进行编码 cn.odboy.util.CsBase64SecretUtil + base64-secret: YzE5ZWNjMjlkMGY4NDc4MDlmYzE0Y2I0MTk4YTQ4YjY5NTU0OGQxODNjNjQ0MmU1YjBmZTYwYjljYzI0M2M4MTJkZjk3Y2ZlYjg3ZTQxMjM4MjEwY2ZiYzE4YmFiYmZlZDVhM2M1YmI3M2FmNDFmNWJmM2MyMTM1ZDNhMmRmYzY= # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html token-validity-in-seconds: 14400000 # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期 diff --git a/cutejava/docs/mysql/cutejava.sql b/cutejava/docs/mysql/cutejava.sql index cc90ea2e..947ba408 100644 --- a/cutejava/docs/mysql/cutejava.sql +++ b/cutejava/docs/mysql/cutejava.sql @@ -24,7 +24,7 @@ CREATE TABLE `demo_time_table_copy1` ( `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of demo_time_table_copy1 @@ -42,7 +42,7 @@ CREATE TABLE `demo_user_time_logic_table` ( `update_time` datetime NOT NULL COMMENT '修改时间', `available` tinyint(1) NOT NULL DEFAULT 1 COMMENT '数据有效性', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of demo_user_time_logic_table @@ -59,7 +59,7 @@ CREATE TABLE `demo_user_time_table` ( `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '修改人', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of demo_user_time_table @@ -219,7 +219,7 @@ CREATE TABLE `qrtz_scheduler_state` ( -- Records of qrtz_scheduler_state -- ---------------------------- INSERT INTO `qrtz_scheduler_state` VALUES ('ClusteredScheduler', 'DESKTOP-FM44BLS1742558233429', 1742558255052, 20000); -INSERT INTO `qrtz_scheduler_state` VALUES ('cutejava', 'auto', 1760951912083, 10000); +INSERT INTO `qrtz_scheduler_state` VALUES ('cutejava', 'auto', 1761211053605, 10000); -- ---------------------------- -- Table structure for qrtz_simple_triggers @@ -509,7 +509,7 @@ CREATE TABLE `system_menu` ( UNIQUE INDEX `uniq_title`(`title` ASC) USING BTREE, INDEX `idx_pid`(`pid` ASC) USING BTREE, INDEX `idx_sys_menu_menu_id`(`menu_id` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 150 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统菜单' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 151 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统菜单' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of system_menu @@ -520,7 +520,7 @@ INSERT INTO `system_menu` VALUES (3, 1, 3, 1, '角色管理', 'Role', 'system/ro INSERT INTO `system_menu` VALUES (5, 1, 3, 1, '菜单管理', 'Menu', 'system/menu/index', 5, 'menu', 'menu', b'0', b'0', b'0', 'menu:list', 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (6, 1, 3, 0, '系统监控', NULL, NULL, 11, 'monitor', 'monitor', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (9, 6, 0, 1, 'SQL监控', 'DruidSqlConsole', 'system/druidSql/index', 18, 'sqlMonitor', 'druid-console', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); -INSERT INTO `system_menu` VALUES (10, NULL, 15, 0, '组件管理', NULL, NULL, 999, 'zujian', 'components', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); +INSERT INTO `system_menu` VALUES (10, NULL, 16, 0, '组件管理', NULL, NULL, 999, 'zujian', 'components', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (11, 10, 0, 1, '图标库', 'Icons', 'components/icons/index', 51, 'icon', 'icon', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (14, 36, 0, 1, '邮件工具', 'Email', 'system/email/index', 35, 'email', 'email', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (18, 36, 3, 1, '存储管理', 'Storage', 'system/storage/index', 34, 'qiniu', 'storage', b'0', b'0', b'0', 'storage:list', 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); @@ -574,6 +574,7 @@ INSERT INTO `system_menu` VALUES (128, 10, 0, 1, '演示:Markdown编辑器', 'Cu INSERT INTO `system_menu` VALUES (129, 10, 0, 1, '演示:富文本编辑器', 'CuteRichTextEditorDemo', 'componentsDemo/CuteRichTextEditorDemo', 999, 'menu', 'cuteRichTextEditorDemo', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (130, 10, 0, 1, '演示:文件上传', 'CuteFileUploadDemo', 'componentsDemo/CuteFileUploadDemo', 999, 'menu', 'cuteFileUploadDemo', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); INSERT INTO `system_menu` VALUES (132, 10, 0, 1, '演示:文件拖拽上传', 'CuteFileDragUploadDemo', 'componentsDemo/CuteFileDragUploadDemo', 999, 'menu', 'cuteFileDragUploadDemo', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); +INSERT INTO `system_menu` VALUES (150, 10, 0, 1, '演示:其他基础组件', 'CuteOtherDemo', 'componentsDemo/CuteOtherDemo', 999, 'menu', 'cuteOtherDemo', b'0', b'0', b'0', NULL, 'admin', 'admin', '2021-03-20 22:04:13', '2021-03-20 22:04:13'); -- ---------------------------- -- Table structure for system_operation_log @@ -592,7 +593,7 @@ CREATE TABLE `system_operation_log` ( `exception_detail` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL, `create_time` datetime NOT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '审计日志' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '审计日志' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of system_operation_log @@ -675,7 +676,7 @@ CREATE TABLE `system_quartz_log` ( `exception_detail` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '异常详情', `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '定时任务日志' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '定时任务日志' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of system_quartz_log @@ -827,6 +828,7 @@ INSERT INTO `system_roles_menus` VALUES (130, 1); INSERT INTO `system_roles_menus` VALUES (130, 2); INSERT INTO `system_roles_menus` VALUES (132, 1); INSERT INTO `system_roles_menus` VALUES (132, 2); +INSERT INTO `system_roles_menus` VALUES (150, 1); -- ---------------------------- -- Table structure for system_user