This is an automated email from the ASF dual-hosted git repository. liuhongyu pushed a change to branch fix/fix_sync_bug in repository https://gitbox.apache.org/repos/asf/shenyu.git
from 348d5f471a Merge branch 'master' into fix/fix_sync_bug add ff289b43eb [type:feat] bootstrap instances status (#5950) add 1e60eeff8c Merge branch 'master' into fix/fix_sync_bug No new revisions were added by this update. Summary of changes: .gitignore | 3 + db/init/mysql/schema.sql | 32 +- db/init/ob/schema.sql | 20 +- db/init/og/create-table.sql | 25 ++ db/init/oracle/schema.sql | 26 ++ db/init/pg/create-table.sql | 25 ++ db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql | 2 +- db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 15 + db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 12 + db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 25 ++ db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 26 ++ db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 25 ++ .../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 + ...deConstants.java => InstanceTypeConstants.java} | 24 +- .../shenyu/common/utils/SystemInfoUtils.java | 68 ++++ .../shenyu/register/common/type/DataType.java | 5 + 32 files changed, 1727 insertions(+), 181 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