diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index f8181f46d8..6e4d6665ec 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -71,7 +71,7 @@ jobs: with: allowUpdates: true artifactErrorsFailBuild: true - artifacts: "taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.06.ziptaotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.06.tar.gz,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.06.zip,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.06.tar.gz,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.06.zip,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.06.tar.gz" + artifacts: "taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.06.zip,taotao-cloud-tx/taotao-cloud-tx-distribution/build/distributions/taotao-cloud-tx-distribution-2024.06.tar.gz,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.06.zip,taotao-cloud-mq/taotao-cloud-mq-distribution/build/distributions/taotao-cloud-mq-distribution-2024.06.tar.gz,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.06.zip,taotao-cloud-rpc/taotao-cloud-rpc-distribution/build/distributions/taotao-cloud-rpc-distribution-2024.06.tar.gz" #body: "sdfsa" bodyFile: "doc/release/2024-06.md" draft: false diff --git a/README.md b/README.md index f8584ee3b4..e14da5d052 100644 --- a/README.md +++ b/README.md @@ -4,24 +4,24 @@

License - Downloads - Downloads - Downloads + Downloads + Downloads + Downloads Downloads Downloads - Downloads + Downloads Downloads Downloads Downloads Downloads Downloads - Downloads - Downloads + Downloads + Downloads

