feat: 多租户分支合并 #175
Merged
feat: 多租户分支合并 #175
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* feat：多租户插件 * chore: 多租户sql更新plugin_tenant.sql(添加租户编号列、租户列索引添加、菜单录入sql更新)，多租户配置更新application.yml(删除租户数据的时候需要删除关联数据，所以关联表也需要过滤) * feat: 租户删除时清空相关数据，新时录入随机不重复的租户编号 * feat: 租户管理账号信息更新接口
* feat：多租户插件 * chore: 多租户sql更新plugin_tenant.sql(添加租户编号列、租户列索引添加、菜单录入sql更新)，多租户配置更新application.yml(删除租户数据的时候需要删除关联数据，所以关联表也需要过滤) * feat: 租户删除时清空相关数据，新时录入随机不重复的租户编号 * feat: 租户管理账号信息更新接口 * chore: 租户相关菜单从opne目录下剥离，租户菜单初始化sql更新 * feat: 完善租户登录信息修改 * fix: 修复后台在线列表能查到其他租户的数据问题
* feat：多租户插件 * chore: 多租户sql更新plugin_tenant.sql(添加租户编号列、租户列索引添加、菜单录入sql更新)，多租户配置更新application.yml(删除租户数据的时候需要删除关联数据，所以关联表也需要过滤) * feat: 租户删除时清空相关数据，新时录入随机不重复的租户编号 * feat: 租户管理账号信息更新接口 * chore: 租户相关菜单从opne目录下剥离，租户菜单初始化sql更新 * feat: 完善租户登录信息修改 * fix: 修复本地文件管理删除文件异常或不成功的情况 * fix: 修复后台在线列表能查到其他租户的数据问题 * feat: 新增验证码配置开关 * feat: 租户套餐权限修改时，绑定的租户权限同步修改，租户没有菜单权限 --------- Co-authored-by: KAI <[email protected]> Co-authored-by: Gyq灬明 <[email protected]> Co-authored-by: Charles7c <[email protected]>
* fix: 修复本地文件管理删除文件异常或不成功的情况 * feat: 新增验证码配置开关 * refactor: 优化登录验证码开关代码 * fix: 修复多租户关闭时读取不到bean导致的异常 * fix: 错误的合并 * chore: continew-starter 2.7.4 => 2.7.5 1.BaseServiceImpl 所在包调整 2.BaseController 改为在 Admin common 模块编写（重构权限校验 checkPermission 处理） 3.CRUD ValidateGroup => CrudValidationGroup 4.Admin ValidateGroup => ValidationGroup 5.修复 Query 查询数组范围报错 Closes #IB8711 --------- Co-authored-by: KAI <[email protected]> Co-authored-by: Gyq灬明 <[email protected]> Co-authored-by: Charles7c <[email protected]>
* fix: 修复本地文件管理删除文件异常或不成功的情况 * feat: 新增验证码配置开关 * refactor: 优化登录验证码开关代码 * chore: continew-starter 2.7.4 => 2.7.5 1.BaseServiceImpl 所在包调整 2.BaseController 改为在 Admin common 模块编写（重构权限校验 checkPermission 处理） 3.CRUD ValidateGroup => CrudValidationGroup 4.Admin ValidateGroup => ValidationGroup 5.修复 Query 查询数组范围报错 Closes #IB8711 * release: v3.4.1 * refactor(auth): 菜单路由为空时默认返回空列表而非 null Closes #IB9UDW * docs: 更新 README 文档 * chore: continew-starter 2.7.4 => 2.7.5 * fix: 修复租户权限问题 --------- Co-authored-by: KAI <[email protected]> Co-authored-by: Gyq灬明 <[email protected]> Co-authored-by: Charles7c <[email protected]>
# Conflicts: # .github/ISSUE_TEMPLATE/bug_report.yml # .github/ISSUE_TEMPLATE/feature_request.yml # CHANGELOG.md # README.md # continew-common/pom.xml # continew-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java # continew-common/src/main/java/top/continew/admin/common/constant/SysConstants.java # continew-common/src/main/java/top/continew/admin/common/context/UserContext.java # continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java # continew-extension/continew-extension-schedule-server/pom.xml # continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/LoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/handler/EmailLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/handler/PhoneLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/handler/SocialLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java # continew-module-system/src/main/java/top/continew/admin/auth/model/req/LoginReq.java # continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java # continew-module-system/src/main/java/top/continew/admin/auth/service/impl/AuthServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/mapper/ClientMapper.java # continew-module-system/src/main/java/top/continew/admin/system/mapper/user/UserPasswordHistoryMapper.java # continew-module-system/src/main/java/top/continew/admin/system/model/entity/ClientDO.java # continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java # continew-module-system/src/main/java/top/continew/admin/system/model/query/ClientQuery.java # continew-module-system/src/main/java/top/continew/admin/system/model/req/ClientReq.java # continew-module-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java # continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java # continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java # continew-module-system/src/main/java/top/continew/admin/system/model/resp/ClientResp.java # continew-module-system/src/main/java/top/continew/admin/system/service/ClientService.java # continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java # continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java # continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/ClientServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java # continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java # continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl # continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl # continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Menu.ftl # continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl # continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl # continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl # continew-webapi/src/main/java/top/continew/admin/config/log/LogConfiguration.java # continew-webapi/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java # continew-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java # continew-webapi/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java # continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/ClientController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java # continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java # continew-webapi/src/main/resources/banner.txt # continew-webapi/src/main/resources/config/application-dev.yml # continew-webapi/src/main/resources/config/application-prod.yml # continew-webapi/src/main/resources/config/application.yml # continew-webapi/src/main/resources/db/changelog/mysql/main_data.sql # continew-webapi/src/main/resources/db/changelog/mysql/main_table.sql # continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_open.sql # continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_schedule.sql # continew-webapi/src/main/resources/db/changelog/postgresql/main_data.sql # continew-webapi/src/main/resources/db/changelog/postgresql/main_table.sql # continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_open.sql # continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_schedule.sql # docker/nginx/conf/nginx.conf # pom.xml
# Conflicts: # continew-common/src/main/java/top/continew/admin/common/context/UserContext.java # continew-module-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java # continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java # continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java # continew-webapi/src/main/resources/config/application.yml
# Conflicts: # continew-common/pom.xml # continew-server/src/main/resources/config/application-dev.yml # continew-server/src/main/resources/config/application-prod.yml # continew-server/src/main/resources/db/changelog/mysql/plugin/plugin_tenant.sql # continew-server/src/main/resources/db/changelog/mysql/tenant_table.sql # continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java # continew-system/src/main/java/top/continew/admin/system/service/TenantSysDataService.java # continew-system/src/main/java/top/continew/admin/system/service/impl/TenantSysDataServiceImpl.java
…erge # Conflicts: # continew-common/pom.xml # continew-system/src/main/java/top/continew/admin/auth/AbstractLoginHandler.java # continew-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java # continew-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR 类型
PR 目的
解决方案
PR 测试
Changelog
其他信息
提交前确认