diff --git a/ruoyi-admin/Dockerfile b/bateraom-cloud-admin/Dockerfile similarity index 80% rename from ruoyi-admin/Dockerfile rename to bateraom-cloud-admin/Dockerfile index b489ab57c..edc2b6695 100644 --- a/ruoyi-admin/Dockerfile +++ b/bateraom-cloud-admin/Dockerfile @@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp \ - /ruoyi/skywalking/agent +RUN mkdir -p /bateraom-cloud/server/logs \ + /ruobateraom-cloudyi/server/temp \ + /bateraom-cloud/skywalking/agent -WORKDIR /ruoyi/server +WORKDIR /bateraom-cloud/server ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} -ADD ./target/ruoyi-admin.jar ./app.jar +ADD ./target/bateraom-cloud-admin.jar ./app.jar # 工作流字体文件 ADD ./zhFonts/ /usr/share/fonts/zhFonts/ diff --git a/ruoyi-admin/pom.xml b/bateraom-cloud-admin/pom.xml similarity index 87% rename from ruoyi-admin/pom.xml rename to bateraom-cloud-admin/pom.xml index 9e9780464..458e1249a 100644 --- a/ruoyi-admin/pom.xml +++ b/bateraom-cloud-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + bateraom-cloud org.dromara ${revision} 4.0.0 jar - ruoyi-admin + bateraom-cloud-admin web服务入口 @@ -47,50 +47,50 @@ org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc org.dromara - ruoyi-common-social + bateraom-cloud-common-social org.dromara - ruoyi-common-ratelimiter + bateraom-cloud-common-ratelimiter org.dromara - ruoyi-common-mail + bateraom-cloud-common-mail org.dromara - ruoyi-system + bateraom-cloud-system org.dromara - ruoyi-job + bateraom-cloud-job org.dromara - ruoyi-generator + bateraom-cloud-generator org.dromara - ruoyi-demo + bateraom-cloud-demo org.dromara - ruoyi-workflow + bateraom-cloud-workflow diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/bateraom-cloud-admin/src/main/java/org/dromara/DromaraApplication.java similarity index 84% rename from ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to bateraom-cloud-admin/src/main/java/org/dromara/DromaraApplication.java index 8ef33fe5f..38db3fb14 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/bateraom-cloud-admin/src/main/java/org/dromara/DromaraApplication.java @@ -17,7 +17,7 @@ public class DromaraApplication { SpringApplication application = new SpringApplication(DromaraApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ Bateraom-Cloud 后端启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/bateraom-cloud-admin/src/main/java/org/dromara/DromaraServletInitializer.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to bateraom-cloud-admin/src/main/java/org/dromara/DromaraServletInitializer.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/controller/AuthController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/controller/AuthController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/controller/CaptchaController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/controller/CaptchaController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/controller/IndexController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/controller/IndexController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/listener/UserActionListener.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/listener/UserActionListener.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/SysLoginService.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/SysLoginService.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/SysRegisterService.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/SysRegisterService.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to bateraom-cloud-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/bateraom-cloud-admin/src/main/resources/application-dev.yml similarity index 96% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to bateraom-cloud-admin/src/main/resources/application-dev.yml index d2c45eae1..46ddaf9b4 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/bateraom-cloud-admin/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ --- # 监控中心配置 spring.boot.admin.client: # 增加客户端开关 - enabled: true + enabled: false url: http://localhost:9090/admin instance: service-host-type: IP @@ -13,9 +13,9 @@ spring.boot.admin.client: --- # snail-job 配置 snail-job: - enabled: true + enabled: false # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" + group: "bateraom_cloud_group" # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表 token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" server: @@ -49,7 +49,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://localhost:3306/bateraom_cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root password: root # # 从库数据源 @@ -104,7 +104,7 @@ spring.data: # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 + #password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl @@ -121,7 +121,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus + clientName: bateraom-cloud # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/bateraom-cloud-admin/src/main/resources/application-prod.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to bateraom-cloud-admin/src/main/resources/application-prod.yml index 1c7eae428..7cf496c01 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/bateraom-cloud-admin/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ --- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp +spring.servlet.multipart.location: /bateraom-cloud/server/temp --- # 监控中心配置 spring.boot.admin.client: @@ -18,7 +18,7 @@ spring.boot.admin.client: snail-job: enabled: true # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务 - group: "ruoyi_group" + group: "bateraom_cloud_group" # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表 token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT" server: @@ -107,7 +107,7 @@ spring.data: # 数据库索引 database: 0 # redis 密码必须配置 - password: ruoyi123 + #password: ruoyi123 # 连接超时时间 timeout: 10s # 是否开启ssl @@ -124,7 +124,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus + clientName: bateraom-cloud # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application.yml b/bateraom-cloud-admin/src/main/resources/application.yml similarity index 99% rename from ruoyi-admin/src/main/resources/application.yml rename to bateraom-cloud-admin/src/main/resources/application.yml index c15d89c02..835ab297c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/bateraom-cloud-admin/src/main/resources/application.yml @@ -115,7 +115,7 @@ security: # 多租户配置 tenant: # 是否开启 - enable: true + enable: false # 排除表 excludes: - sys_menu diff --git a/ruoyi-admin/src/main/resources/banner.txt b/bateraom-cloud-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to bateraom-cloud-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/bateraom-cloud-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to bateraom-cloud-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/bateraom-cloud-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to bateraom-cloud-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/bateraom-cloud-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to bateraom-cloud-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/bateraom-cloud-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to bateraom-cloud-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/bateraom-cloud-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to bateraom-cloud-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/bateraom-cloud-admin/src/test/java/org/dromara/test/AssertUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java rename to bateraom-cloud-admin/src/test/java/org/dromara/test/AssertUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/bateraom-cloud-admin/src/test/java/org/dromara/test/DemoUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java rename to bateraom-cloud-admin/src/test/java/org/dromara/test/DemoUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/bateraom-cloud-admin/src/test/java/org/dromara/test/ParamUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java rename to bateraom-cloud-admin/src/test/java/org/dromara/test/ParamUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/bateraom-cloud-admin/src/test/java/org/dromara/test/TagUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java rename to bateraom-cloud-admin/src/test/java/org/dromara/test/TagUnitTest.java diff --git a/ruoyi-admin/zhFonts/.uuid b/bateraom-cloud-admin/zhFonts/.uuid similarity index 100% rename from ruoyi-admin/zhFonts/.uuid rename to bateraom-cloud-admin/zhFonts/.uuid diff --git a/ruoyi-admin/zhFonts/SIMSUN.TTC b/bateraom-cloud-admin/zhFonts/SIMSUN.TTC similarity index 100% rename from ruoyi-admin/zhFonts/SIMSUN.TTC rename to bateraom-cloud-admin/zhFonts/SIMSUN.TTC diff --git a/ruoyi-admin/zhFonts/fonts.dir b/bateraom-cloud-admin/zhFonts/fonts.dir similarity index 100% rename from ruoyi-admin/zhFonts/fonts.dir rename to bateraom-cloud-admin/zhFonts/fonts.dir diff --git a/ruoyi-admin/zhFonts/fonts.scale b/bateraom-cloud-admin/zhFonts/fonts.scale similarity index 100% rename from ruoyi-admin/zhFonts/fonts.scale rename to bateraom-cloud-admin/zhFonts/fonts.scale diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-bom/pom.xml similarity index 73% rename from ruoyi-common/ruoyi-common-bom/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-bom/pom.xml index e82179891..4c28c8c7b 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-bom/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-common-bom + bateraom-cloud-common-bom ${revision} pom - ruoyi-common-bom common依赖项 + bateraom-cloud-common-bom common依赖项 @@ -22,160 +22,160 @@ org.dromara - ruoyi-common-core + bateraom-cloud-common-core ${revision} org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc ${revision} org.dromara - ruoyi-common-excel + bateraom-cloud-common-excel ${revision} org.dromara - ruoyi-common-idempotent + bateraom-cloud-common-idempotent ${revision} org.dromara - ruoyi-common-job + bateraom-cloud-common-job ${revision} org.dromara - ruoyi-common-log + bateraom-cloud-common-log ${revision} org.dromara - ruoyi-common-mail + bateraom-cloud-common-mail ${revision} org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis ${revision} org.dromara - ruoyi-common-oss + bateraom-cloud-common-oss ${revision} org.dromara - ruoyi-common-ratelimiter + bateraom-cloud-common-ratelimiter ${revision} org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis ${revision} org.dromara - ruoyi-common-satoken + bateraom-cloud-common-satoken ${revision} org.dromara - ruoyi-common-security + bateraom-cloud-common-security ${revision} org.dromara - ruoyi-common-sms + bateraom-cloud-common-sms ${revision} org.dromara - ruoyi-common-social + bateraom-cloud-common-social ${revision} org.dromara - ruoyi-common-web + bateraom-cloud-common-web ${revision} org.dromara - ruoyi-common-translation + bateraom-cloud-common-translation ${revision} org.dromara - ruoyi-common-sensitive + bateraom-cloud-common-sensitive ${revision} org.dromara - ruoyi-common-json + bateraom-cloud-common-json ${revision} org.dromara - ruoyi-common-encrypt + bateraom-cloud-common-encrypt ${revision} org.dromara - ruoyi-common-tenant + bateraom-cloud-common-tenant ${revision} org.dromara - ruoyi-common-websocket + bateraom-cloud-common-websocket ${revision} org.dromara - ruoyi-common-sse + bateraom-cloud-common-sse ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-core/pom.xml similarity index 94% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-core/pom.xml index ad37e90db..26a5b4bb4 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-core/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-core + bateraom-cloud-common-core - ruoyi-common-core 核心模块 + bateraom-cloud-common-core 核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/Constants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/Constants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/R.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/R.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessCreateTaskEvent.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/UserType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/enums/UserType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/SseException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/SseException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/DeptService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/DeptService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/DictService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/DictService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/OssService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/OssService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/PostService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/PostService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/RoleService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/RoleService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/UserService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/UserService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java index 93617b018..199fd8248 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java +++ b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java @@ -1,60 +1,60 @@ -package org.dromara.common.core.utils; - -import cn.hutool.core.util.ObjectUtil; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; - -import java.util.function.Function; - -/** - * 对象工具类 - * - * @author 秋辞未寒 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ObjectUtils extends ObjectUtil { - - /** - * 如果对象不为空，则获取对象中的某个字段 ObjectUtils.notNullGetter(user, User::getName); - * - * @param obj 对象 - * @param func 获取方法 - * @return 对象字段 - */ - public static E notNullGetter(T obj, Function func) { - if (isNotNull(obj) && isNotNull(func)) { - return func.apply(obj); - } - return null; - } - - /** - * 如果对象不为空，则获取对象中的某个字段，否则返回默认值 - * - * @param obj 对象 - * @param func 获取方法 - * @param defaultValue 默认值 - * @return 对象字段 - */ - public static E notNullGetter(T obj, Function func, E defaultValue) { - if (isNotNull(obj) && isNotNull(func)) { - return func.apply(obj); - } - return defaultValue; - } - - /** - * 如果值不为空，则返回值，否则返回默认值 - * - * @param obj 对象 - * @param defaultValue 默认值 - * @return 对象字段 - */ - public static T notNull(T obj, T defaultValue) { - if (isNotNull(obj)) { - return obj; - } - return defaultValue; - } - -} +package org.dromara.common.core.utils; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.function.Function; + +/** + * 对象工具类 + * + * @author 秋辞未寒 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class ObjectUtils extends ObjectUtil { + + /** + * 如果对象不为空，则获取对象中的某个字段 ObjectUtils.notNullGetter(user, User::getName); + * + * @param obj 对象 + * @param func 获取方法 + * @return 对象字段 + */ + public static E notNullGetter(T obj, Function func) { + if (isNotNull(obj) && isNotNull(func)) { + return func.apply(obj); + } + return null; + } + + /** + * 如果对象不为空，则获取对象中的某个字段，否则返回默认值 + * + * @param obj 对象 + * @param func 获取方法 + * @param defaultValue 默认值 + * @return 对象字段 + */ + public static E notNullGetter(T obj, Function func, E defaultValue) { + if (isNotNull(obj) && isNotNull(func)) { + return func.apply(obj); + } + return defaultValue; + } + + /** + * 如果值不为空，则返回值，否则返回默认值 + * + * @param obj 对象 + * @param defaultValue 默认值 + * @return 对象字段 + */ + public static T notNull(T obj, T defaultValue) { + if (isNotNull(obj)) { + return obj; + } + return defaultValue; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/Threads.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/Threads.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java index d4f1c3d01..3d4adb974 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java +++ b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java @@ -1,48 +1,48 @@ -package org.dromara.common.core.validate.enumd; - -import jakarta.validation.Constraint; -import jakarta.validation.Payload; - -import java.lang.annotation.*; - -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * 自定义枚举校验 - * - * @author 秋辞未寒 - * @date 2024-12-09 - */ -@Documented -@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) -@Retention(RUNTIME) -@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解 -@Constraint(validatedBy = {EnumPatternValidator.class}) -public @interface EnumPattern { - - /** - * 需要校验的枚举类型 - */ - Class> type(); - - /** - * 枚举类型校验值字段名称 - * 需确保该字段实现了 getter 方法 - */ - String fieldName(); - - String message() default "输入值不在枚举范围内"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - @Documented - @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) - @Retention(RUNTIME) - @interface List { - EnumPattern[] value(); - } - -} +package org.dromara.common.core.validate.enumd; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * 自定义枚举校验 + * + * @author 秋辞未寒 + * @date 2024-12-09 + */ +@Documented +@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) +@Retention(RUNTIME) +@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解 +@Constraint(validatedBy = {EnumPatternValidator.class}) +public @interface EnumPattern { + + /** + * 需要校验的枚举类型 + */ + Class> type(); + + /** + * 枚举类型校验值字段名称 + * 需确保该字段实现了 getter 方法 + */ + String fieldName(); + + String message() default "输入值不在枚举范围内"; + + Class[] groups() default {}; + + Class[] payload() default {}; + + @Documented + @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE}) + @Retention(RUNTIME) + @interface List { + EnumPattern[] value(); + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java index 6cfa11a33..923c423eb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java +++ b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java @@ -1,37 +1,37 @@ -package org.dromara.common.core.validate.enumd; - -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.reflect.ReflectUtils; - -/** - * 自定义枚举校验注解实现 - * - * @author 秋辞未寒 - * @date 2024-12-09 - */ -public class EnumPatternValidator implements ConstraintValidator { - - private EnumPattern annotation;; - - @Override - public void initialize(EnumPattern annotation) { - ConstraintValidator.super.initialize(annotation); - this.annotation = annotation; - } - - @Override - public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { - if (StringUtils.isNotBlank(value)) { - String fieldName = annotation.fieldName(); - for (Object e : annotation.type().getEnumConstants()) { - if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) { - return true; - } - } - } - return false; - } - -} +package org.dromara.common.core.validate.enumd; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.core.utils.reflect.ReflectUtils; + +/** + * 自定义枚举校验注解实现 + * + * @author 秋辞未寒 + * @date 2024-12-09 + */ +public class EnumPatternValidator implements ConstraintValidator { + + private EnumPattern annotation;; + + @Override + public void initialize(EnumPattern annotation) { + ConstraintValidator.super.initialize(annotation); + this.annotation = annotation; + } + + @Override + public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) { + if (StringUtils.isNotBlank(value)) { + String fieldName = annotation.fieldName(); + for (Object e : annotation.type().getEnumConstants()) { + if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) { + return true; + } + } + } + return false; + } + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/xss/Xss.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/xss/Xss.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-doc/pom.xml similarity index 82% rename from ruoyi-common/ruoyi-common-doc/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-doc/pom.xml index c6199a17c..aad9787fd 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-doc/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-doc + bateraom-cloud-common-doc - ruoyi-common-doc 系统接口 + bateraom-cloud-common-doc 系统接口 org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-encrypt/pom.xml similarity index 85% rename from ruoyi-common/ruoyi-common-encrypt/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/pom.xml index ed4910ef0..216d595ee 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-encrypt/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-encrypt + bateraom-cloud-common-encrypt - ruoyi-common-encrypt 数据加解密模块 + bateraom-cloud-common-encrypt 数据加解密模块 org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-excel/pom.xml similarity index 77% rename from ruoyi-common/ruoyi-common-excel/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-excel/pom.xml index dd4a5eebe..b39bf6301 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-excel/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-excel + bateraom-cloud-common-excel - ruoyi-common-excel + bateraom-cloud-common-excel org.dromara - ruoyi-common-json + bateraom-cloud-common-json diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to bateraom-cloud-common/bateraom-cloud-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-idempotent/pom.xml similarity index 75% rename from ruoyi-common/ruoyi-common-idempotent/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-idempotent/pom.xml index 64418b42d..a8b9699f7 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-idempotent/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-idempotent + bateraom-cloud-common-idempotent - ruoyi-common-idempotent 幂等功能 + bateraom-cloud-common-idempotent 幂等功能 org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-job/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-job/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-job/pom.xml index 3a4a0cbd8..1afac2153 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-job/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-job + bateraom-cloud-common-job - ruoyi-common-job 定时任务 + bateraom-cloud-common-job 定时任务 @@ -39,7 +39,7 @@ org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/bateraom-cloud-common/bateraom-cloud-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-json/pom.xml similarity index 80% rename from ruoyi-common/ruoyi-common-json/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-json/pom.xml index 870df5cdc..0058e0c5e 100644 --- a/ruoyi-common/ruoyi-common-json/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-json/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-json + bateraom-cloud-common-json - ruoyi-common-json 序列化模块 + bateraom-cloud-common-json 序列化模块 org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-log/pom.xml similarity index 70% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-log/pom.xml index 1e2b33b44..e92ec6ebd 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-log/pom.xml @@ -4,27 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-log + bateraom-cloud-common-log - ruoyi-common-log 日志记录 + bateraom-cloud-common-log 日志记录 org.dromara - ruoyi-common-satoken + bateraom-cloud-common-satoken org.dromara - ruoyi-common-json + bateraom-cloud-common-json diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/annotation/Log.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/annotation/Log.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-mail/pom.xml similarity index 79% rename from ruoyi-common/ruoyi-common-mail/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-mail/pom.xml index c0e1b2e4a..3c8a84115 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-mail/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-mail + bateraom-cloud-common-mail - ruoyi-common-mail 邮件模块 + bateraom-cloud-common-mail 邮件模块 org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-mybatis/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-mybatis/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/pom.xml index d79ba284a..62cfbdc14 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-mybatis/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-mybatis + bateraom-cloud-common-mybatis - ruoyi-common-mybatis 数据库服务 + bateraom-cloud-common-mybatis 数据库服务 org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-satoken + bateraom-cloud-common-satoken diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/common-mybatis.yml similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/common-mybatis.yml diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/spy.properties similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties rename to bateraom-cloud-common/bateraom-cloud-common-mybatis/src/main/resources/spy.properties diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-oss/pom.xml similarity index 88% rename from ruoyi-common/ruoyi-common-oss/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-oss/pom.xml index 190dc5d46..1f8317cce 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-oss/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-oss + bateraom-cloud-common-oss - ruoyi-common-oss oss服务 + bateraom-cloud-common-oss oss服务 org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-ratelimiter/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/pom.xml index bbde94098..51be4bb5d 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-ratelimiter + bateraom-cloud-common-ratelimiter - ruoyi-common-ratelimiter 限流功能 + bateraom-cloud-common-ratelimiter 限流功能 org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/resources/spel-extension.json similarity index 94% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json rename to bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/resources/spel-extension.json index b16432b29..64a0e1be0 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json +++ b/bateraom-cloud-common/bateraom-cloud-common-ratelimiter/src/main/resources/spel-extension.json @@ -1,7 +1,7 @@ -{ - "org.dromara.common.ratelimiter.annotation.RateLimiter@key": { - "method": { - "parameters": true - } - } -} +{ + "org.dromara.common.ratelimiter.annotation.RateLimiter@key": { + "method": { + "parameters": true + } + } +} diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-redis/pom.xml similarity index 88% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-redis/pom.xml index d7d99cacc..efae9bc6b 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-redis/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-redis + bateraom-cloud-common-redis - ruoyi-common-redis 缓存服务 + bateraom-cloud-common-redis 缓存服务 org.dromara - ruoyi-common-core + bateraom-cloud-common-core diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java index e28c84e89..034ed0f70 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java +++ b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java @@ -1,165 +1,165 @@ -package org.dromara.common.redis.utils; - -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import lombok.AccessLevel; -import lombok.NoArgsConstructor; -import org.redisson.api.RIdGenerator; -import org.redisson.api.RedissonClient; - -import java.time.Duration; - -/** - * 发号器工具类 - * - * @author 秋辞未寒 - * @date 2024-12-10 - */ -@NoArgsConstructor(access = AccessLevel.PRIVATE) -public class SequenceUtils { - - /** - * 默认初始值 - */ - public static final Long DEFAULT_INIT_VALUE = 1L; - /** - * 默认步长 - */ - public static final Long DEFAULT_STEP_VALUE = 1L; - /** - * 默认过期时间-天 - */ - public static final Duration DEFAULT_EXPIRE_TIME_DAY = Duration.ofDays(1); - /** - * 默认过期时间-分钟 - */ - public static final Duration DEFAULT_EXPIRE_TIME_MINUTE = Duration.ofMinutes(1); - - /** - * 获取Redisson客户端实例 - */ - private static final RedissonClient REDISSON_CLIENT = SpringUtils.getBean(RedissonClient.class); - - /** - * 获取ID生成器 - * - * @param key 业务key - * @param expireTime 过期时间 - * @param initValue ID初始值 - * @param stepValue ID步长 - * @return ID生成器 - */ - private static RIdGenerator getIdGenerator(String key, Duration expireTime, Long initValue, Long stepValue) { - if (initValue == null || initValue <= 0) { - initValue = DEFAULT_INIT_VALUE; - } - if (stepValue == null || stepValue <= 0) { - stepValue = DEFAULT_STEP_VALUE; - } - RIdGenerator idGenerator = REDISSON_CLIENT.getIdGenerator(key); - // 设置初始值和步长 - idGenerator.tryInit(initValue, stepValue); - // 设置过期时间 - idGenerator.expire(expireTime); - return idGenerator; - } - - /** - * 获取指定业务key的唯一id - * - * @param key 业务key - * @param expireTime 过期时间 - * @param initValue ID初始值 - * @param stepValue ID步长 - * @return 唯一id - */ - public static long nextId(String key, Duration expireTime, Long initValue, Long stepValue) { - return getIdGenerator(key, expireTime, initValue, stepValue).nextId(); - } - - /** - * 获取指定业务key的唯一id字符串 - * - * @param key 业务key - * @param expireTime 过期时间 - * @param initValue ID初始值 - * @param stepValue ID步长 - * @return 唯一id - */ - public static String nextIdStr(String key, Duration expireTime, Long initValue, Long stepValue) { - return String.valueOf(nextId(key, expireTime, initValue, stepValue)); - } - - /** - * 获取指定业务key的唯一id (ID初始值=1,ID步长=1) - * - * @param key 业务key - * @param expireTime 过期时间 - * @return 唯一id - */ - public static long nextId(String key, Duration expireTime) { - return getIdGenerator(key, expireTime, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); - } - - /** - * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1) - * - * @param key 业务key - * @param expireTime 过期时间 - * @return 唯一id - */ - public static String nextIdStr(String key, Duration expireTime) { - return String.valueOf(nextId(key, expireTime)); - } - - /** - * 获取 yyyyMMdd 开头的唯一id - * - * @return 唯一id - */ - public static String nextIdDate() { - return nextIdDate(""); - } - - /** - * 获取 prefix + yyyyMMdd 开头的唯一id - * - * @param prefix 业务前缀 - * @return 唯一id - */ - public static String nextIdDate(String prefix) { - // 前缀+日期 构建 prefixKey - String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER)); - // 获取下一个id - long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_DAY, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); - // 返回完整id - return StringUtils.format("{}{}", prefixKey, nextId); - } - - /** - * 获取 yyyyMMddHHmmss 开头的唯一id - * - * @return 唯一id - */ - public static String nextIdDateTime() { - return nextIdDateTime(""); - } - - /** - * 获取 prefix + yyyyMMddHHmmss 开头的唯一id - * - * @param prefix 业务前缀 - * @return 唯一id - */ - public static String nextIdDateTime(String prefix) { - // 前缀+日期时间 构建 prefixKey - String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_FORMATTER)); - // 获取下一个id - long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_MINUTE, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); - // 返回完整id - return StringUtils.format("{}{}", prefixKey, nextId); - } - -} +package org.dromara.common.redis.utils; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import org.dromara.common.core.utils.SpringUtils; +import org.dromara.common.core.utils.StringUtils; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.redisson.api.RIdGenerator; +import org.redisson.api.RedissonClient; + +import java.time.Duration; + +/** + * 发号器工具类 + * + * @author 秋辞未寒 + * @date 2024-12-10 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class SequenceUtils { + + /** + * 默认初始值 + */ + public static final Long DEFAULT_INIT_VALUE = 1L; + /** + * 默认步长 + */ + public static final Long DEFAULT_STEP_VALUE = 1L; + /** + * 默认过期时间-天 + */ + public static final Duration DEFAULT_EXPIRE_TIME_DAY = Duration.ofDays(1); + /** + * 默认过期时间-分钟 + */ + public static final Duration DEFAULT_EXPIRE_TIME_MINUTE = Duration.ofMinutes(1); + + /** + * 获取Redisson客户端实例 + */ + private static final RedissonClient REDISSON_CLIENT = SpringUtils.getBean(RedissonClient.class); + + /** + * 获取ID生成器 + * + * @param key 业务key + * @param expireTime 过期时间 + * @param initValue ID初始值 + * @param stepValue ID步长 + * @return ID生成器 + */ + private static RIdGenerator getIdGenerator(String key, Duration expireTime, Long initValue, Long stepValue) { + if (initValue == null || initValue <= 0) { + initValue = DEFAULT_INIT_VALUE; + } + if (stepValue == null || stepValue <= 0) { + stepValue = DEFAULT_STEP_VALUE; + } + RIdGenerator idGenerator = REDISSON_CLIENT.getIdGenerator(key); + // 设置初始值和步长 + idGenerator.tryInit(initValue, stepValue); + // 设置过期时间 + idGenerator.expire(expireTime); + return idGenerator; + } + + /** + * 获取指定业务key的唯一id + * + * @param key 业务key + * @param expireTime 过期时间 + * @param initValue ID初始值 + * @param stepValue ID步长 + * @return 唯一id + */ + public static long nextId(String key, Duration expireTime, Long initValue, Long stepValue) { + return getIdGenerator(key, expireTime, initValue, stepValue).nextId(); + } + + /** + * 获取指定业务key的唯一id字符串 + * + * @param key 业务key + * @param expireTime 过期时间 + * @param initValue ID初始值 + * @param stepValue ID步长 + * @return 唯一id + */ + public static String nextIdStr(String key, Duration expireTime, Long initValue, Long stepValue) { + return String.valueOf(nextId(key, expireTime, initValue, stepValue)); + } + + /** + * 获取指定业务key的唯一id (ID初始值=1,ID步长=1) + * + * @param key 业务key + * @param expireTime 过期时间 + * @return 唯一id + */ + public static long nextId(String key, Duration expireTime) { + return getIdGenerator(key, expireTime, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); + } + + /** + * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1) + * + * @param key 业务key + * @param expireTime 过期时间 + * @return 唯一id + */ + public static String nextIdStr(String key, Duration expireTime) { + return String.valueOf(nextId(key, expireTime)); + } + + /** + * 获取 yyyyMMdd 开头的唯一id + * + * @return 唯一id + */ + public static String nextIdDate() { + return nextIdDate(""); + } + + /** + * 获取 prefix + yyyyMMdd 开头的唯一id + * + * @param prefix 业务前缀 + * @return 唯一id + */ + public static String nextIdDate(String prefix) { + // 前缀+日期 构建 prefixKey + String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER)); + // 获取下一个id + long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_DAY, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); + // 返回完整id + return StringUtils.format("{}{}", prefixKey, nextId); + } + + /** + * 获取 yyyyMMddHHmmss 开头的唯一id + * + * @return 唯一id + */ + public static String nextIdDateTime() { + return nextIdDateTime(""); + } + + /** + * 获取 prefix + yyyyMMddHHmmss 开头的唯一id + * + * @param prefix 业务前缀 + * @return 唯一id + */ + public static String nextIdDateTime(String prefix) { + // 前缀+日期时间 构建 prefixKey + String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_FORMATTER)); + // 获取下一个id + long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_MINUTE, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId(); + // 返回完整id + return StringUtils.format("{}{}", prefixKey, nextId); + } + +} diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-satoken/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-satoken/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-satoken/pom.xml index 4df7d4ded..96ac4cf22 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-satoken/pom.xml @@ -4,24 +4,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-satoken + bateraom-cloud-common-satoken org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/resources/common-satoken.yml similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml rename to bateraom-cloud-common/bateraom-cloud-common-satoken/src/main/resources/common-satoken.yml diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-security/pom.xml similarity index 71% rename from ruoyi-common/ruoyi-common-translation/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-security/pom.xml index e77b868bb..bb2703f35 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-security/pom.xml @@ -4,22 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-translation + bateraom-cloud-common-security - ruoyi-common-translation 通用翻译功能 + bateraom-cloud-common-security 安全模块 - org.dromara - ruoyi-common-json + bateraom-cloud-common-satoken diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-sensitive/pom.xml similarity index 71% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-sensitive/pom.xml index 5b39df293..4ec428a55 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-sensitive/pom.xml @@ -4,23 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-security + bateraom-cloud-common-sensitive - ruoyi-common-security 安全模块 + bateraom-cloud-common-sensitive 脱敏模块 org.dromara - ruoyi-common-satoken + bateraom-cloud-common-json - diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-sms/pom.xml similarity index 77% rename from ruoyi-common/ruoyi-common-sms/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-sms/pom.xml index 932cb9d52..1b933abcd 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-sms/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-sms + bateraom-cloud-common-sms - ruoyi-common-sms 短信模块 + bateraom-cloud-common-sms 短信模块 @@ -25,7 +25,7 @@ org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java rename to bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java rename to bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-social/pom.xml similarity index 73% rename from ruoyi-common/ruoyi-common-social/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-social/pom.xml index 9f9a965e3..9cf93685b 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-social/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-social + bateraom-cloud-common-social - ruoyi-common-social 授权认证 + bateraom-cloud-common-social 授权认证 @@ -23,12 +23,12 @@ org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-sse/pom.xml similarity index 67% rename from ruoyi-common/ruoyi-common-sse/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-sse/pom.xml index ae44c988e..aceb20c98 100644 --- a/ruoyi-common/ruoyi-common-sse/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-sse/pom.xml @@ -4,33 +4,33 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-sse + bateraom-cloud-common-sse - ruoyi-common-sse 模块 + bateraom-cloud-common-sse 模块 org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis org.dromara - ruoyi-common-satoken + bateraom-cloud-common-satoken org.dromara - ruoyi-common-json + bateraom-cloud-common-json diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-tenant/pom.xml similarity index 70% rename from ruoyi-common/ruoyi-common-tenant/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-tenant/pom.xml index 8e1a6ab1e..37165df6d 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-tenant/pom.xml @@ -4,27 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-tenant + bateraom-cloud-common-tenant - ruoyi-common-tenant 租户模块 + bateraom-cloud-common-tenant 租户模块 org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis true org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-translation/pom.xml similarity index 70% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-translation/pom.xml index fecdf0911..33effb310 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-translation/pom.xml @@ -4,22 +4,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-sensitive + bateraom-cloud-common-translation - ruoyi-common-sensitive 脱敏模块 + bateraom-cloud-common-translation 通用翻译功能 + org.dromara - ruoyi-common-json + bateraom-cloud-common-json + diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-web/pom.xml similarity index 86% rename from ruoyi-common/ruoyi-common-web/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-web/pom.xml index b250fa9d0..9d1b07b9c 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-web/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-web + bateraom-cloud-common-web - ruoyi-common-web web服务 + bateraom-cloud-common-web web服务 org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/core/BaseController.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/core/BaseController.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/bateraom-cloud-common/bateraom-cloud-common-websocket/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-websocket/pom.xml rename to bateraom-cloud-common/bateraom-cloud-common-websocket/pom.xml index 0587cd79a..567a21d51 100644 --- a/ruoyi-common/ruoyi-common-websocket/pom.xml +++ b/bateraom-cloud-common/bateraom-cloud-common-websocket/pom.xml @@ -4,33 +4,33 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + bateraom-cloud-common ${revision} 4.0.0 - ruoyi-common-websocket + bateraom-cloud-common-websocket - ruoyi-common-websocket 模块 + bateraom-cloud-common-websocket 模块 org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis org.dromara - ruoyi-common-satoken + bateraom-cloud-common-satoken org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.springframework.boot diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to bateraom-cloud-common/bateraom-cloud-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/bateraom-cloud-common/pom.xml b/bateraom-cloud-common/pom.xml new file mode 100644 index 000000000..c0c624638 --- /dev/null +++ b/bateraom-cloud-common/pom.xml @@ -0,0 +1,46 @@ + + + + bateraom-cloud + org.dromara + ${revision} + + 4.0.0 + + + bateraom-cloud-common-bom + bateraom-cloud-common-social + bateraom-cloud-common-core + bateraom-cloud-common-doc + bateraom-cloud-common-excel + bateraom-cloud-common-idempotent + bateraom-cloud-common-job + bateraom-cloud-common-log + bateraom-cloud-common-mail + bateraom-cloud-common-mybatis + bateraom-cloud-common-oss + bateraom-cloud-common-ratelimiter + bateraom-cloud-common-redis + bateraom-cloud-common-satoken + bateraom-cloud-common-security + bateraom-cloud-common-sms + bateraom-cloud-common-web + bateraom-cloud-common-translation + bateraom-cloud-common-sensitive + bateraom-cloud-common-json + bateraom-cloud-common-encrypt + bateraom-cloud-common-tenant + bateraom-cloud-common-websocket + bateraom-cloud-common-sse + + + bateraom-cloud-common + pom + + + common 通用模块 + + + diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/Dockerfile similarity index 79% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/Dockerfile index d55b95627..ee9815e8c 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/Dockerfile @@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/monitor/logs +RUN mkdir -p /bateraom-cloud/monitor/logs -WORKDIR /ruoyi/monitor +WORKDIR /bateraom-cloud/monitor ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE 9090 -ADD ./target/ruoyi-monitor-admin.jar ./app.jar +ADD ./target/bateraom-cloud-monitor-admin.jar ./app.jar SHELL ["/bin/bash", "-c"] diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/pom.xml similarity index 95% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/pom.xml index 77c9eb71a..59327d769 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-extend + bateraom-cloud-extend org.dromara ${revision} 4.0.0 jar - ruoyi-monitor-admin + bateraom-cloud-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/application.yml similarity index 85% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/application.yml index 622c93d3c..56d5275c7 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 9090 spring: application: - name: ruoyi-monitor-admin + name: bateraom-cloud-monitor-admin profiles: active: @profiles.active@ @@ -18,7 +18,7 @@ spring: boot: admin: ui: - title: RuoYi-Vue-Plus服务监控中心 + title: bateraom-cloud 服务监控中心 context-path: /admin --- # Actuator 监控端点的配置项 @@ -31,7 +31,7 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-monitor-admin.log + external-file: ./logs/bateraom-cloud-monitor-admin.log --- # 监控配置 spring.boot.admin.client: diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/logback-plus.xml similarity index 94% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml rename to bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/logback-plus.xml index 45cbbba40..83c98f906 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml +++ b/bateraom-cloud-extend/bateraom-cloud-monitor-admin/src/main/resources/logback-plus.xml @@ -2,7 +2,7 @@ logback - + diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/Dockerfile similarity index 79% rename from ruoyi-extend/ruoyi-snailjob-server/Dockerfile rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/Dockerfile index 6f4484d33..9cefa242a 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile +++ b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/Dockerfile @@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds LABEL maintainer="Lion Li" -RUN mkdir -p /ruoyi/snailjob/logs +RUN mkdir -p /bateraom-cloud/snailjob/logs -WORKDIR /ruoyi/snailjob +WORKDIR /bateraom-cloud/snailjob ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" EXPOSE 8800 EXPOSE 17888 -ADD ./target/ruoyi-snailjob-server.jar ./app.jar +ADD ./target/bateraom-cloud-snailjob-server.jar ./app.jar SHELL ["/bin/bash", "-c"] diff --git a/ruoyi-extend/ruoyi-snailjob-server/pom.xml b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/pom.xml similarity index 94% rename from ruoyi-extend/ruoyi-snailjob-server/pom.xml rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/pom.xml index 0b3afd325..23f662d6a 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/pom.xml +++ b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-extend + bateraom-cloud-extend ${revision} 4.0.0 jar - ruoyi-snailjob-server + bateraom-cloud-snailjob-server diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application-dev.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application-prod.yml diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application.yml similarity index 86% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application.yml index ba6df45fb..04180f63e 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml +++ b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: spring: application: - name: ruoyi-snailjob-server + name: bateraom-cloud-snailjob-server profiles: active: @profiles.active@ web: @@ -36,4 +36,4 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-snailjob-server/console.log + external-file: ./logs/bateraom-cloud-snailjob-server/console.log diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/banner.txt diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/logback-plus.xml similarity index 97% rename from ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml rename to bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/logback-plus.xml index be588110c..c28eca9e4 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml +++ b/bateraom-cloud-extend/bateraom-cloud-snailjob-server/src/main/resources/logback-plus.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-extend/pom.xml b/bateraom-cloud-extend/pom.xml similarity index 69% rename from ruoyi-extend/pom.xml rename to bateraom-cloud-extend/pom.xml index d7280cea3..b565c2fd7 100644 --- a/ruoyi-extend/pom.xml +++ b/bateraom-cloud-extend/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + bateraom-cloud org.dromara ${revision} 4.0.0 - ruoyi-extend + bateraom-cloud-extend pom - ruoyi-monitor-admin - ruoyi-snailjob-server + bateraom-cloud-monitor-admin + bateraom-cloud-snailjob-server diff --git a/bateraom-cloud-modules/bateraom-cloud-business/pom.xml b/bateraom-cloud-modules/bateraom-cloud-business/pom.xml new file mode 100644 index 000000000..9acb63e07 --- /dev/null +++ b/bateraom-cloud-modules/bateraom-cloud-business/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + org.dromara + bateraom-cloud-modules + 5.3.1-BETA + + + bateraom-cloud-business + + + 17 + 17 + UTF-8 + + + diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/bateraom-cloud-modules/bateraom-cloud-demo/pom.xml similarity index 62% rename from ruoyi-modules/ruoyi-demo/pom.xml rename to bateraom-cloud-modules/bateraom-cloud-demo/pom.xml index 119fe61b7..49c3064f5 100644 --- a/ruoyi-modules/ruoyi-demo/pom.xml +++ b/bateraom-cloud-modules/bateraom-cloud-demo/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + bateraom-cloud-modules ${revision} 4.0.0 - ruoyi-demo + bateraom-cloud-demo demo模块 @@ -20,87 +20,87 @@ org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc org.dromara - ruoyi-common-sms + bateraom-cloud-common-sms org.dromara - ruoyi-common-mail + bateraom-cloud-common-mail org.dromara - ruoyi-common-redis + bateraom-cloud-common-redis org.dromara - ruoyi-common-idempotent + bateraom-cloud-common-idempotent org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis org.dromara - ruoyi-common-log + bateraom-cloud-common-log org.dromara - ruoyi-common-excel + bateraom-cloud-common-excel org.dromara - ruoyi-common-security + bateraom-cloud-common-security org.dromara - ruoyi-common-web + bateraom-cloud-common-web org.dromara - ruoyi-common-ratelimiter + bateraom-cloud-common-ratelimiter org.dromara - ruoyi-common-translation + bateraom-cloud-common-translation org.dromara - ruoyi-common-sensitive + bateraom-cloud-common-sensitive org.dromara - ruoyi-common-encrypt + bateraom-cloud-common-encrypt org.dromara - ruoyi-common-tenant + bateraom-cloud-common-tenant org.dromara - ruoyi-common-websocket + bateraom-cloud-common-websocket diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/MailController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/MailController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/SmsController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/SmsController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestDemo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestDemo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestTree.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/TestTree.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/mapper/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/impl/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/java/org/dromara/demo/service/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/demo/TestDemoMapper.xml diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/demo/TestTreeMapper.xml diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md b/bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md rename to bateraom-cloud-modules/bateraom-cloud-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/bateraom-cloud-modules/bateraom-cloud-generator/pom.xml similarity index 84% rename from ruoyi-modules/ruoyi-generator/pom.xml rename to bateraom-cloud-modules/bateraom-cloud-generator/pom.xml index 49060292f..63e8d53d1 100644 --- a/ruoyi-modules/ruoyi-generator/pom.xml +++ b/bateraom-cloud-modules/bateraom-cloud-generator/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + bateraom-cloud-modules ${revision} 4.0.0 - ruoyi-generator + bateraom-cloud-generator generator 代码生成 @@ -19,27 +19,27 @@ org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis org.dromara - ruoyi-common-web + bateraom-cloud-common-web org.dromara - ruoyi-common-log + bateraom-cloud-common-log diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/config/GenConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/config/GenConfig.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/constant/GenConstants.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/constant/GenConstants.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/controller/GenController.java similarity index 99% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/controller/GenController.java index e3d4c087a..72a58438d 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/controller/GenController.java @@ -200,7 +200,7 @@ public class GenController extends BaseController { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"bateraom-cloud.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.write(response.getOutputStream(), false, data); diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/domain/GenTable.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/domain/GenTable.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/service/IGenTableService.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/service/IGenTableService.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/GenUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/GenUtils.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/generator.yml diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/bo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/bo.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/vo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/java/vo.java.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/sql/sqlserver/sql.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/ts/types.ts.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to bateraom-cloud-modules/bateraom-cloud-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/bateraom-cloud-modules/bateraom-cloud-job/pom.xml similarity index 76% rename from ruoyi-modules/ruoyi-job/pom.xml rename to bateraom-cloud-modules/bateraom-cloud-job/pom.xml index 2431a1ce8..bef03e512 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/bateraom-cloud-modules/bateraom-cloud-job/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + bateraom-cloud-modules ${revision} 4.0.0 jar - ruoyi-job + bateraom-cloud-job 任务调度 @@ -20,14 +20,14 @@ org.dromara - ruoyi-common-json + bateraom-cloud-common-json org.dromara - ruoyi-common-job + bateraom-cloud-common-job - + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java rename to bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/package-info.java diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java rename to bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java rename to bateraom-cloud-modules/bateraom-cloud-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/bateraom-cloud-modules/bateraom-cloud-system/pom.xml similarity index 63% rename from ruoyi-modules/ruoyi-system/pom.xml rename to bateraom-cloud-modules/bateraom-cloud-system/pom.xml index 0fc6d5513..9aaaf108c 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/bateraom-cloud-modules/bateraom-cloud-system/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + bateraom-cloud-modules ${revision} 4.0.0 - ruoyi-system + bateraom-cloud-system system系统模块 @@ -19,85 +19,85 @@ org.dromara - ruoyi-common-core + bateraom-cloud-common-core org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis org.dromara - ruoyi-common-translation + bateraom-cloud-common-translation org.dromara - ruoyi-common-oss + bateraom-cloud-common-oss org.dromara - ruoyi-common-log + bateraom-cloud-common-log org.dromara - ruoyi-common-excel + bateraom-cloud-common-excel org.dromara - ruoyi-common-sms + bateraom-cloud-common-sms org.dromara - ruoyi-common-tenant + bateraom-cloud-common-tenant org.dromara - ruoyi-common-security + bateraom-cloud-common-security org.dromara - ruoyi-common-web + bateraom-cloud-common-web org.dromara - ruoyi-common-idempotent + bateraom-cloud-common-idempotent org.dromara - ruoyi-common-sensitive + bateraom-cloud-common-sensitive org.dromara - ruoyi-common-encrypt + bateraom-cloud-common-encrypt org.dromara - ruoyi-common-websocket + bateraom-cloud-common-websocket org.dromara - ruoyi-common-sse + bateraom-cloud-common-sse diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysClientController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysClientController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysOssController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysOssController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysPostController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysPostController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysUserController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/controller/system/SysUserController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysCache.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysCache.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysClient.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysClient.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysConfig.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDept.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDept.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDictData.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDictData.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDictType.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysDictType.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysLogininfor.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysLogininfor.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysMenu.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysMenu.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysNotice.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysNotice.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOperLog.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOperLog.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOss.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOss.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOssConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysOssConfig.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysPost.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysPost.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRole.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRole.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRoleDept.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRoleDept.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysSocial.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysSocial.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysTenant.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysTenant.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUser.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUser.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserOnline.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserOnline.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserPost.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserPost.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserRole.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/SysUserRole.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysClientService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysClientService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysConfigService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDataScopeService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDeptService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDeptService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDictDataService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDictDataService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysLogininforService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysLogininforService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysMenuService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysMenuService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysNoticeService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysNoticeService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOperLogService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOperLogService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOssService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysOssService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysPermissionService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysPermissionService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysPostService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysPostService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysRoleService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysRoleService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysSocialService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysSocialService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysTenantService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysTenantService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysUserService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/ISysUserService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysClientMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOssConfigMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysOssMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysSocialMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysSocialMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysTenantMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysTenantMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/bateraom-cloud-modules/bateraom-cloud-workflow/pom.xml similarity index 68% rename from ruoyi-modules/ruoyi-workflow/pom.xml rename to bateraom-cloud-modules/bateraom-cloud-workflow/pom.xml index d195fafa3..4bcc38e3d 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/bateraom-cloud-modules/bateraom-cloud-workflow/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + bateraom-cloud-modules ${revision} ../pom.xml 4.0.0 jar - ruoyi-workflow + bateraom-cloud-workflow 工作流模块 @@ -20,55 +20,55 @@ org.dromara - ruoyi-common-sse + bateraom-cloud-common-sse org.dromara - ruoyi-common-doc + bateraom-cloud-common-doc org.dromara - ruoyi-common-mail + bateraom-cloud-common-mail org.dromara - ruoyi-common-sms + bateraom-cloud-common-sms org.dromara - ruoyi-common-mybatis + bateraom-cloud-common-mybatis org.dromara - ruoyi-common-web + bateraom-cloud-common-web org.dromara - ruoyi-common-log + bateraom-cloud-common-log org.dromara - ruoyi-common-idempotent + bateraom-cloud-common-idempotent org.dromara - ruoyi-common-excel + bateraom-cloud-common-excel org.dromara - ruoyi-common-translation + bateraom-cloud-common-translation org.dromara - ruoyi-common-tenant + bateraom-cloud-common-tenant org.dromara - ruoyi-common-security + bateraom-cloud-common-security org.dromara.warm diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermission.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermission.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermission.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermission.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml rename to bateraom-cloud-modules/bateraom-cloud-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml diff --git a/ruoyi-modules/pom.xml b/bateraom-cloud-modules/pom.xml similarity index 54% rename from ruoyi-modules/pom.xml rename to bateraom-cloud-modules/pom.xml index daff497a0..ab622447d 100644 --- a/ruoyi-modules/pom.xml +++ b/bateraom-cloud-modules/pom.xml @@ -3,25 +3,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus + bateraom-cloud org.dromara ${revision} 4.0.0 - ruoyi-demo - ruoyi-generator - ruoyi-job - ruoyi-system - ruoyi-workflow + bateraom-cloud-demo + bateraom-cloud-generator + bateraom-cloud-job + bateraom-cloud-system + bateraom-cloud-workflow + bateraom-cloud-business - ruoyi-modules + bateraom-cloud-modules pom - ruoyi-modules 业务模块 + bateraom-cloud-modules 业务模块 diff --git a/pom.xml b/pom.xml index 21d163bae..a1f6a7085 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-vue-plus + bateraom-cloud ${revision} - RuoYi-Vue-Plus + Bateraom-Cloud https://gitee.com/dromara/RuoYi-Vue-Plus - Dromara RuoYi-Vue-Plus多租户管理系统 + bateraom-cloud 品栈云仓 5.3.1-BETA @@ -139,7 +139,7 @@ org.dromara - ruoyi-common-bom + bateraom-cloud-common-bom ${revision} pom import @@ -333,32 +333,32 @@ org.dromara - ruoyi-system + bateraom-cloud-system ${revision} org.dromara - ruoyi-job + bateraom-cloud-job ${revision} org.dromara - ruoyi-generator + bateraom-cloud-generator ${revision} org.dromara - ruoyi-demo + bateraom-cloud-demo ${revision} org.dromara - ruoyi-workflow + bateraom-cloud-workflow ${revision} @@ -366,10 +366,10 @@ - ruoyi-admin - ruoyi-common - ruoyi-extend - ruoyi-modules + bateraom-cloud-admin + bateraom-cloud-common + bateraom-cloud-extend + bateraom-cloud-modules pom diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index 2930fd0b0..000000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - ruoyi-vue-plus - org.dromara - ${revision} - - 4.0.0 - - - ruoyi-common-bom - ruoyi-common-social - ruoyi-common-core - ruoyi-common-doc - ruoyi-common-excel - ruoyi-common-idempotent - ruoyi-common-job - ruoyi-common-log - ruoyi-common-mail - ruoyi-common-mybatis - ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-redis - ruoyi-common-satoken - ruoyi-common-security - ruoyi-common-sms - ruoyi-common-web - ruoyi-common-translation - ruoyi-common-sensitive - ruoyi-common-json - ruoyi-common-encrypt - ruoyi-common-tenant - ruoyi-common-websocket - ruoyi-common-sse - - - ruoyi-common - pom - - - common 通用模块 - - - diff --git a/script/bin/ry.bat b/script/bin/ry.bat index ea98cbed0..1b92f96ac 100644 --- a/script/bin/ry.bat +++ b/script/bin/ry.bat @@ -2,7 +2,7 @@ rem 使用者应根据自身平台编码自行转换 防止乱码 例如 win使 @echo off rem jar平级目录 -set AppName=ruoyi-admin.jar +set AppName=bateraom-cloud-admin.jar rem JVM参数 set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC" diff --git a/script/bin/ry.sh b/script/bin/ry.sh index a6f5d9cba..abb06ea52 100644 --- a/script/bin/ry.sh +++ b/script/bin/ry.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=ruoyi-admin.jar +AppName=bateraom-cloud-admin.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC" diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 35979cb3a..0b7662d48 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -98,50 +98,50 @@ services: network_mode: "host" ruoyi-server1: - image: ruoyi/ruoyi-server:5.3.1-BETA - container_name: ruoyi-server1 + image: bateraom-cloud/bateraom-cloud-server:5.3.1-BETA + container_name: bateraom-cloud-server1 environment: # 时区上海 TZ: Asia/Shanghai SERVER_PORT: 8080 volumes: # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ + - /docker/server1/logs/:/bateraom-cloud/server/logs/ # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# - /docker/skywalking/agent/:/bateraom-cloud/skywalking/agent privileged: true network_mode: "host" ruoyi-server2: - image: ruoyi/ruoyi-server:5.3.1-BETA - container_name: ruoyi-server2 + image: bateraom-cloud/bateraom-cloud-server:5.3.1-BETA + container_name: bateraom-cloud-server2 environment: # 时区上海 TZ: Asia/Shanghai SERVER_PORT: 8081 volumes: # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ + - /docker/server2/logs/:/bateraom-cloud/server/logs/ # skywalking 探针 -# - /docker/skywalking/agent/:/ruoyi/skywalking/agent +# - /docker/skywalking/agent/:/bateraom-cloud/skywalking/agent privileged: true network_mode: "host" ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:5.3.1-BETA - container_name: ruoyi-monitor-admin + image: bateraom-cloud/bateraom-cloud-monitor-admin:5.3.1-BETA + container_name: bateraom-cloud-monitor-admin environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs + - /docker/monitor/logs/:/bateraom-cloud/monitor/logs privileged: true network_mode: "host" ruoyi-snailjob-server: - image: ruoyi/ruoyi-snailjob-server:5.3.1-BETA - container_name: ruoyi-snailjob-server + image: bateraom-cloud/bateraom-cloud-snailjob-server:5.3.1-BETA + container_name: bateraom-cloud-snailjob-server environment: # 时区上海 TZ: Asia/Shanghai @@ -149,6 +149,6 @@ services: - "8800:8800" - "17888:17888" volumes: - - /docker/snailjob/logs/:/ruoyi/snailjob/logs + - /docker/snailjob/logs/:/bateraom-cloud/snailjob/logs privileged: true network_mode: "host"