This is an automated email from the ASF dual-hosted git repository.

liuhongyu pushed a commit to branch 2.7.1
in repository https://gitbox.apache.org/repos/asf/shenyu.git

commit 0f9319e9f96750a5d1cbe4e6768f36b134451a4c
Merge: 04f8a4d564 481d6ec0f8
Author: liuhy <[email protected]>
AuthorDate: Sat Dec 21 13:53:20 2024 +0800

    Merge branch 'refs/heads/master' into 2.7.1

 db/init/mysql/schema.sql                           |   7 +
 db/init/ob/schema.sql                              |   8 +-
 db/init/og/create-table.sql                        |   7 +
 db/init/oracle/schema.sql                          |  22 +++
 db/init/pg/create-table.sql                        |   7 +
 db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql           |   9 +-
 db/upgrade/2.6.1-upgrade-2.7.0-og.sql              |   8 +-
 db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql          |  22 +++
 db/upgrade/2.6.1-upgrade-2.7.0-pg.sql              |   7 +
 .../controller/NamespacePluginController.java      |  21 ++-
 .../shenyu/admin/controller/PluginController.java  |  12 --
 .../admin/controller/SelectorController.java       |   8 +-
 .../discovery/AbstractDiscoveryProcessor.java      |  11 ++
 .../shenyu/admin/discovery/DiscoveryProcessor.java |   7 +
 .../admin/discovery/LocalDiscoveryProcessor.java   |  11 ++
 .../admin/listener/ApplicationStartListener.java   |   6 +-
 .../admin/mapper/NamespacePluginRelMapper.java     |  22 ++-
 .../apache/shenyu/admin/model/entity/PluginDO.java |   2 +-
 .../admin/service/NamespacePluginService.java      |  16 ++-
 .../apache/shenyu/admin/service/PluginService.java |  16 ---
 .../service/impl/AlertDispatchServiceImpl.java     |   2 +-
 .../admin/service/impl/ConfigsServiceImpl.java     |  84 +++++++++++-
 .../service/impl/DataPermissionServiceImpl.java    |   6 -
 .../service/impl/NamespacePluginServiceImpl.java   |  66 ++++++---
 .../admin/service/impl/PluginServiceImpl.java      |  76 +----------
 .../admin/service/impl/SelectorServiceImpl.java    |   4 +-
 .../mappers/namespace-plugin-rel-sqlmap.xml        |  44 +++++-
 .../src/main/resources/sql-script/h2/schema.sql    |   5 +
 .../src/main/resources/static/index.8fa6763d.js    |   1 -
 .../src/main/resources/static/index.999a4920.js    |   1 -
 .../src/main/resources/static/index.bb51b115.js    |   1 -
 .../src/main/resources/static/index.c6b9f733.js    |   1 +
 shenyu-admin/src/main/resources/static/index.html  |   2 +-
 .../discovery/LocalDiscoveryProcessorTest.java     |   7 +
 .../shenyu/admin/service/ConfigsServiceTest.java   |   8 +-
 .../src/main/resources/application.yml             |   4 -
 .../AbstractContextRefreshedEventListener.java     |   4 +-
 .../dubbo/annotation/ShenyuDubboService.java       |  21 ++-
 .../apache/dubbo/annotation/ShenyuService.java     |  22 ++-
 .../ShenyuDubboServiceDefaultValueTest.java        | 150 +++++++++++++++++++++
 .../apache/shenyu/common/constant/Constants.java   |  10 ++
 .../common/constant/ExportImportConstants.java     |  15 +++
 .../common/dto/convert/rule/RequestHandle.java     | 101 ++++++++++++++
 .../common/enums/HeaderUniqueStrategyEnum.java     |  39 ++++++
 .../shenyu/common/enums/UniqueHeaderEnum.java      |  41 ++++++
 .../src/main/release-docs/LICENSE                  |  33 ++---
 .../shenyu/e2e/client/admin/AdminClient.java       |   8 +-
 .../shenyu/e2e/model/data/NamespaceSyncData.java   |  46 +++++++
 shenyu-examples/shenyu-examples-http/Dockerfile    |   2 +-
 .../shenyu-examples-springcloud/pom.xml            |  24 +---
 .../httpclient/AbstractHttpClientPlugin.java       |  22 ++-
 .../plugin/httpclient/NettyHttpClientPlugin.java   |  34 ++---
 .../shenyu/plugin/httpclient/WebClientPlugin.java  |  32 ++---
 .../config/DuplicateResponseHeaderProperties.java  |  90 -------------
 .../httpclient/NettyHttpClientPluginTest.java      |   3 +-
 .../plugin/httpclient/WebClientPluginTest.java     |  11 +-
 .../logging/common/AbstractLoggingPlugin.java      |   7 +-
 .../logging/console/LoggingConsolePlugin.java      |  30 ++++-
 .../config/ElasticSearchLogCollectConfig.java      |   2 +-
 .../plugin/springcloud/SpringCloudPlugin.java      |  10 +-
 .../handler/SpringCloudPluginDataHandler.java      |  22 ++-
 .../shenyu/plugin/request/RequestPlugin.java       |  17 ++-
 shenyu-registry/shenyu-registry-eureka/pom.xml     |   6 -
 ...yuSpringMvcClientInfoRegisterConfiguration.java |   4 -
 .../httpclient/HttpClientPluginConfiguration.java  |  22 +--
 65 files changed, 947 insertions(+), 422 deletions(-)


Reply via email to