## 1. 如果您觉得有帮助,请点右上角 "Star" 支持一下谢谢 -`taotao-cloud` (taotao云平台) 基于gradle8.7、jdk21, 支持graalvm21, 采用最新的spring 6.1.8、SpringBoot 3.3.0、SpringCloud 2023.0.1、SpringSecurity 6.2.4、Nacos 2.3.2、Mybatis-Plus 3.5.6、Redis 7等框架,开发的一款企业级微服务架构的云服务平台, 具有组件化、高性能、功能丰富的特点。代码简洁,架构清晰,组件可自由搭配,遵循SpringBoot编程思想,高度模块化和可配置化。 +`taotao-cloud` (taotao云平台) 基于gradle8.7、jdk21, 支持graalvm21, 采用最新的spring 6.1.8、SpringBoot 3.3.0、SpringCloud 2023.0.2、SpringSecurity 6.2.4、Nacos 2.3.2、Mybatis-Plus 3.5.6、Redis 7等框架,开发的一款企业级微服务架构的云服务平台, 具有组件化、高性能、功能丰富的特点。代码简洁,架构清晰,组件可自由搭配,遵循SpringBoot编程思想,高度模块化和可配置化。 具备服务注册&发现、配置中心、服务限流、熔断降级、监控报警、多数据源、工作流、高亮搜索、定时任务、分布式缓存、分布式事务、分布式存储等功能,用于快速构建微服务项目。 @@ -72,7 +72,7 @@ Requires: ``` JAVA_VERSION >= 21 (推荐使用graalvm-jdk-21) GRALE_VERSION >= 8.7 -IDEA_VERSION >= 2024.1.1 +IDEA_VERSION >= 2024.1.2 ``` Gradle: @@ -117,22 +117,22 @@ Maven: ----------------------|----------------- Spring | 6.1.8 Spring Boot | 3.3.0 - Spring Cloud | 2023.0.1 + Spring Cloud | 2023.0.2 Spring Cloud Alibaba | 2023.0.1.0 Spring Cloud Tencent | 1.14.0-2023.0.0-RC1 Spring Cloud huawei | 1.11.7-2023.0.x Seata | 2.0.0 Sentinel | 1.8.7 - Spring-kafka | 3.1.4 + Spring-kafka | 3.2.0 Roketmq | 5.2.0 Spring Security | 6.2.4 Mybatis Plus | 3.5.6 - Hutool | 6.0.0-M12 + Hutool | 6.0.0-M13 Mysql | 8.3.0 Querydsl | 5.1.0 Swagger | 3.0.0 Knife4j | 4.5.0 - Redisson | 3.29.0 + Redisson | 3.30.0 Lettuce | 6.3.1.RELEASE Elasticsearch | 8.11.5 Xxl-job | 2.4.1 @@ -144,7 +144,7 @@ Maven: Elasticjob | 3.0.4 Powerjob | 5.0.1-beta Forest | 1.5.36 - Netty | 4.1.109.Final + Netty | 4.1.110.Final ## 6. 演示地址 @@ -176,7 +176,7 @@ Maven: ## 7. 功能特点 * **微服务技术框架**: 前后端分离的企业级微服务架构、主要针对解决微服务和业务开发时常见的 **非功能性需求** 简化开发工作、提高生产率、解决通用问题 -* **主体框架**:采用最新的`Spring Boot 3.3.0`、`Spring Cloud 2023.0.1`、`Spring Cloud Alibaba 2023.0.1.0` 版本进行设计 +* **主体框架**:采用最新的`Spring Boot 3.3.0`、`Spring Cloud 2023.0.2`、`Spring Cloud Alibaba 2023.0.1.0` 版本进行设计 * **统一注册**:支持`spring cloud alibaba Nacos`作为注册中心,实现多配置、分群组、分命名空间、多业务模块的注册和发现功能 * **统一认证**:统一Oauth2认证协议,采用jwt的方式,实现统一认证,完备的RBAC权限管理、数据权限处理、网关统一鉴权、灰度发布。 支持多种登录方式,如账号密码,验证码登陆、支持支付宝、钉钉、码云、GitHub、GitLab、QQ、微信、企业微信、微博等第三方登录,微信登录,指纹登录,手势登录,手机号码登录,人脸识别登录等 优化Spring Security内部实现 ,实现API调用的统一出口和权限认证授权中心 * **业务监控**:利用`Spring Boot admin`监控各个独立服务的运行状态 @@ -323,14 +323,12 @@ taotao-cloud-project -- 父项目 +--- Project ':taotao-cloud-starter-bootstrap' +--- Project ':taotao-cloud-starter-data' +--- Project ':taotao-cloud-starter-dingtalk' -+--- Project ':taotao-cloud-starter-eventbus' +--- Project ':taotao-cloud-starter-dubbo' +--- Project ':taotao-cloud-starter-grpc' +--- Project ':taotao-cloud-starter-idempotent' +--- Project ':taotao-cloud-starter-idgenerator' +--- Project ':taotao-cloud-starter-ip2region' +--- Project ':taotao-cloud-starter-job' -+--- Project ':taotao-cloud-starter-laytpl' +--- Project ':taotao-cloud-starter-limit' +--- Project ':taotao-cloud-starter-lock' +--- Project ':taotao-cloud-starter-logger' @@ -345,7 +343,6 @@ taotao-cloud-project -- 父项目 +--- Project ':taotao-cloud-starter-pay' +--- Project ':taotao-cloud-starter-prometheus' +--- Project ':taotao-cloud-starter-retry' -+--- Project ':taotao-cloud-starter-rxjava' +--- Project ':taotao-cloud-starter-security' +--- Project ':taotao-cloud-starter-sensitive' +--- Project ':taotao-cloud-starter-sms' diff --git a/build.gradle b/build.gradle index be00548bd5..153ba89532 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ buildscript { /* 添加插件依赖路径(通过jar方式) */ //https://plugins.gradle.org/m2/com/github/spotbugs/snom/spotbugs-gradle-plugin/ - classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.14" + classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.15" //https://github.com/spring-io/spring-javaformat/ classpath "io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.41" @@ -139,7 +139,7 @@ plugins { // *******************************************第三方插件************************************************************ //google出品的一个插件,可以直接将SpringBoot构建推送到Docker仓库 //https://plugins.gradle.org/plugin/com.google.cloud.tools.jib - id "com.google.cloud.tools.jib" version "3.4.2" + id "com.google.cloud.tools.jib" version "3.4.3" //用于创建和管理外部进程的 Gradle 插件。 //https://plugins.gradle.org/plugin/com.github.johnrengelman.processes diff --git a/doc/release/2024-06.md b/doc/release/2024-06.md index 207069c407..6a5521740d 100644 --- a/doc/release/2024-06.md +++ b/doc/release/2024-06.md @@ -28,6 +28,7 @@ [[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump spring to 6.1.8 [[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump springboot to 3.3.0 +[[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump springcloud to 2023.0.2 [[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump org.javers:javers-spring-boot-starter-sql to 7.4.3 [[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump log-record to 1.6.3 [[#11]](https://github.com/shuigedeng/taotao-cloud-project/issues/11) Bump zipkin to 3.3.1 @@ -59,12 +60,6 @@ ## New Contributors -* **@shuigedeng** made their first contribution in [#26](https://github.com/shuigedeng/taotao-cloud-project/pull/26) -* **@shuigedeng** made their first contribution in [#25](https://github.com/shuigedeng/taotao-cloud-project/pull/25) -* **@shuigedeng** made their first contribution in [#24](https://github.com/shuigedeng/taotao-cloud-project/pull/24) -* **@shuigedeng** made their first contribution in [#23](https://github.com/shuigedeng/taotao-cloud-project/pull/23) -* **@shuigedeng** made their first contribution in [#20](https://github.com/shuigedeng/taotao-cloud-project/pull/20) -* **@shuigedeng** made their first contribution in [#16](https://github.com/shuigedeng/taotao-cloud-project/pull/16) +* **@shuigedeng** made their first contribution in [#26](https://github.com/shuigedeng/taotao-cloud-project/pull/26) - -**Full Changelog**: [`2024.04...2024.05`](https://github.com/shuigedeng/taotao-cloud-project/compare/2024.04...2024.05) +**Full Changelog**: [`2024.05...2024.06`](https://github.com/shuigedeng/taotao-cloud-project/compare/2024.05...2024.06) diff --git a/taotao-cloud-design-patterns/build.gradle b/taotao-cloud-design-patterns/build.gradle index a20ecd6b8e..eb6fde9e0b 100644 --- a/taotao-cloud-design-patterns/build.gradle +++ b/taotao-cloud-design-patterns/build.gradle @@ -2,7 +2,7 @@ dependencies { implementation 'io.netty:netty-all' implementation 'com.alibaba.fastjson2:fastjson2:2.0.50' - implementation "org.dromara.hutool:hutool-all:6.0.0-M12" + implementation "org.dromara.hutool:hutool-all:6.0.0-M13" implementation "org.projectlombok:lombok:1.18.32" annotationProcessor "org.projectlombok:lombok:1.18.32" diff --git a/taotao-cloud-microservice/taotao-cloud-ai/build.gradle b/taotao-cloud-microservice/taotao-cloud-ai/build.gradle index 20cb52fd30..7c256d9bad 100644 --- a/taotao-cloud-microservice/taotao-cloud-ai/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-ai/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation 'org.springframework.ai:spring-ai-pdf-document-reader' //使用OpenAI implementation 'org.springframework.ai:spring-ai-openai-spring-boot-starter' - implementation 'org.springframework.ai:spring-ai-redis-spring-boot-starter' + //implementation 'org.springframework.ai:spring-ai-redis-spring-boot-starter' //使用PGVector作为向量数据库 implementation 'org.springframework.ai:spring-ai-pgvector-store-spring-boot-starter' implementation 'org.springframework.ai:spring-ai-transformers-spring-boot-starter' @@ -83,7 +83,6 @@ archivesBaseName = 'taotao-cloud-ai' configurations { all { - exclude group: "org.springframework.boot", module: "spring-boot-starter-data-jpa" exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" exclude group: "com.querydsl", module: "querydsl-apt" diff --git a/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-biz/build.gradle b/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-biz/build.gradle index cc185930ab..b1776f52c5 100644 --- a/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-biz/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-biz/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation "io.github.shuigedeng:taotao-cloud-starter-micrometer" implementation "io.github.shuigedeng:taotao-cloud-starter-skywalking" - implementation 'org.springframework.session:spring-session-data-redis:3.2.2' + implementation 'org.springframework.session:spring-session-data-redis:3.3.0' implementation 'com.github.binarywang:weixin-java-mp:4.6.2.B' implementation 'com.github.binarywang:weixin-java-miniapp:4.6.2.B' @@ -77,7 +77,7 @@ dependencies { implementation "com.github.ulisesbocchio:jasypt-spring-boot-starter" //https://search.maven.org/artifact/com.nimbusds/nimbus-jose-jwt - implementation "com.nimbusds:nimbus-jose-jwt:9.39.1" + implementation "com.nimbusds:nimbus-jose-jwt:9.39.3" //https://search.maven.org/artifact/com.nimbusds/oauth2-oidc-sdk implementation 'com.nimbusds:oauth2-oidc-sdk:11.12' diff --git a/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-domain/build.gradle b/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-domain/build.gradle index 9a5fafd25b..9ad3218457 100644 --- a/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-domain/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-business/taotao-cloud-auth/taotao-cloud-auth-domain/build.gradle @@ -80,7 +80,7 @@ dependencies { api "io.github.shuigedeng:taotao-cloud-starter-micrometer" api "io.github.shuigedeng:taotao-cloud-starter-skywalking" - api 'org.springframework.session:spring-session-data-redis:3.2.2' + api 'org.springframework.session:spring-session-data-redis:3.3.0' api 'com.github.binarywang:weixin-java-mp:4.6.2.B' api 'com.github.binarywang:weixin-java-miniapp:4.6.2.B' @@ -127,7 +127,7 @@ dependencies { api "com.github.ulisesbocchio:jasypt-spring-boot-starter" //https://search.maven.org/artifact/com.nimbusds/nimbus-jose-jwt - api "com.nimbusds:nimbus-jose-jwt:9.39.1" + api "com.nimbusds:nimbus-jose-jwt:9.39.3" //https://search.maven.org/artifact/com.nimbusds/oauth2-oidc-sdk api 'com.nimbusds:oauth2-oidc-sdk:11.12' diff --git a/taotao-cloud-microservice/taotao-cloud-data-analysis/build.gradle b/taotao-cloud-microservice/taotao-cloud-data-analysis/build.gradle index 8f71bacb2e..670c2d089a 100644 --- a/taotao-cloud-microservice/taotao-cloud-data-analysis/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-data-analysis/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation "io.github.shuigedeng:taotao-cloud-starter-lock" implementation "io.github.shuigedeng:taotao-cloud-starter-web" //https://search.maven.org/artifact/com.clickhouse/clickhouse-jdbc - implementation "com.clickhouse:clickhouse-jdbc:0.6.0-patch4" + implementation "com.clickhouse:clickhouse-jdbc:0.6.0-patch5" //implementation "org.hibernate.common:hibernate-commons-annotations:6.0.5.Final" //implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" diff --git a/taotao-cloud-microservice/taotao-cloud-modulith-ddd/build.gradle b/taotao-cloud-microservice/taotao-cloud-modulith-ddd/build.gradle index 6750212580..c7354b2bae 100644 --- a/taotao-cloud-microservice/taotao-cloud-modulith-ddd/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-modulith-ddd/build.gradle @@ -20,7 +20,7 @@ dependencies { api "jakarta.persistence:jakarta.persistence-api:3.1.0" annotationProcessor "jakarta.persistence:jakarta.persistence-api:3.1.0" - implementation 'org.springframework.modulith:spring-modulith-starter-core:1.1.5' + implementation 'org.springframework.modulith:spring-modulith-starter-core:1.2.0' implementation 'org.springframework.modulith:spring-modulith-starter-insight:1.2.0' implementation 'org.springframework.modulith:spring-modulith-starter-jdbc:1.2.0' implementation 'org.springframework.modulith:spring-modulith-starter-jpa:1.2.0' diff --git a/taotao-cloud-microservice/taotao-cloud-monitor/build.gradle b/taotao-cloud-microservice/taotao-cloud-monitor/build.gradle index 8c34d608c0..51fde7a307 100644 --- a/taotao-cloud-microservice/taotao-cloud-monitor/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-monitor/build.gradle @@ -37,7 +37,6 @@ archivesBaseName = 'taotao-cloud-monitor' configurations { all { - resolutionStrategy { exclude group: "org.springframework.boot", module: "spring-boot-starter-data-jpa" exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" exclude group: "com.querydsl", module: "querydsl-apt" diff --git a/taotao-cloud-microservice/taotao-cloud-shell/build.gradle b/taotao-cloud-microservice/taotao-cloud-shell/build.gradle index b116c305fb..dae8dbfc6d 100644 --- a/taotao-cloud-microservice/taotao-cloud-shell/build.gradle +++ b/taotao-cloud-microservice/taotao-cloud-shell/build.gradle @@ -24,7 +24,7 @@ dependencies { } //https://central.sonatype.com/artifact/org.springframework.shell/spring-shell-starter - implementation 'org.springframework.shell:spring-shell-starter:3.2.4' + implementation 'org.springframework.shell:spring-shell-starter:3.2.5' //,jcommander 是一个只有几十 kb 的 Java 命令行参数解析工具,可以通过注解的方式快速实现命令行参数解析。 //https://search.maven.org/artifact/com.beust/jcommander diff --git a/taotao-cloud-plugin/taotao-cloud-idea-plugin/build.gradle b/taotao-cloud-plugin/taotao-cloud-idea-plugin/build.gradle index 9170d20a79..5e9cc0a78d 100644 --- a/taotao-cloud-plugin/taotao-cloud-idea-plugin/build.gradle +++ b/taotao-cloud-plugin/taotao-cloud-idea-plugin/build.gradle @@ -10,7 +10,7 @@ apply plugin: "org.jetbrains.intellij" dependencies { //testImplementation "junit:junit:4.13.2" - implementation "org.dromara.hutool:hutool-all:6.0.0-M12" + implementation "org.dromara.hutool:hutool-all:6.0.0-M13" implementation "com.google.zxing:core:3.5.3" implementation "com.google.zxing:javase:3.5.3" } diff --git a/taotao-cloud-warehouse/taotao-cloud-realtime-mall/build.gradle b/taotao-cloud-warehouse/taotao-cloud-realtime-mall/build.gradle index 0d5689e548..a72e012902 100644 --- a/taotao-cloud-warehouse/taotao-cloud-realtime-mall/build.gradle +++ b/taotao-cloud-warehouse/taotao-cloud-realtime-mall/build.gradle @@ -156,7 +156,7 @@ dependencies { exclude group: "org.glassfish", module: "javax.el" } implementation 'redis.clients:jedis:5.1.2' - implementation 'com.clickhouse:clickhouse-jdbc:0.6.0-patch4' + implementation 'com.clickhouse:clickhouse-jdbc:0.6.0-patch5' implementation "com.janeluo:ikanalyzer:2012_u6"