From 4adff00c36ca30526f6d5bb86083417cec4fa68a Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sat, 19 Feb 2022 12:45:39 +0800 Subject: [PATCH 01/40] Bump version to 1.2.0 --- discovery-agent-example/discovery-agent-example-agent/pom.xml | 2 +- .../discovery-agent-example-application/pom.xml | 2 +- discovery-agent-example/discovery-agent-example-sdk/pom.xml | 2 +- discovery-agent-example/pom.xml | 2 +- discovery-agent-starter-plugin-mdc/pom.xml | 2 +- discovery-agent-starter-plugin-strategy/pom.xml | 2 +- discovery-agent-starter/pom.xml | 2 +- .../discovery/agent/constant/DiscoveryAgentConstant.java | 2 +- version.bat | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/discovery-agent-example/discovery-agent-example-agent/pom.xml b/discovery-agent-example/discovery-agent-example-agent/pom.xml index 1f59c68..6405a87 100644 --- a/discovery-agent-example/discovery-agent-example-agent/pom.xml +++ b/discovery-agent-example/discovery-agent-example-agent/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent-example - 1.1.0 + 1.2.0 diff --git a/discovery-agent-example/discovery-agent-example-application/pom.xml b/discovery-agent-example/discovery-agent-example-application/pom.xml index bbdb292..b07b224 100644 --- a/discovery-agent-example/discovery-agent-example-application/pom.xml +++ b/discovery-agent-example/discovery-agent-example-application/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent-example - 1.1.0 + 1.2.0 diff --git a/discovery-agent-example/discovery-agent-example-sdk/pom.xml b/discovery-agent-example/discovery-agent-example-sdk/pom.xml index 697fda3..034a5d1 100644 --- a/discovery-agent-example/discovery-agent-example-sdk/pom.xml +++ b/discovery-agent-example/discovery-agent-example-sdk/pom.xml @@ -9,6 +9,6 @@ com.nepxion discovery-agent-example - 1.1.0 + 1.2.0 \ No newline at end of file diff --git a/discovery-agent-example/pom.xml b/discovery-agent-example/pom.xml index edeaf4b..1d95a76 100644 --- a/discovery-agent-example/pom.xml +++ b/discovery-agent-example/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent - 1.1.0 + 1.2.0 diff --git a/discovery-agent-starter-plugin-mdc/pom.xml b/discovery-agent-starter-plugin-mdc/pom.xml index 7dcb7f1..75118a6 100644 --- a/discovery-agent-starter-plugin-mdc/pom.xml +++ b/discovery-agent-starter-plugin-mdc/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.1.0 + 1.2.0 diff --git a/discovery-agent-starter-plugin-strategy/pom.xml b/discovery-agent-starter-plugin-strategy/pom.xml index c1853b9..0df63bb 100644 --- a/discovery-agent-starter-plugin-strategy/pom.xml +++ b/discovery-agent-starter-plugin-strategy/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.1.0 + 1.2.0 diff --git a/discovery-agent-starter/pom.xml b/discovery-agent-starter/pom.xml index 0282344..40c3025 100644 --- a/discovery-agent-starter/pom.xml +++ b/discovery-agent-starter/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.1.0 + 1.2.0 diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java index 5f83d46..d1cc872 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java @@ -10,7 +10,7 @@ */ public class DiscoveryAgentConstant { - public static final String DISCOVERY_AGENT_VERSION = "1.1.0"; + public static final String DISCOVERY_AGENT_VERSION = "1.2.0"; public static final String SPRING_APPLICATION_DISCOVERY_AGENT_VERSION = "spring.application.discovery.agent.version"; } \ No newline at end of file diff --git a/version.bat b/version.bat index 2eab537..2f17fdf 100644 --- a/version.bat +++ b/version.bat @@ -15,5 +15,5 @@ @title Nepxion Discovery @color 0a -call mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.1.0 +call mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.2.0 pause \ No newline at end of file From 9c9e690949f33665a3a2fc25171841584b29359f Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sat, 19 Feb 2022 12:46:26 +0800 Subject: [PATCH 02/40] Bump Nepxion Discovery version to 6.13.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fddef1b..0a1947e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ Nepxion Discovery Agent pom 4.0.0 - 1.1.0 + 1.2.0 Nepxion Discovery Agent is a java agent to resolve loss of ThreadLocal in cross-thread scenario, such as Spring Async、Hystrix Thread、Runnable、Callable、Single Thread、Thread Pool、MDC http://www.nepxion.com @@ -18,7 +18,7 @@ - 6.12.1 + 6.13.1 3.23.2-GA From 21aab35639a52543dbb5618f4e44573fa8a2ce4b Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 20 Feb 2022 10:24:57 +0800 Subject: [PATCH 03/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ade26c3..3d988ae 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ | 框架名称 | 框架版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | | Discovery | 1.x.x ~ 6.x.x | Camden ~ Hoxton | 开源，永久免费 | -| DiscoveryX | 7.x.x | 202x | 闭源，商业许可 | +| DiscoveryX | 7.x.x `↑` | 202x `↑` | 闭源，商业许可 | ② Polaris系列 @@ -46,7 +46,7 @@ Polaris为Discovery高级定制版，特色功能 | 框架名称 | 框架版本 | 支持Discovery版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | --- | | Polaris | 1.x.x | 6.x.x | Finchley ~ Hoxton | 闭源，商业许可 | -| Polaris | 2.x.x | 7.x.x | 202x | 闭源，商业许可 | +| Polaris | 2.x.x | 7.x.x `↑` | 202x `↑` | 闭源，商业许可 | 有商业版需求的企业和用户，请添加微信1394997，联系作者，洽谈合作事宜 From dc6d673b5c461ad549b9ac9d10cbcffacecaf9f4 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 27 Feb 2022 19:08:20 +0800 Subject: [PATCH 04/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3d988ae..839983c 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,8 @@ | 框架名称 | 框架版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | | Discovery | 1.x.x ~ 6.x.x | Camden ~ Hoxton | 开源，永久免费 | -| DiscoveryX | 7.x.x `↑` | 202x `↑` | 闭源，商业许可 | +| DiscoveryX | 7.x.x | 2020 | 闭源，商业许可 | +| DiscoveryX | 8.x.x | 2021 | 闭源，商业许可 | ② Polaris系列 @@ -46,7 +47,8 @@ Polaris为Discovery高级定制版，特色功能 | 框架名称 | 框架版本 | 支持Discovery版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | --- | | Polaris | 1.x.x | 6.x.x | Finchley ~ Hoxton | 闭源，商业许可 | -| Polaris | 2.x.x | 7.x.x `↑` | 202x `↑` | 闭源，商业许可 | +| Polaris | 2.x.x | 7.x.x | 2020 | 闭源，商业许可 | +| Polaris | 3.x.x | 8.x.x | 2021 | 闭源，商业许可 | 有商业版需求的企业和用户，请添加微信1394997，联系作者，洽谈合作事宜 @@ -75,7 +77,7 @@ Polaris为Discovery高级定制版，特色功能 - 对于入门级玩家，参考[6.x.x指南示例极简版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple - 对于熟练级玩家，参考[6.x.x指南示例精进版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x。除上述《极简版》功能外，涉及到指南篇里的绝大多数高级功能 - 对于骨灰级玩家，参考[6.x.x指南示例高级版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex。除上述《精进版》功能外，涉及到指南篇里的ActiveMQ、MongoDB、RabbitMQ、Redis、RocketMQ、MySQL等高级调用链和蓝绿灰度调用链的整合 -- 上述指南实例分支是针对Spring Cloud旧版本。对于Spring Cloud 202x版本，参考[7.x.x指南示例精进版](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master +- 上述指南实例分支是针对Spring Cloud Finchley ~ Hoxton版本。对于Spring Cloud 202x版本，参考[7.x.x ~ 8.x.x指南示例精进版](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master ![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Logo64.png) Polaris【北极星】企业级云原生微服务商业解决方案 @@ -91,8 +93,8 @@ Polaris为Discovery高级定制版，特色功能 - [指南示例源码Gitee版](https://gitee.com/polaris-paas/polaris-guide) ④ 指南示例说明 -- Spring Cloud旧版本，参考[1.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/1.x.x)，分支为1.x.x -- Spring Cloud新版本，参考[2.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/master)，分支为master +- Spring Cloud Finchley ~ Hoxton版本，参考[1.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/1.x.x)，分支为1.x.x +- Spring Cloud 202x版本，参考[2.x.x ~ 3.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/master)，分支为master ![](http://nepxion.gitee.io/discovery/docs/icon-doc/Logo64.png) Discovery【探索】和Polaris【北极星】架构体系 From 1c6b0f87ae1e803f42c55936194b8a242458b005 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 4 Mar 2022 12:29:41 +0800 Subject: [PATCH 05/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 839983c..d26ecac 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ - 2021年阿里巴巴技术峰会上海站演讲嘉宾 - 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 +- 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Nacos Group Member、Spring Cloud Alibaba Member - Spring Cloud Alibaba、Nacos、Sentinel、OpenTracing Committer & Contributor From e23ba70781df16145782e07b95a61ec639812ee8 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 30 May 2022 21:32:02 +0800 Subject: [PATCH 06/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a1947e..481ff54 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.13.1 + 6.14.0 3.23.2-GA From 87779c36c76adc7a012d2e4335b6612735e8f976 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 5 Sep 2022 12:06:50 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 481ff54..81f844b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.14.0 + 6.15.0 3.23.2-GA From 59b99ad139aece647daf0b6b72960c96aa0ae72f Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 12 Sep 2022 10:12:48 +0800 Subject: [PATCH 08/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 54 +++++++++++------------------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index d26ecac..8442905 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ 如果您觉得本框架具有一定的参考价值和借鉴意义，请帮忙在页面右上角 [**Star**] -![](http://nepxion.gitee.io/discovery/docs/icon-doc/star1.png) 首席作者简介 +## 简介 + +### 作者简介 - Nepxion开源社区创始人 - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 @@ -24,8 +26,7 @@ -![](http://nepxion.gitee.io/discovery/docs/icon-doc/star4.png) 商业化合作 - +### 商业合作 ① Discovery系列 | 框架名称 | 框架版本 | 支持Spring Cloud版本 | 使用许可 | @@ -53,19 +54,20 @@ Polaris为Discovery高级定制版，特色功能 有商业版需求的企业和用户，请添加微信1394997，联系作者，洽谈合作事宜 +### 入门资料 ![](http://nepxion.gitee.io/discovery/docs/discovery-doc/Logo64.png) Discovery【探索】企业级云原生微服务开源解决方案 -① 解决方案 +① 快速入门 +- [快速入门Github版](https://github.com/Nepxion/Discovery/wiki) +- [快速入门Gitee版](https://gitee.com/Nepxion/Discovery/wikis/pages) + +② 解决方案 - [解决方案WIKI版](http://nepxion.com/discovery) - [解决方案PPT版](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt.html) -② 平台界面 +③ 平台界面 - [平台界面WIKI版](http://nepxion.com/discovery-platform) -③ 快速入门 -- [快速入门Github版](https://github.com/Nepxion/Discovery/wiki) -- [快速入门Gitee版](https://gitee.com/Nepxion/Discovery/wikis/pages) - ④ 框架源码 - [框架源码Github版](https://github.com/Nepxion/Discovery) - [框架源码Gitee版](https://gitee.com/Nepxion/Discovery) @@ -97,40 +99,6 @@ Polaris为Discovery高级定制版，特色功能 - Spring Cloud Finchley ~ Hoxton版本，参考[1.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/1.x.x)，分支为1.x.x - Spring Cloud 202x版本，参考[2.x.x ~ 3.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/master)，分支为master -![](http://nepxion.gitee.io/discovery/docs/icon-doc/Logo64.png) Discovery【探索】和Polaris【北极星】架构体系 - -① Discovery【探索】和Polaris【北极星】联合架构图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Architecture.jpg) - -② Discovery【探索】和Polaris【北极星】联合拓扑图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Topology.jpg) - -③ Polaris【北极星】分层架构图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Layer.jpg) - -④ Discovery【探索】实施方案图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/All.jpg) - -⑤ Discovery【探索】域网关实施图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/DomainEnable.jpg) - -⑥ Discovery【探索】非域网关实施图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/DomainDisable.jpg) - -⑦ Discovery【探索】全局订阅实施图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/GlobalSub.jpg) - -⑧ Discovery【探索】配置中心发布订阅图 - -![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Config.jpg) - ## 请联系我 微信、钉钉、公众号和文档 From 042787b389ce2576d776db0cd7767247836862e0 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 16 Sep 2022 19:33:25 +0800 Subject: [PATCH 09/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81f844b..13be11a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.15.0 + 6.16.1 3.23.2-GA From 4d7c6976ad91d83609857a935db48ecaba9f813d Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 30 Sep 2022 20:02:29 +0800 Subject: [PATCH 10/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13be11a..34c600c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.16.1 + 6.17.0 3.23.2-GA From 333bd7eea0495889295b87acc07063148bce6f5b Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Thu, 6 Oct 2022 20:41:08 +0800 Subject: [PATCH 11/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8442905..9a1d6c8 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,13 @@ Polaris为Discovery高级定制版，特色功能 - [指南示例源码Gitee版](https://gitee.com/Nepxion/DiscoveryGuide) ⑥ 指南示例说明 -- 对于入门级玩家，参考[6.x.x指南示例极简版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple -- 对于熟练级玩家，参考[6.x.x指南示例精进版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x。除上述《极简版》功能外，涉及到指南篇里的绝大多数高级功能 -- 对于骨灰级玩家，参考[6.x.x指南示例高级版](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex。除上述《精进版》功能外，涉及到指南篇里的ActiveMQ、MongoDB、RabbitMQ、Redis、RocketMQ、MySQL等高级调用链和蓝绿灰度调用链的整合 -- 上述指南实例分支是针对Spring Cloud Finchley ~ Hoxton版本。对于Spring Cloud 202x版本，参考[7.x.x ~ 8.x.x指南示例精进版](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master +- Spring Cloud Finchley ~ Hoxton版本 + - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple。最简单功能的使用指南 + - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x。除上述《极简版》功能外，涉及到指南篇里的绝大多数组件集成、高级功能、自动化测试等使用指南 + - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex。除上述《集成版》功能外，涉及到指南篇里的ActiveMQ、MongoDB、RabbitMQ、Redis、RocketMQ、MySQL等高级调用链和蓝绿灰度调用链整合的使用指南 +- Spring Cloud 202x版本 + - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple + - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master ![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Logo64.png) Polaris【北极星】企业级云原生微服务商业解决方案 @@ -96,8 +99,10 @@ Polaris为Discovery高级定制版，特色功能 - [指南示例源码Gitee版](https://gitee.com/polaris-paas/polaris-guide) ④ 指南示例说明 -- Spring Cloud Finchley ~ Hoxton版本，参考[1.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/1.x.x)，分支为1.x.x -- Spring Cloud 202x版本，参考[2.x.x ~ 3.x.x指南示例](https://github.com/polaris-paas/polaris-guide/tree/master)，分支为master +- Spring Cloud Finchley ~ Hoxton版本 + - [指南示例](https://github.com/polaris-paas/polaris-guide/tree/1.x.x)，分支为1.x.x +- Spring Cloud 202x版本 + - [指南示例](https://github.com/polaris-paas/polaris-guide/tree/master)，分支为master ## 请联系我 微信、钉钉、公众号和文档 From d31c7f27fcf37c003060cfd38942baf944c03304 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Thu, 13 Oct 2022 03:25:40 +0800 Subject: [PATCH 12/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9a1d6c8..d862a72 100644 --- a/README.md +++ b/README.md @@ -78,9 +78,11 @@ Polaris为Discovery高级定制版，特色功能 ⑥ 指南示例说明 - Spring Cloud Finchley ~ Hoxton版本 - - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple。最简单功能的使用指南 - - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x。除上述《极简版》功能外，涉及到指南篇里的绝大多数组件集成、高级功能、自动化测试等使用指南 - - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex。除上述《集成版》功能外，涉及到指南篇里的ActiveMQ、MongoDB、RabbitMQ、Redis、RocketMQ、MySQL等高级调用链和蓝绿灰度调用链整合的使用指南 + - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple + - [极简版域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-domain-gateway)，分支为6.x.x-simple-domain-gateway + - [极简版非域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-non-domain-gateway)，分支为6.x.x-simple-non-domain-gateway + - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x + - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex - Spring Cloud 202x版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master From 0cc2d64fe4931ff062226537da3930be84054cb8 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sat, 15 Oct 2022 16:26:51 +0800 Subject: [PATCH 13/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d862a72..33a939b 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,8 @@ Polaris为Discovery高级定制版，特色功能 - [极简版非域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-non-domain-gateway)，分支为6.x.x-simple-non-domain-gateway - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex + - [半自动化蓝绿灰度发布模拟器指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simulator)，分支为6.x.x-simulator + - [统一配置订阅执行器指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-config)，分支为6.x.x-config - Spring Cloud 202x版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master From 17e620df8abfc940346354eaedb878215fbae8b3 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 21 Oct 2022 14:02:29 +0800 Subject: [PATCH 14/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 33a939b..62a58ce 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,9 @@ Polaris为Discovery高级定制版，特色功能 - [极简版非域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-non-domain-gateway)，分支为6.x.x-simple-non-domain-gateway - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex - - [半自动化蓝绿灰度发布模拟器指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simulator)，分支为6.x.x-simulator - [统一配置订阅执行器指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-config)，分支为6.x.x-config + - [统一控制台](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-console)，分支为6.x.x-console + - [自动化蓝绿灰度发布模拟测试](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simulator)，分支为6.x.x-simulator - Spring Cloud 202x版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master From d89e55d9036a2d79cd58889bfe536810fcb71d50 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 23 Oct 2022 21:40:55 +0800 Subject: [PATCH 15/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62a58ce..dcbaa8d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Polaris为Discovery高级定制版，特色功能 | --- | --- | --- | --- | --- | | Polaris | 1.x.x | 6.x.x | Finchley ~ Hoxton | 闭源，商业许可 | | Polaris | 2.x.x | 7.x.x | 2020 | 闭源，商业许可 | -| Polaris | 3.x.x | 8.x.x | 2021 | 闭源，商业许可 | +| Polaris | 2.x.x | 8.x.x | 2021 | 闭源，商业许可 | 有商业版需求的企业和用户，请添加微信1394997，联系作者，洽谈合作事宜 From 90b38a60259d735988330dc49cfd4bf9898f366d Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 24 Oct 2022 16:52:05 +0800 Subject: [PATCH 16/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index dcbaa8d..31d2d6c 100644 --- a/README.md +++ b/README.md @@ -83,9 +83,6 @@ Polaris为Discovery高级定制版，特色功能 - [极简版非域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-non-domain-gateway)，分支为6.x.x-simple-non-domain-gateway - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x)，分支为6.x.x - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex - - [统一配置订阅执行器指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-config)，分支为6.x.x-config - - [统一控制台](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-console)，分支为6.x.x-console - - [自动化蓝绿灰度发布模拟测试](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simulator)，分支为6.x.x-simulator - Spring Cloud 202x版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master From b01a0f6c08a93e5b3d709699b34b684a66b4df42 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 30 Oct 2022 09:53:45 +0800 Subject: [PATCH 17/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34c600c..025379e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.17.0 + 6.18.0 3.23.2-GA From 60274dc4b85d7c1a3d282b276a87d412ab5fc5f3 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 30 Oct 2022 10:38:27 +0800 Subject: [PATCH 18/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 025379e..ca77103 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nepxion discovery-agent - Nepxion Discovery Agent + Nepxion Discovery Agent pom 4.0.0 1.2.0 From f7c09c6fbb182738e69a6b48d66c479032b88b37 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 30 Oct 2022 10:38:44 +0800 Subject: [PATCH 19/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca77103..025379e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nepxion discovery-agent - Nepxion Discovery Agent + Nepxion Discovery Agent pom 4.0.0 1.2.0 From 76239eda2cb078fdb30d3d2b0edc55d7fdbea0ab Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 31 Oct 2022 02:56:29 +0800 Subject: [PATCH 20/40] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 025379e..babd905 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.18.0 + 6.19.0 3.23.2-GA From ca245f5e56d72635bcf9070ff4b78c73ea21357a Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 21 Nov 2022 18:22:33 +0800 Subject: [PATCH 21/40] Fix pom.xml minor bug --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index babd905..dac4c40 100644 --- a/pom.xml +++ b/pom.xml @@ -156,9 +156,9 @@ - https://github.com/Nepxion/Discovery - scm:git:https://github.com/Nepxion/Discovery.git - scm:git:https://github.com/Nepxion/Discovery.git + https://github.com/Nepxion/DiscoveryAgent + scm:git:https://github.com/Nepxion/DiscoveryAgent.git + scm:git:https://github.com/Nepxion/DiscoveryAgent.git v${project.version} From 812ede5ad7268d43bf8a8c01cfc659b8378891c2 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Wed, 30 Nov 2022 17:41:00 +0800 Subject: [PATCH 22/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31d2d6c..d1f8969 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@             -如果您觉得本框架具有一定的参考价值和借鉴意义，请帮忙在页面右上角 [**Star**] +如果您觉得本框架具有一定的参考价值和借鉴意义，请帮忙在页面右上角 [**Star**] ## 简介 From db7fc02bd14cbd071aa47d86ae2ca388ce85d71e Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Wed, 30 Nov 2022 17:41:17 +0800 Subject: [PATCH 23/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1f8969..31d2d6c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@             -如果您觉得本框架具有一定的参考价值和借鉴意义，请帮忙在页面右上角 [**Star**] +如果您觉得本框架具有一定的参考价值和借鉴意义，请帮忙在页面右上角 [**Star**] ## 简介 From 743e947630a886b9ba5ea16469784eaf216797fe Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 5 Dec 2022 10:13:57 +0800 Subject: [PATCH 24/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31d2d6c..cda8fa3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Nacos Group Member、Spring Cloud Alibaba Member From 4bef67c66780235cde9e4f711e81bdbdf427b955 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 5 Dec 2022 10:14:27 +0800 Subject: [PATCH 25/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cda8fa3..31d2d6c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Nacos Group Member、Spring Cloud Alibaba Member From 96d4dfcf68e2e4ff3480a8ea85b92671a817839d Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 5 Dec 2022 10:31:03 +0800 Subject: [PATCH 26/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31d2d6c..cda8fa3 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Nacos Group Member、Spring Cloud Alibaba Member From ac7c2b331746f7e1df1079344b1f740911e13d58 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 5 Dec 2022 10:31:17 +0800 Subject: [PATCH 27/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cda8fa3..31d2d6c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Nacos Group Member、Spring Cloud Alibaba Member From f84ce56a32a64f443c0b363e877734303921dc69 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 11 Dec 2022 19:03:13 +0800 Subject: [PATCH 28/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 31d2d6c..f2c4bfe 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 -- Nacos Group Member、Spring Cloud Alibaba Member +- Spring Cloud Alibaba Steering Committer、Nacos Group Member - Spring Cloud Alibaba、Nacos、Sentinel、OpenTracing Committer & Contributor @@ -32,8 +32,7 @@ | 框架名称 | 框架版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | | Discovery | 1.x.x ~ 6.x.x | Camden ~ Hoxton | 开源，永久免费 | -| DiscoveryX | 7.x.x | 2020 | 闭源，商业许可 | -| DiscoveryX | 8.x.x | 2021 | 闭源，商业许可 | +| DiscoveryX | 7.x.x ~ 9.x.x | 2020 ~ 2022 | 闭源，商业许可 | ② Polaris系列 @@ -49,8 +48,7 @@ Polaris为Discovery高级定制版，特色功能 | 框架名称 | 框架版本 | 支持Discovery版本 | 支持Spring Cloud版本 | 使用许可 | | --- | --- | --- | --- | --- | | Polaris | 1.x.x | 6.x.x | Finchley ~ Hoxton | 闭源，商业许可 | -| Polaris | 2.x.x | 7.x.x | 2020 | 闭源，商业许可 | -| Polaris | 2.x.x | 8.x.x | 2021 | 闭源，商业许可 | +| Polaris | 2.x.x | 7.x.x ~ 9.x.x | 2020 ~ 2022 | 闭源，商业许可 | 有商业版需求的企业和用户，请添加微信1394997，联系作者，洽谈合作事宜 @@ -65,18 +63,21 @@ Polaris为Discovery高级定制版，特色功能 - [解决方案WIKI版](http://nepxion.com/discovery) - [解决方案PPT版](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt.html) -③ 平台界面 +③ 最佳实践 +- [最佳实践PPT版](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt-1.html) + +④ 平台界面 - [平台界面WIKI版](http://nepxion.com/discovery-platform) -④ 框架源码 +⑤ 框架源码 - [框架源码Github版](https://github.com/Nepxion/Discovery) - [框架源码Gitee版](https://gitee.com/Nepxion/Discovery) -⑤ 指南示例源码 +⑥ 指南示例源码 - [指南示例源码Github版](https://github.com/Nepxion/DiscoveryGuide) - [指南示例源码Gitee版](https://gitee.com/Nepxion/DiscoveryGuide) -⑥ 指南示例说明 +⑦ 指南示例说明 - Spring Cloud Finchley ~ Hoxton版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple)，分支为6.x.x-simple - [极简版域网关部署指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-simple-domain-gateway)，分支为6.x.x-simple-domain-gateway From 86182e7dd30839c60b99e08f44f157aed6e8dac1 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Tue, 27 Dec 2022 13:38:42 +0800 Subject: [PATCH 29/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f2c4bfe..9c3abce 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ Polaris为Discovery高级定制版，特色功能 - [高级版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/6.x.x-complex)，分支为6.x.x-complex - Spring Cloud 202x版本 - [极简版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple)，分支为master-simple + - [极简版本地化指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master-simple-native)，分支为master-simple-native - [集成版指南示例](https://github.com/Nepxion/DiscoveryGuide/tree/master)，分支为master ![](http://nepxion.gitee.io/discovery/docs/polaris-doc/Logo64.png) Polaris【北极星】企业级云原生微服务商业解决方案 From 90688068f27b26b3a57d1ad15f1a19f7e1f33684 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Tue, 10 Jan 2023 15:37:45 +0800 Subject: [PATCH 30/40] Upgrade discovery version to 6.20.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dac4c40..689e764 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.19.0 + 6.20.0 3.23.2-GA From 96f680495a00d1a90c540ec93bf4fe0bfd650293 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Tue, 10 Jan 2023 16:00:25 +0800 Subject: [PATCH 31/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c3abce..945460e 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ### 作者简介 - Nepxion开源社区创始人 - 2020年阿里巴巴中国云原生峰会出品人 -- 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 +- 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 - 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 From bb126d8158180f14cc7ba8bbfcecb1c3376616e1 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Tue, 10 Jan 2023 16:00:42 +0800 Subject: [PATCH 32/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 945460e..9c3abce 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ### 作者简介 - Nepxion开源社区创始人 - 2020年阿里巴巴中国云原生峰会出品人 -- 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 +- 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 - 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 From aa7b01b7b079e9c2f4825a01b8fc150fa43e0148 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Tue, 17 Jan 2023 13:37:49 +0800 Subject: [PATCH 33/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c3abce..7b62f9c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Spring Boot](https://img.shields.io/maven-central/v/org.springframework.boot/spring-boot-dependencies.svg?label=Spring%20Boot&logo=Spring)](https://search.maven.org/artifact/org.springframework.boot/spring-boot-dependencies) [![Spring Cloud](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-dependencies.svg?label=Spring%20Cloud&logo=Spring)](https://search.maven.org/artifact/org.springframework.cloud/spring-cloud-dependencies) [![Spring Cloud Alibaba](https://img.shields.io/maven-central/v/com.alibaba.cloud/spring-cloud-alibaba-dependencies.svg?label=Spring%20Cloud%20Alibaba&logo=Spring)](https://search.maven.org/artifact/com.alibaba.cloud/spring-cloud-alibaba-dependencies) [![Nepxion Discovery](https://img.shields.io/maven-central/v/com.nepxion/discovery.svg?label=Nepxion%20Discovery&logo=Anaconda)](https://search.maven.org/artifact/com.nepxion/discovery) -[![Discovery PPT](https://img.shields.io/badge/Discovery%20-PPT-brightgreen?logo=Microsoft%20PowerPoint)](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt.html) [![Discovery WIKI](https://img.shields.io/badge/Discovery%20-WIKI-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discovery/) [![Discovery Platform WIKI](https://img.shields.io/badge/Discovery%20Platform%20-WIKI-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discoveryplatform) [![Polaris WIKI](https://img.shields.io/badge/Polaris%20-WIKI-brightgreen?logo=Microsoft%20Edge)](http://polaris-paas.gitee.io/polaris-sdk) +[![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label=GitHub)](https://github.com/Nepxion/Discovery/wiki) [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label=Gitee)](https://gitee.com/nepxion/Discovery/wikis/pages?sort_id=3993615&doc_id=1124387) [![Discovery PPT](https://img.shields.io/badge/Discovery%20-ppt-brightgreen?logo=Microsoft%20PowerPoint)](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt.html) [![Discovery Page](https://img.shields.io/badge/Discovery%20-page-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discovery/) [![Discovery Platform Page](https://img.shields.io/badge/Discovery%20Platform%20-page-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discoveryplatform) [![Polaris Page](https://img.shields.io/badge/Polaris%20-page-brightgreen?logo=Microsoft%20Edge)](http://polaris-paas.gitee.io/polaris-sdk)             From 92db14c8c88093ff49526716dd5c1ff0f7a9158e Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 3 Feb 2023 20:38:03 +0800 Subject: [PATCH 34/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b62f9c..ba7f6b9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Spring Cloud Alibaba Steering Committer、Nacos Group Member From c9b44bc02343bc5e7379ce02e0428d29a5429bca Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Fri, 3 Feb 2023 20:38:17 +0800 Subject: [PATCH 35/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba7f6b9..7b62f9c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ - 2020年阿里巴巴中国云原生峰会出品人 - 2020年被Nacos和Spring Cloud Alibaba纳入相关开源项目 - 2021年阿里巴巴技术峰会上海站演讲嘉宾 -- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 +- 2021年荣获陆奇博士主持的奇绩资本，进行风险投资的关注和调研 - 2021年入选Gitee最有价值开源项目 - 阿里巴巴官方书籍《Nacos架构与原理》作者之一 - Spring Cloud Alibaba Steering Committer、Nacos Group Member From 8863f486a53f7ea54caa53b6a57ad4697d25edfa Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Mon, 20 Mar 2023 14:08:01 +0800 Subject: [PATCH 36/40] Upgrade Discovery version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 689e764..4da3242 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ - 6.20.0 + 6.21.0 3.23.2-GA From 2b503c1a2aae5c977b0a8913f67becdd2f3242a7 Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Sun, 9 Apr 2023 20:40:40 +0800 Subject: [PATCH 37/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=8B=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7b62f9c..fa6ff62 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ ![](http://nepxion.gitee.io/discovery/docs/discovery-doc/Banner.png) # Discovery【探索】云原生微服务解决方案 -![Total visits](https://visitor-badge.laobi.icu/badge?page_id=Nepxion&title=total%20visits) [![Total lines](https://tokei.rs/b1/github/Nepxion/Discovery?category=lines)](https://tokei.rs/b1/github/Nepxion/Discovery?category=lines) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license)](https://github.com/Nepxion/Discovery/blob/6.x.x/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/com.nepxion/discovery.svg?label=maven)](https://search.maven.org/artifact/com.nepxion/discovery) [![Javadocs](http://www.javadoc.io/badge/com.nepxion/discovery-plugin-framework-starter.svg)](http://www.javadoc.io/doc/com.nepxion/discovery-plugin-framework-starter) [![Build Status](https://travis-ci.org/Nepxion/Discovery.svg?branch=6.x.x)](https://travis-ci.org/Nepxion/Discovery) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/5c42eb719ef64def9cad773abd877e8b)](https://www.codacy.com/gh/Nepxion/Discovery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Nepxion/Discovery&utm_campaign=Badge_Grade) [![Stars](https://img.shields.io/github/stars/Nepxion/Discovery.svg?label=Stars&tyle=flat&logo=GitHub)](https://github.com/Nepxion/Discovery/stargazers) [![Stars](https://gitee.com/Nepxion/Discovery/badge/star.svg?theme=gvp)](https://gitee.com/Nepxion/Discovery/stargazers) - -[![Spring Boot](https://img.shields.io/maven-central/v/org.springframework.boot/spring-boot-dependencies.svg?label=Spring%20Boot&logo=Spring)](https://search.maven.org/artifact/org.springframework.boot/spring-boot-dependencies) [![Spring Cloud](https://img.shields.io/maven-central/v/org.springframework.cloud/spring-cloud-dependencies.svg?label=Spring%20Cloud&logo=Spring)](https://search.maven.org/artifact/org.springframework.cloud/spring-cloud-dependencies) [![Spring Cloud Alibaba](https://img.shields.io/maven-central/v/com.alibaba.cloud/spring-cloud-alibaba-dependencies.svg?label=Spring%20Cloud%20Alibaba&logo=Spring)](https://search.maven.org/artifact/com.alibaba.cloud/spring-cloud-alibaba-dependencies) [![Nepxion Discovery](https://img.shields.io/maven-central/v/com.nepxion/discovery.svg?label=Nepxion%20Discovery&logo=Anaconda)](https://search.maven.org/artifact/com.nepxion/discovery) +![Total visits](https://visitor-badge.laobi.icu/badge?page_id=Nepxion&title=total%20visits) [![Total lines](https://tokei.rs/b1/github/Nepxion/Discovery?category=lines)](https://tokei.rs/b1/github/Nepxion/Discovery?category=lines) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license)](https://github.com/Nepxion/Discovery/blob/6.x.x/LICENSE) [![Maven Central](https://img.shields.io/maven-central/v/com.nepxion/discovery.svg?label=maven)](https://search.maven.org/artifact/com.nepxion/discovery) [![Javadocs](http://www.javadoc.io/badge/com.nepxion/discovery-plugin-framework-starter.svg)](http://www.javadoc.io/doc/com.nepxion/discovery-plugin-framework-starter) [![Build Status](https://github.com/Nepxion/Discovery/workflows/build/badge.svg)](https://github.com/Nepxion/Discovery/actions) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/5c42eb719ef64def9cad773abd877e8b)](https://www.codacy.com/gh/Nepxion/Discovery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=Nepxion/Discovery&utm_campaign=Badge_Grade) [![Stars](https://img.shields.io/github/stars/Nepxion/Discovery.svg?label=Stars&tyle=flat&logo=GitHub)](https://github.com/Nepxion/Discovery/stargazers) [![Stars](https://gitee.com/Nepxion/Discovery/badge/star.svg?theme=gvp)](https://gitee.com/Nepxion/Discovery/stargazers) [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label=GitHub)](https://github.com/Nepxion/Discovery/wiki) [![Wiki](https://badgen.net/badge/icon/wiki?icon=wiki&label=Gitee)](https://gitee.com/nepxion/Discovery/wikis/pages?sort_id=3993615&doc_id=1124387) [![Discovery PPT](https://img.shields.io/badge/Discovery%20-ppt-brightgreen?logo=Microsoft%20PowerPoint)](http://nepxion.gitee.io/discovery/docs/link-doc/discovery-ppt.html) [![Discovery Page](https://img.shields.io/badge/Discovery%20-page-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discovery/) [![Discovery Platform Page](https://img.shields.io/badge/Discovery%20Platform%20-page-brightgreen?logo=Microsoft%20Edge)](http://nepxion.gitee.io/discoveryplatform) [![Polaris Page](https://img.shields.io/badge/Polaris%20-page-brightgreen?logo=Microsoft%20Edge)](http://polaris-paas.gitee.io/polaris-sdk) From e040cdccc55a018f2344a473bd295c280dc4871c Mon Sep 17 00:00:00 2001 From: zhanglin Date: Thu, 23 Nov 2023 15:25:45 +0800 Subject: [PATCH 38/40] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9Java=208?= =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7=EF=BC=88Supplier=EF=BC=89=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agent/plugin/thread/ThreadConstant.java | 3 +- .../agent/plugin/thread/ThreadPlugin.java | 35 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java index 93c3cd3..f767dc1 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java @@ -18,9 +18,10 @@ public class ThreadConstant { public static final String THREAD_REQUEST_DECORATOR_ENABLED = "thread.request.decorator.enabled"; public static final String RUNNABLE_CLASS_NAME = "java.lang.Runnable"; public static final String CALLABLE_CLASS_NAME = "java.util.concurrent.Callable"; + public static final String SUPPLIER_CLASS_NAME = "java.util.function.Supplier"; public static final String THREAD_SCAN_PACKAGES_DELIMITERS = ";"; public static final String CONSTRUCTOR_INTERCEPTOR = String.format("%s.before(this);\n", ThreadConstructorInterceptor.class.getName()); public static final String RUN_BEFORE_INTERCEPTOR = String.format("%s.before(this);\n", ThreadCallInterceptor.class.getName()); public static final String RUN_AFTER_INTERCEPTOR = String.format("%s.after(this);\n", ThreadCallInterceptor.class.getName()); -} \ No newline at end of file +} diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java index 4c33014..150f94e 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java @@ -61,11 +61,14 @@ public void install(TransformTemplate transformTemplate) { RunnableTransformCallback runnableTransformCallback = new RunnableTransformCallback(); CallableTransformCallback callableTransformCallback = new CallableTransformCallback(); + SupplierTransformCallback supplierTransformCallback = new SupplierTransformCallback(); for (String basePackage : scanPackages) { MatcherOperator runnableInterfaceMatcherOperator = MatcherFactory.newPackageBasedMatcher(basePackage, ThreadConstant.RUNNABLE_CLASS_NAME); MatcherOperator callableInterfaceMatcherOperator = MatcherFactory.newPackageBasedMatcher(basePackage, ThreadConstant.CALLABLE_CLASS_NAME); + MatcherOperator supplierInterfaceMatcherOperator = MatcherFactory.newPackageBasedMatcher(basePackage, ThreadConstant.SUPPLIER_CLASS_NAME); transformTemplate.transform(runnableInterfaceMatcherOperator, runnableTransformCallback); transformTemplate.transform(callableInterfaceMatcherOperator, callableTransformCallback); + transformTemplate.transform(supplierInterfaceMatcherOperator, supplierTransformCallback); } LOG.info(String.format("%s install successfully", this.getClass().getSimpleName())); @@ -169,4 +172,34 @@ public byte[] doInTransform(ClassLoader classLoader, String className, Class } } } -} \ No newline at end of file + + public static class SupplierTransformCallback implements TransformCallback { + @Override + public byte[] doInTransform(ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { + try { + ClassInfo classInfo = new ClassInfo(className, classfileBuffer, classLoader); + CtClass ctClass = classInfo.getCtClass(); + + addField(ctClass, AsyncContextAccessor.class); + + CtConstructor[] declaredConstructors = ctClass.getDeclaredConstructors(); + for (CtConstructor ctConstructor : declaredConstructors) { + ctConstructor.insertAfter(ThreadConstant.CONSTRUCTOR_INTERCEPTOR); + } + + CtMethod ctMethod = ctClass.getDeclaredMethod("get"); + if (null != ctMethod) { + ctMethod.insertBefore(ThreadConstant.RUN_BEFORE_INTERCEPTOR); + ctMethod.insertAfter(ThreadConstant.RUN_AFTER_INTERCEPTOR); + } + + return ctClass.toBytecode(); + } catch (Exception e) { + LOG.warn(String.format("Transform %s error, message:", className), e); + + return null; + } + } + } + +} From a77633f0e9891f39f1d139e7cae98a6e2347ec9c Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Thu, 23 Nov 2023 19:00:15 +0800 Subject: [PATCH 39/40] Enhance ThreadTransformCallback --- .../agent/plugin/thread/ThreadConstant.java | 5 +- .../agent/plugin/thread/ThreadPlugin.java | 140 ++---------------- .../thread/ThreadTransformCallback.java | 99 +++++++++++++ 3 files changed, 114 insertions(+), 130 deletions(-) create mode 100644 discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadTransformCallback.java diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java index f767dc1..b8e6df7 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadConstant.java @@ -17,11 +17,14 @@ public class ThreadConstant { public static final String THREAD_SCAN_PACKAGES = "thread.scan.packages"; public static final String THREAD_REQUEST_DECORATOR_ENABLED = "thread.request.decorator.enabled"; public static final String RUNNABLE_CLASS_NAME = "java.lang.Runnable"; + public static final String RUNNABLE_IMPL_METHOD_NAME = "run"; public static final String CALLABLE_CLASS_NAME = "java.util.concurrent.Callable"; + public static final String CALLABLE_IMPL_METHOD_NAME = "call"; public static final String SUPPLIER_CLASS_NAME = "java.util.function.Supplier"; + public static final String SUPPLIER_IMPL_METHOD_NAME = "get"; public static final String THREAD_SCAN_PACKAGES_DELIMITERS = ";"; public static final String CONSTRUCTOR_INTERCEPTOR = String.format("%s.before(this);\n", ThreadConstructorInterceptor.class.getName()); public static final String RUN_BEFORE_INTERCEPTOR = String.format("%s.before(this);\n", ThreadCallInterceptor.class.getName()); public static final String RUN_AFTER_INTERCEPTOR = String.format("%s.after(this);\n", ThreadCallInterceptor.class.getName()); -} +} \ No newline at end of file diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java index 150f94e..6d9de08 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadPlugin.java @@ -8,28 +8,16 @@ * @author zifeihan * @version 1.0 */ - -import javassist.ClassPool; -import javassist.CtClass; -import javassist.CtConstructor; -import javassist.CtField; -import javassist.CtMethod; - -import java.lang.reflect.Method; -import java.security.ProtectionDomain; import java.util.HashSet; import java.util.List; import java.util.Properties; -import com.nepxion.discovery.agent.async.AsyncContextAccessor; -import com.nepxion.discovery.agent.callback.TransformCallback; import com.nepxion.discovery.agent.callback.TransformTemplate; import com.nepxion.discovery.agent.config.Config; import com.nepxion.discovery.agent.logger.AgentLogger; import com.nepxion.discovery.agent.matcher.MatcherFactory; import com.nepxion.discovery.agent.matcher.MatcherOperator; import com.nepxion.discovery.agent.plugin.Plugin; -import com.nepxion.discovery.agent.util.ClassInfo; import com.nepxion.discovery.agent.util.StringUtil; public class ThreadPlugin extends Plugin { @@ -74,132 +62,26 @@ public void install(TransformTemplate transformTemplate) { LOG.info(String.format("%s install successfully", this.getClass().getSimpleName())); } - public static class RunnableTransformCallback implements TransformCallback { + public static class RunnableTransformCallback extends ThreadTransformCallback { @Override - public byte[] doInTransform(ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { - try { - ClassInfo classInfo = new ClassInfo(className, classfileBuffer, classLoader); - CtClass ctClass = classInfo.getCtClass(); - - addField(ctClass, AsyncContextAccessor.class); - - CtConstructor[] declaredConstructors = ctClass.getDeclaredConstructors(); - for (CtConstructor ctConstructor : declaredConstructors) { - ctConstructor.insertAfter(ThreadConstant.CONSTRUCTOR_INTERCEPTOR); - } - - CtMethod ctMethod = ctClass.getDeclaredMethod("run"); - if (null != ctMethod) { - ctMethod.insertBefore(ThreadConstant.RUN_BEFORE_INTERCEPTOR); - ctMethod.insertAfter(ThreadConstant.RUN_AFTER_INTERCEPTOR); - } - - return ctClass.toBytecode(); - } catch (Exception e) { - LOG.warn(String.format("Transform %s error,message:", className), e); - - return null; - } + public String getImplMethodName() { + return ThreadConstant.RUNNABLE_IMPL_METHOD_NAME; } } - public static void addField(CtClass ctClass, Class clazz) { - try { - ClassPool aDefault = ClassPool.getDefault(); - CtClass makeInterface = aDefault.makeInterface(clazz.getName()); - ctClass.addInterface(makeInterface); - - Method[] methods = clazz.getDeclaredMethods(); - if (methods.length != 2) { - throw new IllegalArgumentException("accessorType has to declare 2 methods. " + clazz.getName() + " has " + methods.length); - } - - Method getter; - Method setter; - - if (methods[0].getParameterTypes().length == 0) { - getter = methods[0]; - setter = methods[1]; - } else { - getter = methods[1]; - setter = methods[0]; - } - - Class fieldType = getter.getReturnType(); - String fieldName = fieldType.getSimpleName().toLowerCase(); - String field = String.format("private %s %s;", fieldType.getName(), fieldName); - - CtField f1 = CtField.make(field, ctClass); - ctClass.addField(f1); - - String getMethod = String.format("public %s %s(){return %s;}", fieldType.getName(), getter.getName(), fieldName); - String setMethod = String.format("public void %s(%s %s){this.%s = %s;}", setter.getName(), fieldType.getName(), fieldName, fieldName, fieldName); - - CtMethod m1 = CtMethod.make(getMethod, ctClass); - CtMethod m2 = CtMethod.make(setMethod, ctClass); - ctClass.addMethod(m1); - ctClass.addMethod(m2); - } catch (Exception e) { - LOG.warn(String.format("Add field %s error, message:", clazz.getName()), e); - } - } + public static class CallableTransformCallback extends ThreadTransformCallback { - public static class CallableTransformCallback implements TransformCallback { @Override - public byte[] doInTransform(ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { - try { - ClassInfo classInfo = new ClassInfo(className, classfileBuffer, classLoader); - CtClass ctClass = classInfo.getCtClass(); - - addField(ctClass, AsyncContextAccessor.class); - - CtConstructor[] declaredConstructors = ctClass.getDeclaredConstructors(); - for (CtConstructor ctConstructor : declaredConstructors) { - ctConstructor.insertAfter(ThreadConstant.CONSTRUCTOR_INTERCEPTOR); - } - - CtMethod ctMethod = ctClass.getDeclaredMethod("call"); - if (null != ctMethod) { - ctMethod.insertBefore(ThreadConstant.RUN_BEFORE_INTERCEPTOR); - ctMethod.insertAfter(ThreadConstant.RUN_AFTER_INTERCEPTOR); - } - - return ctClass.toBytecode(); - } catch (Exception e) { - LOG.warn(String.format("Transform %s error, message:", className), e); - - return null; - } + public String getImplMethodName() { + return ThreadConstant.CALLABLE_IMPL_METHOD_NAME; } } - public static class SupplierTransformCallback implements TransformCallback { - @Override - public byte[] doInTransform(ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { - try { - ClassInfo classInfo = new ClassInfo(className, classfileBuffer, classLoader); - CtClass ctClass = classInfo.getCtClass(); - - addField(ctClass, AsyncContextAccessor.class); - - CtConstructor[] declaredConstructors = ctClass.getDeclaredConstructors(); - for (CtConstructor ctConstructor : declaredConstructors) { - ctConstructor.insertAfter(ThreadConstant.CONSTRUCTOR_INTERCEPTOR); - } - - CtMethod ctMethod = ctClass.getDeclaredMethod("get"); - if (null != ctMethod) { - ctMethod.insertBefore(ThreadConstant.RUN_BEFORE_INTERCEPTOR); - ctMethod.insertAfter(ThreadConstant.RUN_AFTER_INTERCEPTOR); - } + public static class SupplierTransformCallback extends ThreadTransformCallback { - return ctClass.toBytecode(); - } catch (Exception e) { - LOG.warn(String.format("Transform %s error, message:", className), e); - - return null; - } + @Override + public String getImplMethodName() { + return ThreadConstant.SUPPLIER_IMPL_METHOD_NAME; } } - -} +} \ No newline at end of file diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadTransformCallback.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadTransformCallback.java new file mode 100644 index 0000000..a611960 --- /dev/null +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/plugin/thread/ThreadTransformCallback.java @@ -0,0 +1,99 @@ +package com.nepxion.discovery.agent.plugin.thread; + +/** + *

