This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a change to branch feat/github_ci
in repository https://gitbox.apache.org/repos/asf/shenyu.git
from 36b2bfa94f Merge branch 'master' into feat/github_ci
add 5dfa3d1198 Bump org.apache.kafka:kafka-clients from 3.7.1 to 3.9.1
(#6037)
add ff289b43eb [type:feat] bootstrap instances status (#5950)
add 03d3d1cc63 [type:fix] (logging-rabbitmq): Fixed the issue where
Rabbitmq log configuration was not refreshed correctly after modification.
(#6001)
add 9ac8659040 modify dubbo plugin configuration based on selector (#5953)
add 2fe9ab0ec2 Merge branch 'master' into feat/github_ci
No new revisions were added by this update.
Summary of changes:
.gitignore | 3 +
db/init/mysql/schema.sql | 35 +-
db/init/ob/schema.sql | 23 +-
db/init/og/create-table.sql | 28 +-
db/init/oracle/schema.sql | 31 +-
db/init/pg/create-table.sql | 28 +-
db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 19 +-
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 16 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 29 +-
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 29 ++
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 27 ++
pom.xml | 2 +-
.../admin/controller/InstanceController.java | 96 +++++
.../subscriber/URIRegisterExecutorSubscriber.java | 2 +-
.../{FieldMapper.java => InstanceInfoMapper.java} | 79 ++--
.../shenyu/admin/model/dto/InstanceInfoDTO.java | 217 +++++++++++
.../shenyu/admin/model/entity/InstanceInfoDO.java | 409 +++++++++++++++++++++
.../{SelectorQuery.java => InstanceQuery.java} | 161 ++++----
...yCondition.java => InstanceQueryCondition.java} | 27 +-
.../shenyu/admin/model/vo/InstanceInfoVO.java | 215 +++++++++++
...DetailService.java => InstanceInfoService.java} | 56 +--
.../service/impl/InstanceInfoServiceImpl.java | 111 ++++++
.../src/main/resources/application-mysql.yml | 2 +-
shenyu-admin/src/main/resources/application.yml | 2 +-
.../resources/mappers/instance-info-sqlmap.xml | 154 ++++++++
.../main/resources/mappers/meta-data-sqlmap.xml | 1 -
.../src/main/resources/sql-script/h2/schema.sql | 28 ++
.../ShenyuClientURIExecutorSubscriber.java | 8 +-
shenyu-common/pom.xml | 7 +
.../apache/shenyu/common/constant/Constants.java | 15 +
...deConstants.java => InstanceTypeConstants.java} | 24 +-
.../shenyu/common/utils/SystemInfoUtils.java | 68 ++++
.../src/main/resources/application.yml | 2 +-
.../rabbitmq/config/RabbitmqLogCollectConfig.java | 5 +-
.../rabbitmq/LoggingRabbitmqPluginTest.java | 3 +-
.../client/RabbitmqLogCollectClientTest.java | 3 +-
.../collector/RabbitmqLogCollectorTest.java | 2 +-
.../config/RabbitmqLogCollectConfigTest.java | 2 +-
.../LoggingRabbitmqPluginDataHandlerTest.java | 170 +++++++++
.../LoggingRabbitmqPluginDataHandlerTest.java | 99 -----
.../plugin/apache/dubbo/ApacheDubboPlugin.java | 2 +-
.../apache/dubbo/cache/ApacheDubboConfigCache.java | 287 ++++++++++++++-
.../dubbo/handler/ApacheDubboMetaDataHandler.java | 8 +-
.../handler/ApacheDubboPluginDataHandler.java | 12 +
.../dubbo/proxy/ApacheDubboProxyService.java | 111 +++++-
.../dubbo/proxy/ApacheDubboProxyServiceTest.java | 15 +-
.../handler/AbstractDubboMetaDataHandler.java | 4 +-
.../handler/AbstractDubboPluginDataHandler.java | 12 +
.../AbstractDubboPluginDataHandlerTest.java | 8 +
.../shenyu/register/common/type/DataType.java | 5 +
51 files changed, 2370 insertions(+), 334 deletions(-)
create mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/InstanceController.java
copy
shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/{FieldMapper.java =>
InstanceInfoMapper.java} (50%)
create mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/InstanceInfoDTO.java
create mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/InstanceInfoDO.java
copy
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/{SelectorQuery.java
=> InstanceQuery.java} (53%)
copy
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/{PluginQueryCondition.java
=> InstanceQueryCondition.java} (76%)
create mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/InstanceInfoVO.java
copy
shenyu-admin/src/main/java/org/apache/shenyu/admin/service/{DetailService.java
=> InstanceInfoService.java} (51%)
create mode 100644
shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/InstanceInfoServiceImpl.java
create mode 100644
shenyu-admin/src/main/resources/mappers/instance-info-sqlmap.xml
copy
shenyu-common/src/main/java/org/apache/shenyu/common/constant/{RunningModeConstants.java
=> InstanceTypeConstants.java} (64%)
create mode 100644
shenyu-common/src/main/java/org/apache/shenyu/common/utils/SystemInfoUtils.java
rename
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin
=> plugin}/logging/rabbitmq/LoggingRabbitmqPluginTest.java (97%)
rename
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin
=> plugin}/logging/rabbitmq/client/RabbitmqLogCollectClientTest.java (95%)
rename
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin
=> plugin}/logging/rabbitmq/collector/RabbitmqLogCollectorTest.java (97%)
rename
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/{plulgin
=> plugin}/logging/rabbitmq/config/RabbitmqLogCollectConfigTest.java (98%)
create mode 100644
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plugin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java
delete mode 100644
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rabbitmq/src/test/java/org/apache/shenyu/plulgin/logging/rabbitmq/handler/LoggingRabbitmqPluginDataHandlerTest.java
