diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java
deleted file mode 100644
index cf2777a39..000000000
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgCaptchaException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.jeecg.common.exception;
-
-import lombok.Data;
-
-/**
- * @author kezhijie@wuhandsj.com
- * @date 2024/1/2 11:38
- */
-@Data
-public class JeecgCaptchaException extends RuntimeException{
-
- private Integer code;
-
- private static final long serialVersionUID = -9093410345065209053L;
-
- public JeecgCaptchaException(Integer code, String message) {
- super(message);
- this.code = code;
- }
-
- public JeecgCaptchaException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public JeecgCaptchaException(Throwable cause) {
- super(cause);
- }
-}
diff --git a/jeecg-boot/.gitignore b/jeecg-boot/.gitignore
new file mode 100644
index 000000000..b7838ca04
--- /dev/null
+++ b/jeecg-boot/.gitignore
@@ -0,0 +1,15 @@
+## ide
+**/.idea
+*.iml
+rebel.xml
+
+## backend
+**/target
+**/logs
+
+## front
+**/*.lock
+os_del.cmd
+os_del_doc.cmd
+.svn
+derby.log
diff --git a/jeecg-boot/LICENSE b/jeecg-boot/LICENSE
new file mode 100644
index 000000000..cc9116703
--- /dev/null
+++ b/jeecg-boot/LICENSE
@@ -0,0 +1,216 @@
+ 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:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) 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
+
+ (d) 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 (c) 2019 Jeecg Boot All rights reserved.
+
+ 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.
+
+ In any case, you must not make any such use of this software as to develop software which may be considered competitive with this software.
+
+ 开源协议补充
+ JeecgBoot 是由 北京国炬信息技术有限公司 发行的软件。 总部位于北京,地址:中国·北京·朝阳区科荟前街1号院奥林佳泰大厦。邮箱:jeecgos@163.com
+ 本软件受适用的国家软件著作权法(包括国际条约)和双重保护许可。
+
+ 1.允许基于本平台软件开展业务系统开发。
+ 2.JeecgBoot底层依赖的非开源功能:online lib依赖、仪表盘lib依赖等,统一采用LGPL开源协议(不二次改造、不拆分出jeecgboot之外使用,就不产生侵权)
+ 3.不得基于该平台软件的基础,修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售,或与JeecgBoot参与同类软件产品市场的竞争。
+ 违反此条款属于侵权行为,须赔偿侵权经济损失,同时立即停止著作权侵权行为。
+
+ 总结:在遵循Apache开源协议和开源协议补充条款下,允许商用使用,不会造成侵权行为!
+ 解释权归:http://www.jeecg.com
+
\ No newline at end of file
diff --git a/db/Dockerfile b/jeecg-boot/db/Dockerfile
similarity index 100%
rename from db/Dockerfile
rename to jeecg-boot/db/Dockerfile
diff --git a/db/jeecgboot-mysql-5.7.sql b/jeecg-boot/db/jeecgboot-mysql-5.7.sql
similarity index 100%
rename from db/jeecgboot-mysql-5.7.sql
rename to jeecg-boot/db/jeecgboot-mysql-5.7.sql
diff --git a/db/tables_nacos.sql b/jeecg-boot/db/tables_nacos.sql
similarity index 100%
rename from db/tables_nacos.sql
rename to jeecg-boot/db/tables_nacos.sql
diff --git a/db/tables_xxl_job.sql b/jeecg-boot/db/tables_xxl_job.sql
similarity index 100%
rename from db/tables_xxl_job.sql
rename to jeecg-boot/db/tables_xxl_job.sql
diff --git a/db/版本升级说明.md b/jeecg-boot/db/版本升级说明.md
similarity index 100%
rename from db/版本升级说明.md
rename to jeecg-boot/db/版本升级说明.md
diff --git a/docker-compose.yml b/jeecg-boot/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to jeecg-boot/docker-compose.yml
diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot/jeecg-boot-base-core/pom.xml
similarity index 100%
rename from jeecg-boot-base-core/pom.xml
rename to jeecg-boot/jeecg-boot-base-core/pom.xml
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/DataLogDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/DynamicTable.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DynamicTableConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ClientTerminalTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DateRangeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/DySmsEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/EmailTemplateEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/FileTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/SysAnnmentTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/Vue3MessageHrefEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/SensitiveSerialize.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java
similarity index 96%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java
index 466a3a012..a7e7d16de 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/Sensitive.java
@@ -1,26 +1,26 @@
-package org.jeecg.common.desensitization.annotation;
-
-
-import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.jeecg.common.desensitization.SensitiveSerialize;
-import org.jeecg.common.desensitization.enums.SensitiveEnum;
-
-import java.lang.annotation.*;
-
-/**
- * 在字段上定义 标识字段存储的信息是敏感的
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@JacksonAnnotationsInside
-@JsonSerialize(using = SensitiveSerialize.class)
-public @interface Sensitive {
-
- /**
- * 不同类型处理不同
- * @return
- */
- SensitiveEnum type() default SensitiveEnum.ENCODE;
-}
+package org.jeecg.common.desensitization.annotation;
+
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.jeecg.common.desensitization.SensitiveSerialize;
+import org.jeecg.common.desensitization.enums.SensitiveEnum;
+
+import java.lang.annotation.*;
+
+/**
+ * 在字段上定义 标识字段存储的信息是敏感的
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@JacksonAnnotationsInside
+@JsonSerialize(using = SensitiveSerialize.class)
+public @interface Sensitive {
+
+ /**
+ * 不同类型处理不同
+ * @return
+ */
+ SensitiveEnum type() default SensitiveEnum.ENCODE;
+}
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveDecode.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveEncode.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/annotation/SensitiveField.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/aspect/SensitiveDataAspect.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/enums/SensitiveEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootBizTipException.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgSqlInjectionException.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/annotation/EnumDict.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/enhance/UserFilterEnhance.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/ResourceUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/SqlConcatUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SelectTreeModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysFilesModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/UserAccountInfo.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateRangeUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsLimit.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/SsrfFileTypeFilter.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/JdbcSecurityUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionAstNodeVisitor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionAstNodeVisitor.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionAstNodeVisitor.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionAstNodeVisitor.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/InjectionSyntaxObjectAnalyzer.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/SqlInjectionAnalyzer.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ConstAnalyzer.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ParserSupport.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ParserSupport.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ParserSupport.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/ParserSupport.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/SqlSyntaxNormalizer.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/SqlSyntaxNormalizer.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/SqlSyntaxNormalizer.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlInjection/parse/SqlSyntaxNormalizer.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/IDictTableWhiteListHandler.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/SqlInjection/SysDictTableWhite.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeConfiguration.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/enums/LowCodeUrlsEnum.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/ThreadLocalDataHelper.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java
similarity index 100%
rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java
rename to jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/IgnoreAuth.java
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java
new file mode 100644
index 000000000..0507c5416
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java
@@ -0,0 +1,28 @@
+package org.jeecg.config.shiro;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+/**
+ * @Author Scott
+ * @create 2018-07-12 15:19
+ * @desc
+ **/
+public class JwtToken implements AuthenticationToken {
+
+ private static final long serialVersionUID = 1L;
+ private String token;
+
+ public JwtToken(String token) {
+ this.token = token;
+ }
+
+ @Override
+ public Object getPrincipal() {
+ return token;
+ }
+
+ @Override
+ public Object getCredentials() {
+ return token;
+ }
+}
diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
new file mode 100644
index 000000000..0d63f2afc
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -0,0 +1,345 @@
+package org.jeecg.config.shiro;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
+import org.apache.shiro.mgt.DefaultSubjectDAO;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.spring.LifecycleBeanPostProcessor;
+import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
+import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.crazycake.shiro.*;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.JeecgBaseConfig;
+import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean;
+import org.jeecg.config.shiro.filters.JwtFilter;
+import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.*;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.env.Environment;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.filter.DelegatingFilterProxy;
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+import jakarta.annotation.Resource;
+import jakarta.servlet.Filter;
+import jakarta.servlet.DispatcherType;
+import java.lang.reflect.Method;
+import java.util.*;
+
+/**
+ * @author: Scott
+ * @date: 2018/2/7
+ * @description: shiro 配置类
+ */
+
+@Slf4j
+@Configuration
+public class ShiroConfig {
+
+ @Resource
+ private LettuceConnectionFactory lettuceConnectionFactory;
+ @Autowired
+ private Environment env;
+ @Resource
+ private JeecgBaseConfig jeecgBaseConfig;
+ @Autowired(required = false)
+ private RedisProperties redisProperties;
+
+ /**
+ * Filter Chain定义说明
+ *
+ * 1、一个URL可以配置多个Filter,使用逗号分隔
+ * 2、当设置多个过滤器时,全部验证通过,才视为通过
+ * 3、部分过滤器可指定参数,如perms,roles
+ */
+ @Bean("shiroFilterFactoryBean")
+ public ShiroFilterFactoryBean shiroFilter(SecurityManager securityManager) {
+ CustomShiroFilterFactoryBean shiroFilterFactoryBean = new CustomShiroFilterFactoryBean();
+ shiroFilterFactoryBean.setSecurityManager(securityManager);
+ // 拦截器
+ Map filterChainDefinitionMap = new LinkedHashMap();
+
+ //支持yml方式,配置拦截排除
+ if(jeecgBaseConfig!=null && jeecgBaseConfig.getShiro()!=null){
+ String shiroExcludeUrls = jeecgBaseConfig.getShiro().getExcludeUrls();
+ if(oConvertUtils.isNotEmpty(shiroExcludeUrls)){
+ String[] permissionUrl = shiroExcludeUrls.split(",");
+ for(String url : permissionUrl){
+ filterChainDefinitionMap.put(url,"anon");
+ }
+ }
+ }
+
+ // 配置不会被拦截的链接 顺序判断
+ filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
+ filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
+ filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
+ filterChainDefinitionMap.put("/sys/smsCheckCaptcha", "anon"); //短信次数发送太多验证码排除
+ filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
+ filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
+ filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除
+ filterChainDefinitionMap.put("/sys/thirdLogin/**", "anon"); //第三方登录
+ filterChainDefinitionMap.put("/sys/getEncryptedString", "anon"); //获取加密串
+ filterChainDefinitionMap.put("/sys/sms", "anon");//短信验证码
+ filterChainDefinitionMap.put("/sys/phoneLogin", "anon");//手机登录
+ filterChainDefinitionMap.put("/sys/user/checkOnlyUser", "anon");//校验用户是否存在
+ filterChainDefinitionMap.put("/sys/user/register", "anon");//用户注册
+ filterChainDefinitionMap.put("/sys/user/phoneVerification", "anon");//用户忘记密码验证手机号
+ filterChainDefinitionMap.put("/sys/user/passwordChange", "anon");//用户更改密码
+ filterChainDefinitionMap.put("/auth/2step-code", "anon");//登录验证码
+ filterChainDefinitionMap.put("/sys/common/static/**", "anon");//图片预览 &下载文件不限制token
+ filterChainDefinitionMap.put("/sys/common/pdf/**", "anon");//pdf预览
+
+ //filterChainDefinitionMap.put("/sys/common/view/**", "anon");//图片预览不限制token
+ //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token
+ filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件
+
+ filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
+ filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码
+ filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除
+
+
+ //update-begin--Author:scott Date:20221116 for:排除静态资源后缀
+ filterChainDefinitionMap.put("/", "anon");
+ filterChainDefinitionMap.put("/doc.html", "anon");
+ filterChainDefinitionMap.put("/**/*.js", "anon");
+ filterChainDefinitionMap.put("/**/*.css", "anon");
+ filterChainDefinitionMap.put("/**/*.html", "anon");
+ filterChainDefinitionMap.put("/**/*.svg", "anon");
+ filterChainDefinitionMap.put("/**/*.pdf", "anon");
+ filterChainDefinitionMap.put("/**/*.jpg", "anon");
+ filterChainDefinitionMap.put("/**/*.png", "anon");
+ filterChainDefinitionMap.put("/**/*.gif", "anon");
+ filterChainDefinitionMap.put("/**/*.ico", "anon");
+ filterChainDefinitionMap.put("/**/*.ttf", "anon");
+ filterChainDefinitionMap.put("/**/*.woff", "anon");
+ filterChainDefinitionMap.put("/**/*.woff2", "anon");
+ //update-end--Author:scott Date:20221116 for:排除静态资源后缀
+
+ filterChainDefinitionMap.put("/druid/**", "anon");
+ filterChainDefinitionMap.put("/swagger-ui.html", "anon");
+ filterChainDefinitionMap.put("/swagger**/**", "anon");
+ filterChainDefinitionMap.put("/webjars/**", "anon");
+ filterChainDefinitionMap.put("/v3/**", "anon");
+
+ // update-begin--Author:sunjianlei Date:20210510 for:排除消息通告查看详情页面(用于第三方APP)
+ filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");
+ // update-end--Author:sunjianlei Date:20210510 for:排除消息通告查看详情页面(用于第三方APP)
+
+ //积木报表排除
+ filterChainDefinitionMap.put("/jmreport/**", "anon");
+ filterChainDefinitionMap.put("/**/*.js.map", "anon");
+ filterChainDefinitionMap.put("/**/*.css.map", "anon");
+
+ //拖拽仪表盘设计器排除
+ filterChainDefinitionMap.put("/drag/view", "anon");
+ filterChainDefinitionMap.put("/drag/page/queryById", "anon");
+ filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getAllChartData", "anon");
+ filterChainDefinitionMap.put("/drag/onlDragDatasetHead/getTotalData", "anon");
+ filterChainDefinitionMap.put("/drag/mock/json/**", "anon");
+ //大屏模板例子
+ filterChainDefinitionMap.put("/test/bigScreen/**", "anon");
+ filterChainDefinitionMap.put("/bigscreen/template1/**", "anon");
+ filterChainDefinitionMap.put("/bigscreen/template2/**", "anon");
+ //filterChainDefinitionMap.put("/test/jeecgDemo/rabbitMqClientTest/**", "anon"); //MQ测试
+ //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面
+ //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试
+
+ //websocket排除
+ filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告
+ filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块
+ filterChainDefinitionMap.put("/vxeSocket/**", "anon");//JVxeTable无痕刷新示例
+
+ //性能监控——安全隐患泄露TOEKN(durid连接池也有)
+ //filterChainDefinitionMap.put("/actuator/**", "anon");
+ //测试模块排除
+ filterChainDefinitionMap.put("/test/seata/**", "anon");
+
+ //错误路径排除
+ filterChainDefinitionMap.put("/error", "anon");
+ // 企业微信证书排除
+ filterChainDefinitionMap.put("/WW_verify*", "anon");
+
+ // 添加自己的过滤器并且取名为jwt
+ Map filterMap = new HashMap(1);
+ //如果cloudServer为空 则说明是单体 需要加载跨域配置【微服务跨域切换】
+ Object cloudServer = env.getProperty(CommonConstant.CLOUD_SERVER_KEY);
+ filterMap.put("jwt", new JwtFilter(cloudServer==null));
+ shiroFilterFactoryBean.setFilters(filterMap);
+ //