diff --git a/bin/run.bat b/bin/run.bat index 41efbd0..9785860 100644 --- a/bin/run.bat +++ b/bin/run.bat @@ -1,14 +1,14 @@ @echo off echo. -echo [信息] 使用Jar命令运行Web工程。 +echo [锟斤拷息] 使锟斤拷Jar锟斤拷锟斤拷锟斤拷锟斤拷Web锟斤拷锟教★拷 echo. cd %~dp0 -cd ../ruoyi-admin/target +cd ../conflux-admin/target set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -jar %JAVA_OPTS% ruoyi-admin.jar +java -jar %JAVA_OPTS% conflux-admin.jar cd bin pause \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/conflux-admin/pom.xml similarity index 93% rename from ruoyi-admin/pom.xml rename to conflux-admin/pom.xml index 4034825..580ede6 100644 --- a/ruoyi-admin/pom.xml +++ b/conflux-admin/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jar - ruoyi-admin + conflux-admin web鏈嶅姟鍏ュ彛 @@ -46,19 +46,19 @@ com.ruoyi - ruoyi-framework + conflux-framework com.ruoyi - ruoyi-quartz + conflux-quartz com.ruoyi - ruoyi-generator + conflux-generator diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/conflux-admin/src/main/java/com/ruoyi/RuoYiApplication.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to conflux-admin/src/main/java/com/ruoyi/RuoYiApplication.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/conflux-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to conflux-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java b/conflux-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java rename to conflux-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/conflux-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java rename to conflux-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties b/conflux-admin/src/main/resources/META-INF/spring-devtools.properties similarity index 100% rename from ruoyi-admin/src/main/resources/META-INF/spring-devtools.properties rename to conflux-admin/src/main/resources/META-INF/spring-devtools.properties diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/conflux-admin/src/main/resources/application-druid.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-druid.yml rename to conflux-admin/src/main/resources/application-druid.yml diff --git a/ruoyi-admin/src/main/resources/application.yml b/conflux-admin/src/main/resources/application.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application.yml rename to conflux-admin/src/main/resources/application.yml diff --git a/ruoyi-admin/src/main/resources/banner.txt b/conflux-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to conflux-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/conflux-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to conflux-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/logback.xml b/conflux-admin/src/main/resources/logback.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback.xml rename to conflux-admin/src/main/resources/logback.xml diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/conflux-admin/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml rename to conflux-admin/src/main/resources/mybatis/mybatis-config.xml diff --git a/ruoyi-common/pom.xml b/conflux-common/pom.xml similarity index 98% rename from ruoyi-common/pom.xml rename to conflux-common/pom.xml index 4f3a91c..d31e2f3 100644 --- a/ruoyi-common/pom.xml +++ b/conflux-common/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-common + conflux-common common閫氱敤宸ュ叿 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/Anonymous.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/DataScope.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/DataScope.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/DataSource.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/DataSource.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/Excel.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/Excel.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/Excels.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/Excels.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/Log.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/Log.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/conflux-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to conflux-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/conflux-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to conflux-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/conflux-common/src/main/java/com/ruoyi/common/constant/Constants.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to conflux-common/src/main/java/com/ruoyi/common/constant/Constants.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/conflux-common/src/main/java/com/ruoyi/common/constant/GenConstants.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to conflux-common/src/main/java/com/ruoyi/common/constant/GenConstants.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/conflux-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to conflux-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/conflux-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to conflux-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/conflux-common/src/main/java/com/ruoyi/common/constant/UserConstants.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to conflux-common/src/main/java/com/ruoyi/common/constant/UserConstants.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/conflux-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to conflux-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/R.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/R.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/conflux-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to conflux-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java b/conflux-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java rename to conflux-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/conflux-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to conflux-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/conflux-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java rename to conflux-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java b/conflux-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java rename to conflux-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/conflux-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to conflux-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/conflux-common/src/main/java/com/ruoyi/common/core/text/Convert.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java rename to conflux-common/src/main/java/com/ruoyi/common/core/text/Convert.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/conflux-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to conflux-common/src/main/java/com/ruoyi/common/core/text/StrFormatter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/conflux-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/conflux-common/src/main/java/com/ruoyi/common/enums/BusinessType.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/BusinessType.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/conflux-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/conflux-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/conflux-common/src/main/java/com/ruoyi/common/enums/LimitType.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/LimitType.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/conflux-common/src/main/java/com/ruoyi/common/enums/OperatorType.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/OperatorType.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/conflux-common/src/main/java/com/ruoyi/common/enums/UserStatus.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to conflux-common/src/main/java/com/ruoyi/common/enums/UserStatus.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/GlobalException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/GlobalException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/ServiceException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/ServiceException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/UtilException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/UtilException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/file/FileException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/file/FileException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/user/UserException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/user/UserException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/conflux-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to conflux-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/conflux-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to conflux-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/conflux-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to conflux-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/conflux-common/src/main/java/com/ruoyi/common/filter/XssFilter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to conflux-common/src/main/java/com/ruoyi/common/filter/XssFilter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/conflux-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to conflux-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java b/conflux-common/src/main/java/com/ruoyi/common/utils/Arith.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/Arith.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/DateUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/DateUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/DictUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/DictUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/conflux-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/LogUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/LogUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/LogUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/PageUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/PageUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/StringUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/StringUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/conflux-common/src/main/java/com/ruoyi/common/utils/Threads.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/Threads.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/conflux-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/conflux-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/conflux-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/conflux-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/conflux-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/conflux-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/conflux-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/conflux-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/conflux-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/conflux-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/uuid/Seq.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/conflux-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to conflux-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/conflux-common/src/main/java/com/ruoyi/common/xss/Xss.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to conflux-common/src/main/java/com/ruoyi/common/xss/Xss.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/conflux-common/src/main/java/com/ruoyi/common/xss/XssValidator.java similarity index 100% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to conflux-common/src/main/java/com/ruoyi/common/xss/XssValidator.java diff --git a/ruoyi-framework/pom.xml b/conflux-framework/pom.xml similarity index 94% rename from ruoyi-framework/pom.xml rename to conflux-framework/pom.xml index 562e4c3..3f1d309 100644 --- a/ruoyi-framework/pom.xml +++ b/conflux-framework/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-framework + conflux-framework framework妗嗘灦鏍稿績 @@ -56,7 +56,7 @@ com.ruoyi - ruoyi-system + conflux-system diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/conflux-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to conflux-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/conflux-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to conflux-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/conflux-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to conflux-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/conflux-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to conflux-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/ServerConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/conflux-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to conflux-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/conflux-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to conflux-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/conflux-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to conflux-framework/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/conflux-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to conflux-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/conflux-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to conflux-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/conflux-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to conflux-framework/src/main/java/com/ruoyi/framework/manager/AsyncManager.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/conflux-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to conflux-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/conflux-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to conflux-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/conflux-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to conflux-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/conflux-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to conflux-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/conflux-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to conflux-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/conflux-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java similarity index 100% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java rename to conflux-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java diff --git a/ruoyi-generator/pom.xml b/conflux-generator/pom.xml similarity index 90% rename from ruoyi-generator/pom.xml rename to conflux-generator/pom.xml index 51d13b7..82d29ff 100644 --- a/ruoyi-generator/pom.xml +++ b/conflux-generator/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-generator + conflux-generator generator浠g爜鐢熸垚 @@ -32,7 +32,7 @@ com.ruoyi - ruoyi-common + conflux-common diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/conflux-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to conflux-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/conflux-generator/src/main/java/com/ruoyi/generator/controller/GenController.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to conflux-generator/src/main/java/com/ruoyi/generator/controller/GenController.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/conflux-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to conflux-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/conflux-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to conflux-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/conflux-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to conflux-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/conflux-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to conflux-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/conflux-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to conflux-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/conflux-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to conflux-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/conflux-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to conflux-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/conflux-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to conflux-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/conflux-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to conflux-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/conflux-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to conflux-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/conflux-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to conflux-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java diff --git a/ruoyi-generator/src/main/resources/generator.yml b/conflux-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-generator/src/main/resources/generator.yml rename to conflux-generator/src/main/resources/generator.yml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/conflux-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to conflux-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/conflux-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to conflux-generator/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/conflux-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to conflux-generator/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/conflux-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to conflux-generator/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/conflux-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to conflux-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/conflux-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to conflux-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/conflux-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to conflux-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/conflux-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to conflux-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/conflux-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to conflux-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/conflux-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to conflux-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/conflux-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to conflux-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/conflux-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to conflux-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/conflux-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to conflux-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/conflux-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to conflux-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/conflux-generator/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt rename to conflux-generator/src/main/resources/vm/vue/v3/readme.txt diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/conflux-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to conflux-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-quartz/pom.xml b/conflux-quartz/pom.xml similarity index 90% rename from ruoyi-quartz/pom.xml rename to conflux-quartz/pom.xml index b8e7d9e..8c57942 100644 --- a/ruoyi-quartz/pom.xml +++ b/conflux-quartz/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-quartz + conflux-quartz quartz瀹氭椂浠诲姟 @@ -32,7 +32,7 @@ com.ruoyi - ruoyi-common + conflux-common diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/conflux-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to conflux-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/conflux-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to conflux-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/conflux-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to conflux-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml diff --git a/ruoyi-system/pom.xml b/conflux-system/pom.xml similarity index 86% rename from ruoyi-system/pom.xml rename to conflux-system/pom.xml index e55e2a8..7388b3e 100644 --- a/ruoyi-system/pom.xml +++ b/conflux-system/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-system + conflux-system system绯荤粺妯″潡 @@ -20,7 +20,7 @@ com.ruoyi - ruoyi-common + conflux-common diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysConfig.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysConfig.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysNotice.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysNotice.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysPost.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysPost.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/conflux-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/conflux-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/conflux-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to conflux-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to conflux-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysPostService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysPostService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/conflux-system/src/main/java/com/ruoyi/system/service/ISysUserService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to conflux-system/src/main/java/com/ruoyi/system/service/ISysUserService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/conflux-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to conflux-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/conflux-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/conflux-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/conflux-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/conflux-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/conflux-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/conflux-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/conflux-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/conflux-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/conflux-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/conflux-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/conflux-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/conflux-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/conflux-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/conflux-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/conflux-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to conflux-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/pom.xml b/pom.xml index 6da98bf..ef25ab7 100644 --- a/pom.xml +++ b/pom.xml @@ -154,35 +154,35 @@ com.ruoyi - ruoyi-quartz + conflux-quartz ${ruoyi.version} com.ruoyi - ruoyi-generator + conflux-generator ${ruoyi.version} com.ruoyi - ruoyi-framework + conflux-framework ${ruoyi.version} com.ruoyi - ruoyi-system + conflux-system ${ruoyi.version} com.ruoyi - ruoyi-common + conflux-common ${ruoyi.version} @@ -190,12 +190,12 @@ - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator - ruoyi-common + conflux-admin + conflux-framework + conflux-system + conflux-quartz + conflux-generator + conflux-common pom diff --git a/ry.bat b/ry.bat index ac1e437..37f57cb 100644 --- a/ry.bat +++ b/ry.bat @@ -1,21 +1,21 @@ @echo off -rem jar平级目录 -set AppName=ruoyi-admin.jar +rem jar平锟斤拷目录 +set AppName=conflux-admin.jar -rem JVM参数 +rem JVM锟斤拷锟斤拷 set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" ECHO. - ECHO. [1] 启动%AppName% - ECHO. [2] 关闭%AppName% - ECHO. [3] 重启%AppName% - ECHO. [4] 启动状态 %AppName% - ECHO. [5] 退 出 + ECHO. [1] 锟斤拷锟斤拷%AppName% + ECHO. [2] 锟截憋拷%AppName% + ECHO. [3] 锟斤拷锟斤拷%AppName% + ECHO. [4] 锟斤拷锟斤拷状态 %AppName% + ECHO. [5] 锟斤拷 锟斤拷 ECHO. -ECHO.请输入选择项目的序号: +ECHO.锟斤拷锟斤拷锟斤拷选锟斤拷锟斤拷目锟斤拷锟斤拷锟: set /p ID= IF "%id%"=="1" GOTO start IF "%id%"=="2" GOTO stop @@ -35,11 +35,11 @@ PAUSE start javaw %JVM_OPTS% -jar %AppName% -echo starting…… +echo starting锟斤拷锟斤拷 echo Start %AppName% success... goto:eof -rem 函数stop通过jps命令查找pid并结束进程 +rem 锟斤拷锟斤拷stop通锟斤拷jps锟斤拷锟斤拷锟斤拷锟絧id锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷 :stop for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( set pid=%%a @@ -48,7 +48,7 @@ rem if not defined pid (echo process %AppName% does not exists) else ( echo prepare to kill %image_name% echo start kill %pid% ... - rem 根据进程ID,kill进程 + rem 锟斤拷锟捷斤拷锟斤拷ID锟斤拷kill锟斤拷锟斤拷 taskkill /f /pid %pid% ) goto:eof