update to v6.0.0

zlt2000 · Dec 17, 2023 · f90e1d1 · f90e1d1
1 parent c2cdf1a
commit f90e1d1
Show file tree

Hide file tree

Showing 51 changed files with 72 additions and 74 deletions.
diff --git a/README.md b/README.md
@@ -1,18 +1,14 @@
 #  zlt-microservices-platform
 
 <p align="center">
-  <img src="https://img.shields.io/badge/Version-5.5.0-critical" alt="Downloads"/>
-  <img src="https://img.shields.io/badge/Spring%20Boot-2.5.14-blue" alt="Downloads"/>
-  <img src="https://img.shields.io/badge/Spring%20Cloud-2020.0.6-blue" alt="Downloads"/>
-  <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2021.1-blue" alt="Downloads"/>
-  <img src="https://img.shields.io/badge/Elasticsearch-7.x-brightgreen" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Version-6.0.0-critical" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/JDK-17-8A2BE2" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Spring Authorization Server-1.1.3-40A24E" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Spring%20Boot-3.1.6-blue" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Spring%20Cloud-2022.0.4-blue" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2022.0.0.0-blue" alt="Downloads"/>
+  <img src="https://img.shields.io/badge/Elasticsearch-7.x-34A2AE" alt="Downloads"/>
   <img src="https://img.shields.io/badge/Ant%20Design-pro-9cf" alt="Downloads"/>
-  <a target="_blank" href='https://gitee.com/zlt2000/microservices-platform'>
-    <img src='https://gitee.com/zlt2000/microservices-platform/badge/star.svg' alt='star'/>
-  </a>
-  <a target="_blank" href='https://github.com/zlt2000/microservices-platform'>
-    <img src="https://img.shields.io/github/stars/zlt2000/microservices-platform.svg?style=social" alt="github star"/>
-  </a>
 </p>
 
 
