diff --git a/pom.xml b/pom.xml index f3498ebf0..42a9b9711 100644 --- a/pom.xml +++ b/pom.xml @@ -14,42 +14,17 @@ 5.1.0 - 3.1.5 UTF-8 UTF-8 17 - 3.0.2 - 2.2.0 - 0.15.0 - 5.2.3 - 3.3.2 - 2.3 - 1.37.0 - 3.5.4 - 3.9.1 - 5.8.22 - 4.10.0 - 3.1.7 - 3.24.1 - 2.2.5 - 4.2.0 - 2.14.2 - 4.3.3 + ${java.version} + ${java.version} + @ + 1.18.30 1.3.5 0.2.0 - 1.18.30 - 1.76 - 1.16.5 - - 2.7.0 - - - 1.12.540 - - 2.2.0 - - 1.2.83 - + 3.1.5 + 0.15.0 3.2.2 3.2.2 @@ -89,264 +64,15 @@ - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - cn.hutool - hutool-bom - ${hutool.version} - pom - import - - - - - me.zhyd.oauth - JustAuth - ${justauth.version} - - - - - org.dromara - ruoyi-common-bom - ${revision} - pom - import - - - - org.springdoc - springdoc-openapi-starter-webmvc-api - ${springdoc.version} - - - - com.github.therapi - therapi-runtime-javadoc - ${therapi-javadoc.version} - - - - org.projectlombok - lombok - ${lombok.version} - - - - org.apache.poi - poi - ${poi.version} - - - org.apache.poi - poi-ooxml - ${poi.version} - - - com.alibaba - easyexcel - ${easyexcel.version} - - - org.apache.poi - poi-ooxml-schemas - - - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - cn.dev33 - sa-token-spring-boot3-starter - ${satoken.version} - - - - cn.dev33 - sa-token-jwt - ${satoken.version} - - - cn.hutool - hutool-all - - - - - cn.dev33 - sa-token-core - ${satoken.version} - - - - - com.baomidou - dynamic-datasource-spring-boot3-starter - ${dynamic-ds.version} - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${spring-boot.mybatis} - - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} - - - - com.baomidou - mybatis-plus-annotation - ${mybatis-plus.version} - - - - - p6spy - p6spy - ${p6spy.version} - - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - - org.dromara.sms4j - sms4j-spring-boot-starter - ${sms4j.version} - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - - com.baomidou - lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - - - tech.powerjob - powerjob-worker-spring-boot-starter - ${powerjob.version} - - - tech.powerjob - powerjob-official-processors - ${powerjob.version} - - - - com.alibaba - transmittable-thread-local - ${alibaba-ttl.version} - - - - - org.bouncycastle - bcprov-jdk15to18 - ${bouncycastle.version} - - - - io.github.linpeilie - mapstruct-plus-spring-boot-starter - ${mapstruct-plus.version} - - - - - org.lionsoul - ip2region - ${ip2region.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - org.dromara - ruoyi-system - ${revision} - - - - org.dromara - ruoyi-job - ${revision} - - - - org.dromara - ruoyi-generator - ${revision} - - - - org.dromara - ruoyi-demo - ${revision} - - - - ruoyi-admin ruoyi-common ruoyi-extend ruoyi-modules + ruoyi-dependencies + ruoyi-front pom @@ -404,32 +130,6 @@ exclude - - - org.codehaus.mojo - flatten-maven-plugin - ${flatten-maven-plugin.version} - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 81933591e..378d66417 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -14,7 +14,17 @@ web服务入口 - + + + + org.dromara + ruoyi-dependencies + ${revision} + pom + import + + + @@ -53,7 +63,10 @@ org.dromara ruoyi-system - + + org.dromara + ruoyi-auth + org.dromara ruoyi-job diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/MailController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/MailController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisCacheController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisCacheController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisLockController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisLockController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisPubSubController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisPubSubController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/SmsController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/SmsController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestBatchController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestBatchController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestDemoController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestDemoController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestEncryptController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestEncryptController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestExcelController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestExcelController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestI18nController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestI18nController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestSensitiveController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestSensitiveController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/TestTreeController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/TestTreeController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/WeSocketController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WeSocketController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/WeSocketController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/package-info.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/package-info.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java similarity index 100% rename from ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java rename to ruoyi-admin/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-admin/src/main/java/org/dromara/generator/controller/GenController.java similarity index 100% rename from ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java rename to ruoyi-admin/src/main/java/org/dromara/generator/controller/GenController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/CacheController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/CacheController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysClientController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysClientController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysConfigController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDeptController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDeptController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDictDataController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDictDataController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysMenuController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysMenuController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysNoticeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysNoticeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysOssController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysOssController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysPostController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysPostController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysProfileController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysProfileController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysRoleController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysRoleController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysSocialController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysSocialController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysTenantController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysTenantController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysUserController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to ruoyi-admin/src/main/java/org/dromara/system/controller/system/SysUserController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 86452e53d..68f2a3b02 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -29,12 +29,12 @@ import org.dromara.system.service.ISysClientService; import org.dromara.system.service.ISysConfigService; import org.dromara.system.service.ISysSocialService; import org.dromara.system.service.ISysTenantService; -import org.dromara.web.domain.vo.LoginTenantVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.domain.vo.TenantListVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; -import org.dromara.web.service.SysRegisterService; +import org.dromara.auth.domain.vo.LoginTenantVo; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.domain.vo.TenantListVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; +import org.dromara.auth.service.SysRegisterService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 45493d3e9..8a8a9c431 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -41,5 +41,15 @@ common 通用模块 - + + + + org.dromara + ruoyi-dependencies + ${revision} + pom + import + + + diff --git a/ruoyi-dependencies/pom.xml b/ruoyi-dependencies/pom.xml new file mode 100644 index 000000000..b7190475a --- /dev/null +++ b/ruoyi-dependencies/pom.xml @@ -0,0 +1,345 @@ + + 4.0.0 + + org.dromara + ruoyi-vue-plus + ${revision} + + ruoyi-dependencies + pom + + + 2.2 + 3.0.2 + 2.2.0 + 5.2.3 + 3.3.2 + 2.3 + 1.37.0 + 3.5.4 + 3.9.1 + 5.8.22 + 4.10.0 + 3.1.7 + 3.24.1 + 2.2.5 + 4.2.0 + 2.14.2 + 4.3.3 + 1.76 + 1.16.5 + + 2.7.0 + + + 1.12.540 + + 2.2.0 + + 1.2.83 + 1.3.0 + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + org.yaml + snakeyaml + + + + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + + + me.zhyd.oauth + JustAuth + ${justauth.version} + + + + + org.dromara + ruoyi-common-bom + ${revision} + pom + import + + + + org.springdoc + springdoc-openapi-starter-webmvc-api + ${springdoc.version} + + + + com.github.therapi + therapi-runtime-javadoc + ${therapi-javadoc.version} + + + + org.projectlombok + lombok + ${lombok.version} + + + + org.apache.poi + poi + ${poi.version} + + + org.apache.poi + poi-ooxml + ${poi.version} + + + com.alibaba + easyexcel + ${easyexcel.version} + + + org.apache.poi + poi-ooxml-schemas + + + + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + + + cn.dev33 + sa-token-spring-boot3-starter + ${satoken.version} + + + + cn.dev33 + sa-token-jwt + ${satoken.version} + + + cn.hutool + hutool-all + + + + + cn.dev33 + sa-token-core + ${satoken.version} + + + + + com.baomidou + dynamic-datasource-spring-boot3-starter + ${dynamic-ds.version} + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${spring-boot.mybatis} + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-annotation + ${mybatis-plus.version} + + + + + p6spy + p6spy + ${p6spy.version} + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + + + org.dromara.sms4j + sms4j-spring-boot-starter + ${sms4j.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + + + tech.powerjob + powerjob-worker-spring-boot-starter + ${powerjob.version} + + + tech.powerjob + powerjob-official-processors + ${powerjob.version} + + + + com.alibaba + transmittable-thread-local + ${alibaba-ttl.version} + + + + + org.bouncycastle + bcprov-jdk15to18 + ${bouncycastle.version} + + + + io.github.linpeilie + mapstruct-plus-spring-boot-starter + ${mapstruct-plus.version} + + + + + org.lionsoul + ip2region + ${ip2region.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.dromara + ruoyi-system + ${revision} + + + + org.dromara + ruoyi-job + ${revision} + + + + org.dromara + ruoyi-generator + ${revision} + + + + org.dromara + ruoyi-demo + ${revision} + + + org.dromara + ruoyi-auth + ${revision} + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + ${project.build.directory} + ${project.artifactId}-${project.version}.pom + + + + flatten + process-resources + + flatten + + + bom + + + + flatten.clean + clean + + clean + + + + + + + diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index f5348cc13..1a43ca72c 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -15,5 +15,15 @@ ruoyi-monitor-admin ruoyi-powerjob-server - + + + + org.dromara + ruoyi-dependencies + ${revision} + pom + import + + + diff --git a/ruoyi-extend/ruoyi-powerjob-server/pom.xml b/ruoyi-extend/ruoyi-powerjob-server/pom.xml index 72b23789a..efca9436a 100644 --- a/ruoyi-extend/ruoyi-powerjob-server/pom.xml +++ b/ruoyi-extend/ruoyi-powerjob-server/pom.xml @@ -12,6 +12,7 @@ 2.7.17 2.7.11 + 4.3.3 diff --git a/ruoyi-front/README.md b/ruoyi-front/README.md new file mode 100644 index 000000000..b5f8efe25 --- /dev/null +++ b/ruoyi-front/README.md @@ -0,0 +1,2 @@ + # 前台API +> 主要对外开放的前台api模块，比如商城方面（商品列表、商品搜索、商品详情等）、会员（注册、登录、注销会员中心等），购物车等功能API，当然配套应该针对搜索seo友好的前端ui项目。 \ No newline at end of file diff --git a/ruoyi-front/pom.xml b/ruoyi-front/pom.xml new file mode 100644 index 000000000..c9ff55559 --- /dev/null +++ b/ruoyi-front/pom.xml @@ -0,0 +1,144 @@ + + 4.0.0 + + org.dromara + ruoyi-vue-plus + ${revision} + + + ruoyi-front + jar + + + + org.dromara + ruoyi-dependencies + ${revision} + pom + import + + + + + + + + com.mysql + mysql-connector-j + + + + com.oracle.database.jdbc + ojdbc8 + + + + org.postgresql + postgresql + + + + com.microsoft.sqlserver + mssql-jdbc + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-social + + + + + org.dromara + ruoyi-system + + + org.dromara + ruoyi-auth + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + org.dromara + ruoyi-demo + + + + de.codecentric + spring-boot-admin-starter-client + + + + org.springframework.boot + spring-boot-starter-test + test + + + + me.zhyd.oauth + JustAuth + + + + + + + + + + + + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + ${project.artifactId} + + + + + + diff --git a/ruoyi-front/src/main/java/org/dromara/FrontApplication.java b/ruoyi-front/src/main/java/org/dromara/FrontApplication.java new file mode 100644 index 000000000..9c3f43a79 --- /dev/null +++ b/ruoyi-front/src/main/java/org/dromara/FrontApplication.java @@ -0,0 +1,15 @@ +package org.dromara; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; + +@SpringBootApplication +public class FrontApplication { + public static void main(String[] args) { + SpringApplication application = new SpringApplication(FrontApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Front启动成功 ლ(´ڡ`ლ)ﾞ"); + } +} diff --git a/ruoyi-front/src/main/java/org/dromara/FrontServletInitializer.java b/ruoyi-front/src/main/java/org/dromara/FrontServletInitializer.java new file mode 100644 index 000000000..559884105 --- /dev/null +++ b/ruoyi-front/src/main/java/org/dromara/FrontServletInitializer.java @@ -0,0 +1,13 @@ +package org.dromara; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class FrontServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(FrontApplication.class); + } + +} diff --git a/ruoyi-front/src/main/java/org/dromara/front/controller/IndexController.java b/ruoyi-front/src/main/java/org/dromara/front/controller/IndexController.java new file mode 100644 index 000000000..b6e41dc4a --- /dev/null +++ b/ruoyi-front/src/main/java/org/dromara/front/controller/IndexController.java @@ -0,0 +1,30 @@ +package org.dromara.front.controller; +import cn.dev33.satoken.annotation.SaIgnore; +import org.dromara.common.core.config.RuoYiConfig; +import org.dromara.common.core.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +/** + * 首页 + * + * @author Lion Li + */ +@SaIgnore +@RequiredArgsConstructor +@RestController +public class IndexController { + + /** + * 系统基础配置 + */ + private final RuoYiConfig ruoyiConfig; + + /** + * 访问首页，提示语 + */ + @GetMapping("/") + public String index() { + return StringUtils.format("欢迎使用{}前台API，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + } +} diff --git a/ruoyi-front/src/main/resources/application-dev.yml b/ruoyi-front/src/main/resources/application-dev.yml new file mode 100644 index 000000000..b168542db --- /dev/null +++ b/ruoyi-front/src/main/resources/application-dev.yml @@ -0,0 +1,251 @@ +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: true + url: http://localhost:9090/admin + instance: + service-host-type: IP + username: ruoyi + password: 123456 + +--- # powerjob 配置 +powerjob: + worker: + # 如何开启调度中心请查看文档教程 + enabled: false + # 需要先在 powerjob 登录页执行应用注册后才能使用 + app-name: ruoyi-worker + enable-test-mode: false + max-appended-wf-context-length: 4096 + max-result-length: 4096 + # 28080 端口 随着主应用端口飘逸 避免集群冲突 + port: 2${server.port} + protocol: http + server-address: 127.0.0.1:7700 + store-strategy: disk + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: true + # 设置默认的数据源或者数据源组,默认值即为 master + primary: master + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 + master: + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true + username: root + password: root + # 从库数据源 + slave: + lazy: true + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true + username: + password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# hikari: +# connectionTestQuery: SELECT 1 FROM DUAL +# postgres: +# type: ${spring.datasource.type} +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间，默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 + maxLifetime: 1800000 + # 连接测试query（配置检测连接是否有效） + connectionTestQuery: SELECT 1 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: localhost + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码(如没有密码请注释掉) + # password: + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 4 + # Netty线程池数量 + nettyThreads: 8 + # 单节点配置 + singleServerConfig: + # 客户端名称 + clientName: ${ruoyi.name} + # 最小空闲连接数 + connectionMinimumIdleSize: 8 + # 连接池大小 + connectionPoolSize: 32 + # 连接空闲超时，单位：毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时，单位：毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + # 发送方，遵循RFC-822标准 + from: xxx@163.com + # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） + user: xxx@163.com + # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长，单位毫秒，缺省值不超时 + timeout: 0 + # Socket连接超时值，单位毫秒，缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://wind.kim/doc/start 文档地址 各个厂商可同时使用 +sms: + # 阿里云 dysmsapi.aliyuncs.com + alibaba: + #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置 + requestUrl: dysmsapi.aliyuncs.com + #阿里云的accessKey + accessKeyId: xxxxxxx + #阿里云的accessKeySecret + accessKeySecret: xxxxxxx + #短信签名 + signature: 测试 + tencent: + #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置 + requestUrl: sms.tencentcloudapi.com + #腾讯云的accessKey + accessKeyId: xxxxxxx + #腾讯云的accessKeySecret + accessKeySecret: xxxxxxx + #短信签名 + signature: 测试 + #短信sdkAppId + sdkAppId: appid + #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置 + territory: ap-guangzhou + + +--- # 三方授权 +justauth: + enabled: true + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab diff --git a/ruoyi-front/src/main/resources/application-prod.yml b/ruoyi-front/src/main/resources/application-prod.yml new file mode 100644 index 000000000..148b50e98 --- /dev/null +++ b/ruoyi-front/src/main/resources/application-prod.yml @@ -0,0 +1,253 @@ +--- # 临时文件存储位置 避免临时文件被系统清理报错 +spring.servlet.multipart.location: /ruoyi/server/temp + +--- # 监控中心配置 +spring.boot.admin.client: + # 增加客户端开关 + enabled: true + url: http://localhost:9090/admin + instance: + service-host-type: IP + username: ruoyi + password: 123456 + +--- # powerjob 配置 +powerjob: + worker: + # 如何开启调度中心请查看文档教程 + enabled: false + # 需要先在 powerjob 登录页执行应用注册后才能使用 + app-name: ruoyi-worker + enable-test-mode: false + max-appended-wf-context-length: 4096 + max-result-length: 4096 + # 28080 端口 随着主应用端口飘逸 避免集群冲突 + port: 2${server.port} + protocol: http + server-address: 127.0.0.1:7700 + store-strategy: disk + +--- # 数据源配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content + dynamic: + # 性能分析插件(有性能损耗 不建议生产环境使用) + p6spy: false + # 设置默认的数据源或者数据源组,默认值即为 master + primary: master + # 严格模式 匹配不到数据源则报错 + strict: true + datasource: + # 主库数据源 + master: + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 + # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true + username: root + password: root + # 从库数据源 + slave: + lazy: true + type: ${spring.datasource.type} + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true + username: + password: +# oracle: +# type: ${spring.datasource.type} +# driverClassName: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@//localhost:1521/XE +# username: ROOT +# password: root +# hikari: +# connectionTestQuery: SELECT 1 FROM DUAL +# postgres: +# type: ${spring.datasource.type} +# driverClassName: org.postgresql.Driver +# url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true +# username: root +# password: root +# sqlserver: +# type: ${spring.datasource.type} +# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true +# username: SA +# password: root + hikari: + # 最大连接池数量 + maxPoolSize: 20 + # 最小空闲线程数量 + minIdle: 10 + # 配置获取连接等待超时的时间 + connectionTimeout: 30000 + # 校验超时时间 + validationTimeout: 5000 + # 空闲连接存活最大时间，默认10分钟 + idleTimeout: 600000 + # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟 + maxLifetime: 1800000 + # 连接测试query（配置检测连接是否有效） + connectionTestQuery: SELECT 1 + # 多久检查一次连接的活性 + keepaliveTime: 30000 + +--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) +spring.data: + redis: + # 地址 + host: localhost + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: 0 + # 密码(如没有密码请注释掉) + # password: + # 连接超时时间 + timeout: 10s + # 是否开启ssl + ssl.enabled: false + +redisson: + # redis key前缀 + keyPrefix: + # 线程池数量 + threads: 16 + # Netty线程池数量 + nettyThreads: 32 + # 单节点配置 + singleServerConfig: + # 客户端名称 + clientName: ${ruoyi.name} + # 最小空闲连接数 + connectionMinimumIdleSize: 32 + # 连接池大小 + connectionPoolSize: 64 + # 连接空闲超时，单位：毫秒 + idleConnectionTimeout: 10000 + # 命令等待超时，单位：毫秒 + timeout: 3000 + # 发布和订阅连接池大小 + subscriptionConnectionPoolSize: 50 + +--- # mail 邮件发送 +mail: + enabled: false + host: smtp.163.com + port: 465 + # 是否需要用户名密码验证 + auth: true + # 发送方，遵循RFC-822标准 + from: xxx@163.com + # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） + user: xxx@163.com + # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） + pass: xxxxxxxxxx + # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 + starttlsEnable: true + # 使用SSL安全连接 + sslEnable: true + # SMTP超时时长，单位毫秒，缺省值不超时 + timeout: 0 + # Socket连接超时值，单位毫秒，缺省值不超时 + connectionTimeout: 0 + +--- # sms 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商 +# https://wind.kim/doc/start 文档地址 各个厂商可同时使用 +sms: + # 阿里云 dysmsapi.aliyuncs.com + alibaba: + #请求地址 默认为 dysmsapi.aliyuncs.com 如无特殊改变可以不用设置 + requestUrl: dysmsapi.aliyuncs.com + #阿里云的accessKey + accessKeyId: xxxxxxx + #阿里云的accessKeySecret + accessKeySecret: xxxxxxx + #短信签名 + signature: 测试 + tencent: + #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置 + requestUrl: sms.tencentcloudapi.com + #腾讯云的accessKey + accessKeyId: xxxxxxx + #腾讯云的accessKeySecret + accessKeySecret: xxxxxxx + #短信签名 + signature: 测试 + #短信sdkAppId + sdkAppId: appid + #地域信息默认为 ap-guangzhou 如无特殊改变可不用设置 + territory: ap-guangzhou + +--- # 三方授权 +justauth: + enabled: true + # 前端外网访问地址 + address: http://localhost:80 + type: + maxkey: + # maxkey 服务器地址 + # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据 + server-url: http://sso.maxkey.top + client-id: 876892492581044224 + client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8 + redirect-uri: ${justauth.address}/social-callback?source=maxkey + qq: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=qq + union-id: false + weibo: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=weibo + gitee: + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac + redirect-uri: ${justauth.address}/social-callback?source=gitee + dingtalk: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=dingtalk + baidu: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=baidu + csdn: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=csdn + coding: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=coding + coding-group-name: xx + oschina: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=oschina + alipay_wallet: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet + alipay-public-key: MIIB**************DAQAB + wechat_open: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_open + wechat_mp: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_mp + wechat_enterprise: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise + agent-id: 1000002 + gitlab: + client-id: 10**********6 + client-secret: 1f7d08**********5b7**********29e + redirect-uri: ${justauth.address}/social-callback?source=gitlab diff --git a/ruoyi-front/src/main/resources/application.yml b/ruoyi-front/src/main/resources/application.yml new file mode 100644 index 000000000..26bdcf109 --- /dev/null +++ b/ruoyi-front/src/main/resources/application.yml @@ -0,0 +1,258 @@ +# 项目相关配置 +ruoyi: + # 名称 + name: RuoYi-Front + # 版本 + version: ${revision} + # 版权年份 + copyrightYear: 2023 + +captcha: + enable: true + # 页面 <参数设置> 可开启关闭 验证码校验 + # 验证码类型 math 数组计算 char 字符验证 + type: MATH + # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰 + category: CIRCLE + # 数字验证码位数 + numberLength: 1 + # 字符验证码长度 + charLength: 4 + +# 开发环境配置 +server: + # 服务器的HTTP端口，默认为8080 + port: 8181 + servlet: + # 应用的访问路径 + context-path: / + # undertow 配置 + undertow: + # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的 + max-http-post-size: -1 + # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理 + # 每块buffer的空间大小,越小的空间被利用越充分 + buffer-size: 512 + # 是否分配的直接内存 + direct-buffers: true + threads: + # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程 + io: 8 + # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载 + worker: 256 + +# 日志配置 +logging: + level: + org.dromara: @logging.level@ + org.springframework: warn + tech.powerjob.worker.background: warn + config: classpath:logback-plus.xml + +# 用户配置 +user: + password: + # 密码最大错误次数 + maxRetryCount: 5 + # 密码锁定时间（默认10分钟） + lockTime: 10 + +# Spring配置 +spring: + application: + name: ${ruoyi.name} + # 资源信息 + messages: + # 国际化资源文件路径 + basename: i18n/messages + profiles: + active: @profiles.active@ + # 文件上传 + servlet: + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB + mvc: + format: + date-time: yyyy-MM-dd HH:mm:ss + jackson: + # 日期格式化 + date-format: yyyy-MM-dd HH:mm:ss + serialization: + # 格式化输出 + indent_output: false + # 忽略无法转换的对象 + fail_on_empty_beans: false + deserialization: + # 允许对象忽略json中不存在的属性 + fail_on_unknown_properties: false + +# Sa-Token配置 +sa-token: + # token名称 (同时也是cookie名称) + token-name: Authorization + # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) + is-concurrent: true + # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) + is-share: false + # jwt秘钥 + jwt-secret-key: abcdefghijklmnopqrstuvwxyz + +# security配置 +security: + # 排除路径 + excludes: + # 静态资源 + - /*.html + - /**/*.html + - /**/*.css + - /**/*.js + # 公共路径 + - /favicon.ico + - /error + # swagger 文档配置 + - /*/api-docs + - /*/api-docs/** + # actuator 监控配置 + - /actuator + - /actuator/** + +# 多租户配置 +tenant: + # 是否开启 + enable: true + # 排除表 + excludes: + - sys_menu + - sys_tenant + - sys_tenant_package + - sys_role_dept + - sys_role_menu + - sys_user_post + - sys_user_role + - sys_client + +# MyBatisPlus配置 +# https://baomidou.com/config/ +mybatis-plus: + # 不支持多包, 如有需要可在注解配置 或 提升扫包等级 + # 例如 com.**.**.mapper + mapperPackage: org.dromara.**.mapper + # 对应的 XML 文件位置 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: org.dromara.**.domain + global-config: + dbConfig: + # 主键类型 + # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID + # 如需改为自增 需要将数据库表全部设置为自增 + idType: ASSIGN_ID + +# 数据加密 +mybatis-encryptor: + # 是否开启加密 + enable: false + # 默认加密算法 + algorithm: BASE64 + # 编码方式 BASE64/HEX。默认BASE64 + encode: BASE64 + # 安全秘钥 对称算法的秘钥 如：AES，SM4 + password: + # 公私钥 非对称算法的公私钥 如：SM2，RSA + publicKey: + privateKey: + +# api接口加密 +api-decrypt: + # 是否开启全局接口加密 + enabled: true + # AES 加密头标识 + headerFlag: encrypt-key + # 公私钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换 + publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ== + privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y= + +springdoc: + api-docs: + # 是否开启接口文档 + enabled: true +# swagger-ui: +# # 持久化认证数据 +# persistAuthorization: true + info: + # 标题 + title: '标题：${ruoyi.name}多租户管理系统_接口文档' + # 描述 + description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' + # 版本 + version: '版本号: ${ruoyi.version}' + # 作者信息 + contact: + name: Lion Li + email: crazylionli@163.com + url: https://gitee.com/dromara/RuoYi-Vue-Plus + components: + # 鉴权方式配置 + security-schemes: + apiKey: + type: APIKEY + in: HEADER + name: ${sa-token.token-name} + #这里定义了两个分组，可定义多个，也可以不定义 + group-configs: + - group: 1.演示模块 + packages-to-scan: org.dromara.demo + - group: 2.通用模块 + packages-to-scan: org.dromara.web + - group: 3.系统模块 + packages-to-scan: org.dromara.system + - group: 4.代码生成模块 + packages-to-scan: org.dromara.generator + +# 防止XSS攻击 +xss: + # 过滤开关 + enabled: true + # 排除链接（多个用逗号分隔） + excludes: /system/notice + # 匹配链接 + urlPatterns: /system/*,/monitor/*,/tool/* + +# 全局线程池相关配置 +thread-pool: + # 是否开启线程池 + enabled: false + # 队列最大长度 + queueCapacity: 128 + # 线程池维护线程所允许的空闲时间 + keepAliveSeconds: 300 + +--- # 分布式锁 lock4j 全局配置 +lock4j: + # 获取分布式锁超时时间，默认为 3000 毫秒 + acquire-timeout: 3000 + # 分布式锁的超时时间，默认为 30 秒 + expire: 30000 + +--- # Actuator 监控端点的配置项 +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: ALWAYS + logfile: + external-file: ./logs/sys-console.log + +--- # websocket +websocket: + enabled: true + # 路径 + path: /resource/websocket + # 设置访问源地址 + allowedOrigins: '*' diff --git a/ruoyi-front/src/main/resources/banner.txt b/ruoyi-front/src/main/resources/banner.txt new file mode 100644 index 000000000..21b11262e --- /dev/null +++ b/ruoyi-front/src/main/resources/banner.txt @@ -0,0 +1,8 @@ +Application Version: ${revision} +Spring Boot Version: ${spring-boot.version} +__________ _____.___.__ ____ ____ __________.__ +\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ + | _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/ + | | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \ + |____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ > + \/ \/ \/ \/ diff --git a/ruoyi-front/src/main/resources/i18n/messages.properties b/ruoyi-front/src/main/resources/i18n/messages.properties new file mode 100644 index 000000000..c8635612a --- /dev/null +++ b/ruoyi-front/src/main/resources/i18n/messages.properties @@ -0,0 +1,58 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=对不起, 您的账号：{0} 不存在. +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 +user.password.delete=对不起，您的账号：{0} 已被删除 +user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +user.logout.success=退出成功 +length.not.valid=长度必须在{min}到{max}个字符之间 +user.username.not.blank=用户名不能为空 +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.username.length.valid=账户长度必须在{min}到{max}个字符之间 +user.password.not.blank=用户密码不能为空 +user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 +user.password.not.valid=* 5-50个字符 +user.email.not.valid=邮箱格式错误 +user.email.not.blank=邮箱不能为空 +user.phonenumber.not.blank=用户手机号不能为空 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.register.save.error=保存用户 {0} 失败，注册账号已存在 +user.register.error=注册失败，请联系系统管理人员 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 +auth.grant.type.error=认证权限类型错误 +auth.grant.type.blocked=认证权限类型已禁用 +auth.grant.type.not.blank=认证权限类型不能为空 +auth.clientid.not.blank=认证客户端id不能为空 +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] +repeat.submit.message=不允许重复提交，请稍候再试 +rate.limiter.message=访问过于频繁，请稍候再试 +sms.code.not.blank=短信验证码不能为空 +sms.code.retry.limit.count=短信验证码输入错误{0}次 +sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟 +email.code.not.blank=邮箱验证码不能为空 +email.code.retry.limit.count=邮箱验证码输入错误{0}次 +email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟 +xcx.code.not.blank=小程序code不能为空 +##租户 +tenant.number.not.blank=租户编号不能为空 +tenant.not.exists=对不起, 您的租户不存在，请联系管理员 +tenant.blocked=对不起，您的租户已禁用，请联系管理员 +tenant.expired=对不起，您的租户已过期，请联系管理员 diff --git a/ruoyi-front/src/main/resources/i18n/messages_en_US.properties b/ruoyi-front/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 000000000..355da8432 --- /dev/null +++ b/ruoyi-front/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1,58 @@ +#错误消息 +not.null=* Required fill in +user.jcaptcha.error=Captcha error +user.jcaptcha.expire=Captcha invalid +user.not.exists=Sorry, your account: {0} does not exist +user.password.not.match=User does not exist/Password error +user.password.retry.limit.count=Password input error {0} times +user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes +user.password.delete=Sorry, your account：{0} has been deleted +user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator +role.blocked=Role disabled，please contact administrators +user.logout.success=Exit successful +length.not.valid=The length must be between {min} and {max} characters +user.username.not.blank=Username cannot be blank +user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number +user.username.length.valid=Account length must be between {min} and {max} characters +user.password.not.blank=Password cannot be empty +user.password.length.valid=Password length must be between {min} and {max} characters +user.password.not.valid=* 5-50 characters +user.email.not.valid=Mailbox format error +user.email.not.blank=Mailbox cannot be blank +user.phonenumber.not.blank=Phone number cannot be blank +user.mobile.phone.number.not.valid=Phone number format error +user.login.success=Login successful +user.register.success=Register successful +user.register.save.error=Failed to save user {0}, The registered account already exists +user.register.error=Register failed, please contact system administrator +user.notfound=Please login again +user.forcelogout=The administrator is forced to exit，please login again +user.unknown.error=Unknown error, please login again +auth.grant.type.error=Auth grant type error +auth.grant.type.blocked=Auth grant type disabled +auth.grant.type.not.blank=Auth grant type cannot be blank +auth.clientid.not.blank=Auth clientid cannot be blank +##文件上传消息 +upload.exceed.maxSize=The uploaded file size exceeds the limit file size！
the maximum allowed file size is：{0}MB！ +upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters +##权限 +no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}] +no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}] +no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}] +no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}] +no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}] +no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}] +repeat.submit.message=Repeat submit is not allowed, please try again later +rate.limiter.message=Visit too frequently, please try again later +sms.code.not.blank=Sms code cannot be blank +sms.code.retry.limit.count=Sms code input error {0} times +sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {1} minutes +email.code.not.blank=Email code cannot be blank +email.code.retry.limit.count=Email code input error {0} times +email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes +xcx.code.not.blank=Mini program code cannot be blank +##租户 +tenant.number.not.blank=Tenant number cannot be blank +tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator +tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator +tenant.expired=Sorry, your tenant has expired. Please contact the administrator. diff --git a/ruoyi-front/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-front/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 000000000..c8635612a --- /dev/null +++ b/ruoyi-front/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1,58 @@ +#错误消息 +not.null=* 必须填写 +user.jcaptcha.error=验证码错误 +user.jcaptcha.expire=验证码已失效 +user.not.exists=对不起, 您的账号：{0} 不存在. +user.password.not.match=用户不存在/密码错误 +user.password.retry.limit.count=密码输入错误{0}次 +user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟 +user.password.delete=对不起，您的账号：{0} 已被删除 +user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员 +role.blocked=角色已封禁，请联系管理员 +user.logout.success=退出成功 +length.not.valid=长度必须在{min}到{max}个字符之间 +user.username.not.blank=用户名不能为空 +user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头 +user.username.length.valid=账户长度必须在{min}到{max}个字符之间 +user.password.not.blank=用户密码不能为空 +user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间 +user.password.not.valid=* 5-50个字符 +user.email.not.valid=邮箱格式错误 +user.email.not.blank=邮箱不能为空 +user.phonenumber.not.blank=用户手机号不能为空 +user.mobile.phone.number.not.valid=手机号格式错误 +user.login.success=登录成功 +user.register.success=注册成功 +user.register.save.error=保存用户 {0} 失败，注册账号已存在 +user.register.error=注册失败，请联系系统管理人员 +user.notfound=请重新登录 +user.forcelogout=管理员强制退出，请重新登录 +user.unknown.error=未知错误，请重新登录 +auth.grant.type.error=认证权限类型错误 +auth.grant.type.blocked=认证权限类型已禁用 +auth.grant.type.not.blank=认证权限类型不能为空 +auth.clientid.not.blank=认证客户端id不能为空 +##文件上传消息 +upload.exceed.maxSize=上传的文件大小超出限制的文件大小！
允许的文件最大大小是：{0}MB！ +upload.filename.exceed.length=上传的文件名最长{0}个字符 +##权限 +no.permission=您没有数据的权限，请联系管理员添加权限 [{0}] +no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}] +no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}] +no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}] +no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}] +no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}] +repeat.submit.message=不允许重复提交，请稍候再试 +rate.limiter.message=访问过于频繁，请稍候再试 +sms.code.not.blank=短信验证码不能为空 +sms.code.retry.limit.count=短信验证码输入错误{0}次 +sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟 +email.code.not.blank=邮箱验证码不能为空 +email.code.retry.limit.count=邮箱验证码输入错误{0}次 +email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟 +xcx.code.not.blank=小程序code不能为空 +##租户 +tenant.number.not.blank=租户编号不能为空 +tenant.not.exists=对不起, 您的租户不存在，请联系管理员 +tenant.blocked=对不起，您的租户已禁用，请联系管理员 +tenant.expired=对不起，您的租户已过期，请联系管理员 diff --git a/ruoyi-front/src/main/resources/ip2region.xdb b/ruoyi-front/src/main/resources/ip2region.xdb new file mode 100644 index 000000000..31f96a1fb Binary files /dev/null and b/ruoyi-front/src/main/resources/ip2region.xdb differ diff --git a/ruoyi-front/src/main/resources/logback-plus.xml b/ruoyi-front/src/main/resources/logback-plus.xml new file mode 100644 index 000000000..40fa33b7c --- /dev/null +++ b/ruoyi-front/src/main/resources/logback-plus.xml @@ -0,0 +1,129 @@ + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + ${log.path}/sys-console.log + + + ${log.path}/sys-console.%d{yyyy-MM-dd}.log + + 1 + + + ${log.pattern} + utf-8 + + + + INFO + + + + + + ${log.path}/sys-info.log + + + + ${log.path}/sys-info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/sys-error.log + + + + ${log.path}/sys-error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + 0 + + 512 + + + + + + + + 0 + + 512 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-front/src/main/resources/spy.properties b/ruoyi-front/src/main/resources/spy.properties new file mode 100644 index 000000000..abbd8931d --- /dev/null +++ b/ruoyi-front/src/main/resources/spy.properties @@ -0,0 +1,28 @@ +# p6spy 性能分析插件配置文件 +modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory +# 自定义日志打印 +logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger +#日志输出到控制台 +appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger +# 使用日志系统记录 sql +#appender=com.p6spy.engine.spy.appender.Slf4JLogger +# 设置 p6spy driver 代理 +#deregisterdrivers=true +# 取消JDBC URL前缀 +useprefix=true +# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset. +excludecategories=info,debug,result,commit,resultset +# 日期格式 +dateformat=yyyy-MM-dd HH:mm:ss +# SQL语句打印时间格式 +databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss +# 实际驱动可多个 +#driverlist=org.h2.Driver +# 是否开启慢SQL记录 +outagedetection=true +# 慢SQL记录标准 2 秒 +outagedetectioninterval=2 +# 是否过滤 Log +filter=true +# 过滤 Log 时所排除的 sql 关键字，以逗号分隔 +exclude=SELECT 1 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 4044916fb..a6c0ff449 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -14,6 +14,7 @@ ruoyi-generator ruoyi-job ruoyi-system + ruoyi-auth ruoyi-modules @@ -22,5 +23,15 @@ ruoyi-modules 业务模块 - + + + + org.dromara + ruoyi-dependencies + ${revision} + pom + import + + + diff --git a/ruoyi-modules/ruoyi-auth/pom.xml b/ruoyi-modules/ruoyi-auth/pom.xml new file mode 100644 index 000000000..d7c085a20 --- /dev/null +++ b/ruoyi-modules/ruoyi-auth/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + + org.dromara + ruoyi-modules + ${revision} + + + ruoyi-auth + jar + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-common-social + + + + + org.dromara + ruoyi-system + + + + + me.zhyd.oauth + JustAuth + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java similarity index 98% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java index 656447e89..0d52734d2 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java @@ -1,4 +1,4 @@ -package org.dromara.web.controller; +package org.dromara.auth.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; @@ -20,7 +20,7 @@ import org.dromara.sms4j.api.SmsBlend; import org.dromara.sms4j.api.entity.SmsResponse; import org.dromara.sms4j.core.factory.SmsFactory; import org.dromara.sms4j.provider.enumerate.SupplierType; -import org.dromara.web.domain.vo.CaptchaVo; +import org.dromara.auth.domain.vo.CaptchaVo; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java similarity index 88% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java index 664df1ee6..2a4c0bd42 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java similarity index 89% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java index 0a83acea6..fcfdcc3d2 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java index 834afe5a1..e4bea143d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java similarity index 90% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java index 4d4bc89eb..845b90e1d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java @@ -1,4 +1,4 @@ -package org.dromara.web.domain.vo; +package org.dromara.auth.domain.vo; import org.dromara.system.domain.vo.SysTenantVo; import io.github.linpeilie.annotations.AutoMapper; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java similarity index 93% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java index 690f74024..1b1cf991d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java @@ -1,11 +1,11 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import org.dromara.common.core.domain.model.LoginBody; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; import org.dromara.system.domain.SysClient; -import org.dromara.web.domain.vo.LoginVo; +import org.dromara.auth.domain.vo.LoginVo; /** * 授权策略 diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java similarity index 99% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java index 7e07e20fc..05a0662be 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java similarity index 99% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java index 4d4b07283..e0023573d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/SysRegisterService.java @@ -1,4 +1,4 @@ -package org.dromara.web.service; +package org.dromara.auth.service; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java index edb12c925..169162917 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -25,9 +25,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java index 46bd5661f..69da1dd44 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.SaLoginModel; @@ -28,9 +28,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java similarity index 96% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java index 0ddb75350..5f39928a0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -25,9 +25,9 @@ import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java similarity index 97% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java index 2b055df06..7fca3e835 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -31,9 +31,9 @@ import org.dromara.system.domain.vo.SysSocialVo; import org.dromara.system.domain.vo.SysUserVo; import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysSocialService; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java similarity index 95% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java index 5016e5bc4..943037744 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java +++ b/ruoyi-modules/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java @@ -1,4 +1,4 @@ -package org.dromara.web.service.impl; +package org.dromara.auth.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -15,9 +15,9 @@ import org.dromara.common.core.validate.auth.WechatGroup; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.vo.SysUserVo; -import org.dromara.web.domain.vo.LoginVo; -import org.dromara.web.service.IAuthStrategy; -import org.dromara.web.service.SysLoginService; +import org.dromara.auth.domain.vo.LoginVo; +import org.dromara.auth.service.IAuthStrategy; +import org.dromara.auth.service.SysLoginService; import org.springframework.stereotype.Service; /**