Title: Nepxion Discovery

+ *

Description: Nepxion Discovery

+ *

Copyright: Copyright (c) 2017-2050

+ *

Company: Nepxion

+ * @author zifeihan + * @version 1.0 + */ + +import javassist.ClassPool; +import javassist.CtClass; +import javassist.CtConstructor; +import javassist.CtField; +import javassist.CtMethod; + +import java.lang.reflect.Method; +import java.security.ProtectionDomain; + +import com.nepxion.discovery.agent.async.AsyncContextAccessor; +import com.nepxion.discovery.agent.callback.TransformCallback; +import com.nepxion.discovery.agent.logger.AgentLogger; +import com.nepxion.discovery.agent.util.ClassInfo; + +public abstract class ThreadTransformCallback implements TransformCallback { + private static final AgentLogger LOG = AgentLogger.getLogger(ThreadTransformCallback.class.getName()); + + @Override + public byte[] doInTransform(ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { + try { + ClassInfo classInfo = new ClassInfo(className, classfileBuffer, classLoader); + CtClass ctClass = classInfo.getCtClass(); + + addField(ctClass, AsyncContextAccessor.class); + + CtConstructor[] declaredConstructors = ctClass.getDeclaredConstructors(); + for (CtConstructor ctConstructor : declaredConstructors) { + ctConstructor.insertAfter(ThreadConstant.CONSTRUCTOR_INTERCEPTOR); + } + + String implMethodName = getImplMethodName(); + CtMethod ctMethod = ctClass.getDeclaredMethod(implMethodName); + if (null != ctMethod) { + ctMethod.insertBefore(ThreadConstant.RUN_BEFORE_INTERCEPTOR); + ctMethod.insertAfter(ThreadConstant.RUN_AFTER_INTERCEPTOR); + } + + return ctClass.toBytecode(); + } catch (Exception e) { + LOG.warn(String.format("Transform %s error, message:", className), e); + + return null; + } + } + + public void addField(CtClass ctClass, Class clazz) { + try { + ClassPool aDefault = ClassPool.getDefault(); + CtClass makeInterface = aDefault.makeInterface(clazz.getName()); + ctClass.addInterface(makeInterface); + + Method[] methods = clazz.getDeclaredMethods(); + if (methods.length != 2) { + throw new IllegalArgumentException("accessorType has to declare 2 methods. " + clazz.getName() + " has " + methods.length); + } + + Method getter; + Method setter; + + if (methods[0].getParameterTypes().length == 0) { + getter = methods[0]; + setter = methods[1]; + } else { + getter = methods[1]; + setter = methods[0]; + } + + Class fieldType = getter.getReturnType(); + String fieldName = fieldType.getSimpleName().toLowerCase(); + String field = String.format("private %s %s;", fieldType.getName(), fieldName); + + CtField f1 = CtField.make(field, ctClass); + ctClass.addField(f1); + + String getMethod = String.format("public %s %s(){return %s;}", fieldType.getName(), getter.getName(), fieldName); + String setMethod = String.format("public void %s(%s %s){this.%s = %s;}", setter.getName(), fieldType.getName(), fieldName, fieldName, fieldName); + + CtMethod m1 = CtMethod.make(getMethod, ctClass); + CtMethod m2 = CtMethod.make(setMethod, ctClass); + ctClass.addMethod(m1); + ctClass.addMethod(m2); + } catch (Exception e) { + LOG.warn(String.format("Add field %s error, message:", clazz.getName()), e); + } + } + + public abstract String getImplMethodName(); +} \ No newline at end of file From 4a2c787f4a1fe591d21e291eed16d77cace2431f Mon Sep 17 00:00:00 2001 From: HaojunRen <1394997@qq.com> Date: Thu, 23 Nov 2023 19:06:15 +0800 Subject: [PATCH 40/40] Bump version to 1.3.0 --- discovery-agent-example/discovery-agent-example-agent/pom.xml | 2 +- .../discovery-agent-example-application/pom.xml | 2 +- discovery-agent-example/discovery-agent-example-sdk/pom.xml | 2 +- discovery-agent-example/pom.xml | 2 +- discovery-agent-starter-plugin-mdc/pom.xml | 2 +- discovery-agent-starter-plugin-strategy/pom.xml | 2 +- discovery-agent-starter/pom.xml | 2 +- .../discovery/agent/constant/DiscoveryAgentConstant.java | 2 +- pom.xml | 2 +- version.bat | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/discovery-agent-example/discovery-agent-example-agent/pom.xml b/discovery-agent-example/discovery-agent-example-agent/pom.xml index 6405a87..95da492 100644 --- a/discovery-agent-example/discovery-agent-example-agent/pom.xml +++ b/discovery-agent-example/discovery-agent-example-agent/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent-example - 1.2.0 + 1.3.0 diff --git a/discovery-agent-example/discovery-agent-example-application/pom.xml b/discovery-agent-example/discovery-agent-example-application/pom.xml index b07b224..110410e 100644 --- a/discovery-agent-example/discovery-agent-example-application/pom.xml +++ b/discovery-agent-example/discovery-agent-example-application/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent-example - 1.2.0 + 1.3.0 diff --git a/discovery-agent-example/discovery-agent-example-sdk/pom.xml b/discovery-agent-example/discovery-agent-example-sdk/pom.xml index 034a5d1..212f054 100644 --- a/discovery-agent-example/discovery-agent-example-sdk/pom.xml +++ b/discovery-agent-example/discovery-agent-example-sdk/pom.xml @@ -9,6 +9,6 @@ com.nepxion discovery-agent-example - 1.2.0 + 1.3.0 \ No newline at end of file diff --git a/discovery-agent-example/pom.xml b/discovery-agent-example/pom.xml index 1d95a76..c38f832 100644 --- a/discovery-agent-example/pom.xml +++ b/discovery-agent-example/pom.xml @@ -9,7 +9,7 @@ com.nepxion discovery-agent - 1.2.0 + 1.3.0 diff --git a/discovery-agent-starter-plugin-mdc/pom.xml b/discovery-agent-starter-plugin-mdc/pom.xml index 75118a6..70fb603 100644 --- a/discovery-agent-starter-plugin-mdc/pom.xml +++ b/discovery-agent-starter-plugin-mdc/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.2.0 + 1.3.0 diff --git a/discovery-agent-starter-plugin-strategy/pom.xml b/discovery-agent-starter-plugin-strategy/pom.xml index 0df63bb..4a9dc7e 100644 --- a/discovery-agent-starter-plugin-strategy/pom.xml +++ b/discovery-agent-starter-plugin-strategy/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.2.0 + 1.3.0 diff --git a/discovery-agent-starter/pom.xml b/discovery-agent-starter/pom.xml index 40c3025..0e2b7d0 100644 --- a/discovery-agent-starter/pom.xml +++ b/discovery-agent-starter/pom.xml @@ -11,7 +11,7 @@ com.nepxion discovery-agent - 1.2.0 + 1.3.0 diff --git a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java index d1cc872..84c00ec 100644 --- a/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java +++ b/discovery-agent-starter/src/main/java/com/nepxion/discovery/agent/constant/DiscoveryAgentConstant.java @@ -10,7 +10,7 @@ */ public class DiscoveryAgentConstant { - public static final String DISCOVERY_AGENT_VERSION = "1.2.0"; + public static final String DISCOVERY_AGENT_VERSION = "1.3.0"; public static final String SPRING_APPLICATION_DISCOVERY_AGENT_VERSION = "spring.application.discovery.agent.version"; } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4da3242..bdca16d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ Nepxion Discovery Agent pom 4.0.0 - 1.2.0 + 1.3.0 Nepxion Discovery Agent is a java agent to resolve loss of ThreadLocal in cross-thread scenario, such as Spring Async、Hystrix Thread、Runnable、Callable、Single Thread、Thread Pool、MDC http://www.nepxion.com diff --git a/version.bat b/version.bat index 2f17fdf..1f6d54a 100644 --- a/version.bat +++ b/version.bat @@ -15,5 +15,5 @@ @title Nepxion Discovery @color 0a -call mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.2.0 +call mvn versions:set -DgenerateBackupPoms=false -DnewVersion=1.3.0 pause \ No newline at end of file