@@ -46,23 +42,29 @@
   * **[文档更新日志](https://www.kancloud.cn/zlt2000/microservices-platform/936236)**
 * **演示环境地址**： [http://zlt2000.cn](http://zlt2000.cn/)
   * 账号密码：admin/admin
-  * APM监控账号密码：admin/admin
   * Grafana账号：zlt/zlt123
-  * 任务管理账号密码：admin/123456
 * **演示环境有全方位的监控示例：日志系统 + APM系统 + GPE系统**
 * Gitee地址：https://gitee.com/zlt2000/microservices-platform
 * Github地址：https://github.com/zlt2000/microservices-platform
 * 前后端分离的企业级微服务架构
 * 主要针对解决微服务和业务开发时常见的**非功能性需求**
-* 深度定制`Spring Security`真正实现了基于`RBAC`、`jwt`和`oauth2`的无状态统一权限认证的解决方案
+* 基于 `Spring Authorization Server` 深度定制`Spring Security`真正实现了基于`RBAC`、`jwt`和`oauth2`的无状态统一权限认证的解决方案
 * 提供应用管理，方便第三方系统接入，**支持多租户(应用隔离)**
 * 引入组件化的思想实现高内聚低耦合并且高度可配置化
 * 注重代码规范，严格控制包依赖，每个工程基本都是最小依赖
 * 非常适合学习和企业中使用
 >重构于开源项目OCP&cp：https://gitee.com/owenwangwen/open-capacity-platform
 
 &nbsp;
-## 4. 模块说明
+## 4. 分支说明
+| 分支名 | JDK | Spring Boot | Spring Cloud | Spring Security |
+| --- | --- | --- | --- |---|
+| master | 17 | 3.x | 2022.x | Spring Authorization Server  |
+| 5.x | 1.8 | 2.5.x | 2020.x | Spring Security OAuth        |
+| 4.x | 1.8 | 2.3.x | 2.2.x | Spring Security OAuth        |
+
+&nbsp;
+## 5. 模块说明
 ```lua
 central-platform -- 父项目，公共依赖
 │  ├─zlt-business -- 业务模块一级工程
@@ -97,11 +99,13 @@ central-platform -- 父项目，公共依赖
 │  │  ├─layui-web -- layui前端[8066]
 │  │  ├─react-web -- react前端[8066]
 │  ├─zlt-demo -- demo一级工程
-│  │  ├─txlcn-demo -- txlcn分布式事务demo
+│  │  ├─dubbo-demo -- dubbo服务demo
+│  │  ├─resource-server-demo -- 资源服务器demo
 │  │  ├─seata-demo -- seata分布式事务demo
 │  │  ├─sharding-jdbc-demo -- sharding-jdbc分库分表demo
 │  │  ├─rocketmq-demo -- rocketmq和mq事务demo
 │  │  ├─sso-demo -- 单点登录demo
+│  │  ├─websocket-demo -- websocket demo
 ```
 
 <table>
@@ -112,7 +116,7 @@ central-platform -- 父项目，公共依赖
 </table>
 
 
-## 5. 交流反馈
+## 6. 交流反馈
 * 有问题先看看 [F&Q](https://www.kancloud.cn/zlt2000/microservices-platform/981382) 中有没有相关的回答
 * 欢迎提交`ISSUS`，请写清楚问题的具体原因，重现步骤和环境(上下文)
 * 项目/微服务交流请进群：
@@ -125,7 +129,7 @@ central-platform -- 父项目，公共依赖
 * GitChat：[https://gitbook.cn/gitchat/author/5b2362320398d50d7b7ab29e](https://gitbook.cn/gitchat/author/5b2362320398d50d7b7ab29e)
 
 &nbsp;
-## 6. 截图（点击可大图预览）
+## 7. 截图（点击可大图预览）
 <table>
     <tr>
         <td><img alt="首页" src="https://gitee.com/zlt2000/images/raw/master/%E9%A6%96%E9%A1%B5.png"/></td>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.zlt</groupId>
     <artifactId>central-platform</artifactId>
-    <version>5.6.0</version>
+    <version>6.0.0</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -59,7 +59,6 @@
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <tomcat-embed-core.version>10.1.11</tomcat-embed-core.version>
         <httpclient.version>5.2.1</httpclient.version>
-        <spring.authorization.version>1.1.1</spring.authorization.version>
         <oauth2-oidc-sdk.version>11.7</oauth2-oidc-sdk.version>
     </properties>
 
@@ -329,11 +328,6 @@
                 <artifactId>curator-framework</artifactId>
                 <version>${curator.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-oauth2-authorization-server</artifactId>
-                <version>${spring.authorization.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-starter-oauth2</artifactId>

diff --git a/zlt-business/code-generator/pom.xml b/zlt-business/code-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>code-generator</artifactId>
 

diff --git a/zlt-business/file-center/pom.xml b/zlt-business/file-center/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>file-center</artifactId>
     <description>文件中心</description>

diff --git a/zlt-business/pom.xml b/zlt-business/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>central-platform</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>zlt-business</artifactId>
     <description>业务中心</description>

diff --git a/zlt-business/search-center/pom.xml b/zlt-business/search-center/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>search-center</artifactId>
     <description>搜索中心</description>

diff --git a/zlt-business/search-center/search-client/pom.xml b/zlt-business/search-center/search-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>search-center</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>search-client</artifactId>
     <description>搜索中心客户端</description>

diff --git a/zlt-business/search-center/search-server/pom.xml b/zlt-business/search-center/search-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>search-center</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>search-server</artifactId>
     <description>搜索中心服务端</description>

diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-business</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>user-center</artifactId>
     <description>用户中心</description>

diff --git a/zlt-commons/pom.xml b/zlt-commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>central-platform</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>zlt-commons</artifactId>
     <description>通用组件</description>

diff --git a/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml b/zlt-commons/zlt-auth-client-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-common-core/pom.xml b/zlt-commons/zlt-common-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>zlt-common-core</artifactId>
     <description>公共通用组件</description>

diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/constant/CommonConstant.java
@@ -10,7 +10,7 @@ public interface CommonConstant {
     /**
      * 项目版本号(banner使用)
      */
-    String PROJECT_VERSION = "5.6.0";
+    String PROJECT_VERSION = "6.0.0";
 
     /**
      * token请求头名称

diff --git a/zlt-commons/zlt-common-spring-boot-starter/pom.xml b/zlt-commons/zlt-common-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>zlt-common-spring-boot-starter</artifactId>
     <description>公共通用组件</description>

diff --git a/zlt-commons/zlt-db-spring-boot-starter/pom.xml b/zlt-commons/zlt-db-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml b/zlt-commons/zlt-elasticsearch-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml b/zlt-commons/zlt-loadbalancer-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-log-spring-boot-starter/pom.xml b/zlt-commons/zlt-log-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-oss-spring-boot-starter/pom.xml b/zlt-commons/zlt-oss-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-redis-spring-boot-starter/pom.xml b/zlt-commons/zlt-redis-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml b/zlt-commons/zlt-sentinel-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml b/zlt-commons/zlt-zookeeper-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-commons</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-config/pom.xml b/zlt-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>central-platform</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/zlt-demo/dubbo-demo/pom.xml b/zlt-demo/dubbo-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>dubbo-demo</artifactId>
 

diff --git a/zlt-demo/pom.xml b/zlt-demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>central-platform</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>zlt-demo</artifactId>
     <packaging>pom</packaging>

diff --git a/zlt-demo/resources-server-demo/pom.xml b/zlt-demo/resources-server-demo/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>resources-server-demo</artifactId>
 

diff --git a/zlt-demo/rocketmq-demo/pom.xml b/zlt-demo/rocketmq-demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>zlt-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>rocketmq-demo</artifactId>
     <packaging>pom</packaging>

diff --git a/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-consume/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>rocketmq-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>rocketmq-consume</artifactId>
     <description>rocketMQ消费者demo</description>

diff --git a/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-produce/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>rocketmq-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>rocketmq-produce</artifactId>
     <description>rocketMQ生产者demo</description>

diff --git a/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml b/zlt-demo/rocketmq-demo/rocketmq-transactional/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>rocketmq-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>rocketmq-transactional</artifactId>
     <description>rocketMQ事务消息demo</description>

diff --git a/zlt-demo/seata-demo/account-service/pom.xml b/zlt-demo/seata-demo/account-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>seata-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>account-service</artifactId>
 

diff --git a/zlt-demo/seata-demo/business-service/pom.xml b/zlt-demo/seata-demo/business-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.zlt</groupId>
         <artifactId>seata-demo</artifactId>
-        <version>5.6.0</version>
+        <version>6.0.0</version>
     </parent>
     <artifactId>business-service</artifactId>