Skip to content

Commit f41ca64

Browse files
tacklequestionstacklequestions
authored
feat: migration of app and instance, fixed some problems (#18)
1 parent 2464709 commit f41ca64

File tree

249 files changed

+6765
-7401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+6765
-7401
lines changed

‎apollo-openapi.yaml‎

Lines changed: 227 additions & 244 deletions
Large diffs are not rendered by default.

‎java-client/.openapi-generator/FILES‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build.sbt
99
docs/AppManagementApi.md
1010
docs/ClusterManagementApi.md
1111
docs/EnvironmentManagementApi.md
12+
docs/ExceptionResponse.md
1213
docs/InstanceManagementApi.md
1314
docs/ItemManagementApi.md
1415
docs/KVEntity.md
@@ -27,17 +28,18 @@ docs/OpenGrayReleaseRuleDTO.md
2728
docs/OpenGrayReleaseRuleItemDTO.md
2829
docs/OpenInstanceConfigDTO.md
2930
docs/OpenInstanceDTO.md
31+
docs/OpenInstancePageDTO.md
3032
docs/OpenItemChangeSets.md
3133
docs/OpenItemDTO.md
3234
docs/OpenItemDiffs.md
35+
docs/OpenItemPageDTO.md
36+
docs/OpenMissEnvDTO.md
3337
docs/OpenNamespaceDTO.md
3438
docs/OpenNamespaceIdentifier.md
3539
docs/OpenNamespaceLockDTO.md
3640
docs/OpenNamespaceSyncModel.md
3741
docs/OpenNamespaceTextModel.md
3842
docs/OpenOrganizationDto.md
39-
docs/OpenPageDTOOpenInstanceDTO.md
40-
docs/OpenPageDTOOpenItemDTO.md
4143
docs/OpenReleaseBO.md
4244
docs/OpenReleaseDTO.md
4345
docs/OrganizationManagementApi.md
@@ -79,6 +81,7 @@ src/main/java/org/openapitools/client/auth/Authentication.java
7981
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
8082
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
8183
src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
84+
src/main/java/org/openapitools/client/model/ExceptionResponse.java
8285
src/main/java/org/openapitools/client/model/KVEntity.java
8386
src/main/java/org/openapitools/client/model/MultiResponseEntity.java
8487
src/main/java/org/openapitools/client/model/NamespaceGrayDelReleaseDTO.java
@@ -93,17 +96,18 @@ src/main/java/org/openapitools/client/model/OpenGrayReleaseRuleDTO.java
9396
src/main/java/org/openapitools/client/model/OpenGrayReleaseRuleItemDTO.java
9497
src/main/java/org/openapitools/client/model/OpenInstanceConfigDTO.java
9598
src/main/java/org/openapitools/client/model/OpenInstanceDTO.java
99+
src/main/java/org/openapitools/client/model/OpenInstancePageDTO.java
96100
src/main/java/org/openapitools/client/model/OpenItemChangeSets.java
97101
src/main/java/org/openapitools/client/model/OpenItemDTO.java
98102
src/main/java/org/openapitools/client/model/OpenItemDiffs.java
103+
src/main/java/org/openapitools/client/model/OpenItemPageDTO.java
104+
src/main/java/org/openapitools/client/model/OpenMissEnvDTO.java
99105
src/main/java/org/openapitools/client/model/OpenNamespaceDTO.java
100106
src/main/java/org/openapitools/client/model/OpenNamespaceIdentifier.java
101107
src/main/java/org/openapitools/client/model/OpenNamespaceLockDTO.java
102108
src/main/java/org/openapitools/client/model/OpenNamespaceSyncModel.java
103109
src/main/java/org/openapitools/client/model/OpenNamespaceTextModel.java
104110
src/main/java/org/openapitools/client/model/OpenOrganizationDto.java
105-
src/main/java/org/openapitools/client/model/OpenPageDTOOpenInstanceDTO.java
106-
src/main/java/org/openapitools/client/model/OpenPageDTOOpenItemDTO.java
107111
src/main/java/org/openapitools/client/model/OpenReleaseBO.java
108112
src/main/java/org/openapitools/client/model/OpenReleaseDTO.java
109113
src/main/java/org/openapitools/client/model/RichResponseEntity.java
@@ -116,6 +120,7 @@ src/test/java/org/openapitools/client/api/NamespaceBranchManagementApiTest.java
116120
src/test/java/org/openapitools/client/api/NamespaceManagementApiTest.java
117121
src/test/java/org/openapitools/client/api/OrganizationManagementApiTest.java
118122
src/test/java/org/openapitools/client/api/ReleaseManagementApiTest.java
123+
src/test/java/org/openapitools/client/model/ExceptionResponseTest.java
119124
src/test/java/org/openapitools/client/model/KVEntityTest.java
120125
src/test/java/org/openapitools/client/model/MultiResponseEntityTest.java
121126
src/test/java/org/openapitools/client/model/NamespaceGrayDelReleaseDTOTest.java
@@ -130,17 +135,18 @@ src/test/java/org/openapitools/client/model/OpenGrayReleaseRuleDTOTest.java
130135
src/test/java/org/openapitools/client/model/OpenGrayReleaseRuleItemDTOTest.java
131136
src/test/java/org/openapitools/client/model/OpenInstanceConfigDTOTest.java
132137
src/test/java/org/openapitools/client/model/OpenInstanceDTOTest.java
138+
src/test/java/org/openapitools/client/model/OpenInstancePageDTOTest.java
133139
src/test/java/org/openapitools/client/model/OpenItemChangeSetsTest.java
134140
src/test/java/org/openapitools/client/model/OpenItemDTOTest.java
135141
src/test/java/org/openapitools/client/model/OpenItemDiffsTest.java
142+
src/test/java/org/openapitools/client/model/OpenItemPageDTOTest.java
143+
src/test/java/org/openapitools/client/model/OpenMissEnvDTOTest.java
136144
src/test/java/org/openapitools/client/model/OpenNamespaceDTOTest.java
137145
src/test/java/org/openapitools/client/model/OpenNamespaceIdentifierTest.java
138146
src/test/java/org/openapitools/client/model/OpenNamespaceLockDTOTest.java
139147
src/test/java/org/openapitools/client/model/OpenNamespaceSyncModelTest.java
140148
src/test/java/org/openapitools/client/model/OpenNamespaceTextModelTest.java
141149
src/test/java/org/openapitools/client/model/OpenOrganizationDtoTest.java
142-
src/test/java/org/openapitools/client/model/OpenPageDTOOpenInstanceDTOTest.java
143-
src/test/java/org/openapitools/client/model/OpenPageDTOOpenItemDTOTest.java
144150
src/test/java/org/openapitools/client/model/OpenReleaseBOTest.java
145151
src/test/java/org/openapitools/client/model/OpenReleaseDTOTest.java
146152
src/test/java/org/openapitools/client/model/RichResponseEntityTest.java

‎java-client/README.md‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public class Example {
115115
AppManagementApi apiInstance = new AppManagementApi(defaultClient);
116116
OpenCreateAppDTO openCreateAppDTO = new OpenCreateAppDTO(); // OpenCreateAppDTO |
117117
try {
118-
Object result = apiInstance.createApp(openCreateAppDTO);
118+
OpenAppDTO result = apiInstance.createApp(openCreateAppDTO);
119119
System.out.println(result);
120120
} catch (ApiException e) {
121121
System.err.println("Exception when calling AppManagementApi#createApp");
@@ -140,18 +140,19 @@ Class | Method | HTTP request | Description
140140
*AppManagementApi* | [**deleteApp**](docs/AppManagementApi.md#deleteApp) | **DELETE** /openapi/v1/apps/{appId} | 删除应用(new added)
141141
*AppManagementApi* | [**findApps**](docs/AppManagementApi.md#findApps) | **GET** /openapi/v1/apps | 查找应用 (original openapi)
142142
*AppManagementApi* | [**findAppsAuthorized**](docs/AppManagementApi.md#findAppsAuthorized) | **GET** /openapi/v1/apps/authorized | 获取当前Consumer授权的应用列表 (original openapi)
143-
*AppManagementApi* | [**findMissEnvs**](docs/AppManagementApi.md#findMissEnvs) | **GET** /openapi/v1/apps/{appId}/miss_envs | 查找缺失的环境(new added)
143+
*AppManagementApi* | [**findMissEnvs**](docs/AppManagementApi.md#findMissEnvs) | **GET** /openapi/v1/apps/{appId}/miss-envs | 查找缺失的环境(new added)
144144
*AppManagementApi* | [**getApp**](docs/AppManagementApi.md#getApp) | **GET** /openapi/v1/apps/{appId} | 获取单个应用信息(new added)
145-
*AppManagementApi* | [**getAppNavTree**](docs/AppManagementApi.md#getAppNavTree) | **GET** /openapi/v1/apps/{appId}/navtree | 获取应用导航树(new added)
146-
*AppManagementApi* | [**getAppsBySelf**](docs/AppManagementApi.md#getAppsBySelf) | **GET** /openapi/v1/apps/by-self | 获取当前Consumer的应用列表（分页）(new added)
147-
*AppManagementApi* | [**getEnvClusterInfo**](docs/AppManagementApi.md#getEnvClusterInfo) | **GET** /openapi/v1/apps/{appId}/envclusters | 获取应用的环境集群信息 (original openapi)
145+
*AppManagementApi* | [**getAppsBySelf**](docs/AppManagementApi.md#getAppsBySelf) | **GET** /openapi/v1/apps/by-self | 获取当前Consumer/User的应用列表（分页）(new added)
146+
*AppManagementApi* | [**getEnvClusterInfo**](docs/AppManagementApi.md#getEnvClusterInfo) | **GET** /openapi/v1/apps/{appId}/env-cluster-info | 获取应用环境集群详情(new added)
147+
*AppManagementApi* | [**getEnvClusters**](docs/AppManagementApi.md#getEnvClusters) | **GET** /openapi/v1/apps/{appId}/envclusters | 获取应用的环境集群信息 (original openapi)
148148
*AppManagementApi* | [**updateApp**](docs/AppManagementApi.md#updateApp) | **PUT** /openapi/v1/apps/{appId} | 更新应用(new added)
149149
*ClusterManagementApi* | [**createCluster**](docs/ClusterManagementApi.md#createCluster) | **POST** /openapi/v1/envs/{env}/apps/{appId}/clusters | 创建集群 (original openapi)
150150
*ClusterManagementApi* | [**deleteCluster**](docs/ClusterManagementApi.md#deleteCluster) | **DELETE** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName} | 删除集群 (new added)
151151
*ClusterManagementApi* | [**getCluster**](docs/ClusterManagementApi.md#getCluster) | **GET** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName} | 获取指定集群信息 (original openapi)
152152
*EnvironmentManagementApi* | [**getEnvs**](docs/EnvironmentManagementApi.md#getEnvs) | **GET** /openapi/v1/envs | 获取所有环境
153-
*InstanceManagementApi* | [**getByRelease**](docs/InstanceManagementApi.md#getByRelease) | **GET** /openapi/v1/envs/{env}/releases/{releaseId}/instances | 根据发布版本查询实例（支持分页） (new added)
154-
*InstanceManagementApi* | [**getByReleasesNotIn**](docs/InstanceManagementApi.md#getByReleasesNotIn) | **GET** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/instances_not_in | 查询不在指定发布版本中的实例 (new added)
153+
*InstanceManagementApi* | [**getByNamespace**](docs/InstanceManagementApi.md#getByNamespace) | **GET** /openapi/v1/envs/{env}/instances/by-namespace | 根据namespaceName查询实例（new added）
154+
*InstanceManagementApi* | [**getByRelease**](docs/InstanceManagementApi.md#getByRelease) | **GET** /openapi/v1/envs/{env}/instances/by-release | 根据发布版本查询实例（支持分页） (new added)
155+
*InstanceManagementApi* | [**getByReleasesAndNamespaceNotIn**](docs/InstanceManagementApi.md#getByReleasesAndNamespaceNotIn) | **GET** /openapi/v1/envs/{env}/instances/by-namespace-and-releases-not-in | 查询不在指定发布版本中的实例 (new added)
155156
*InstanceManagementApi* | [**getInstanceCountByNamespace**](docs/InstanceManagementApi.md#getInstanceCountByNamespace) | **GET** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/instances | 获取命名空间下的实例数量 (original openapi)
156157
*ItemManagementApi* | [**batchUpdateItemsByText**](docs/ItemManagementApi.md#batchUpdateItemsByText) | **PUT** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/batchUpdate | 通过文本批量修改配置项 (new added)
157158
*ItemManagementApi* | [**compareItems**](docs/ItemManagementApi.md#compareItems) | **POST** /openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/compare | 对比命名空间配置差异 (new added)
@@ -200,6 +201,7 @@ Class | Method | HTTP request | Description
200201

201202
## Documentation for Models
202203

204+
- [ExceptionResponse](docs/ExceptionResponse.md)
203205
- [KVEntity](docs/KVEntity.md)
204206
- [MultiResponseEntity](docs/MultiResponseEntity.md)
205207
- [NamespaceGrayDelReleaseDTO](docs/NamespaceGrayDelReleaseDTO.md)
@@ -214,17 +216,18 @@ Class | Method | HTTP request | Description
214216
- [OpenGrayReleaseRuleItemDTO](docs/OpenGrayReleaseRuleItemDTO.md)
215217
- [OpenInstanceConfigDTO](docs/OpenInstanceConfigDTO.md)
216218
- [OpenInstanceDTO](docs/OpenInstanceDTO.md)
219+
- [OpenInstancePageDTO](docs/OpenInstancePageDTO.md)
217220
- [OpenItemChangeSets](docs/OpenItemChangeSets.md)
218221
- [OpenItemDTO](docs/OpenItemDTO.md)
219222
- [OpenItemDiffs](docs/OpenItemDiffs.md)
223+
- [OpenItemPageDTO](docs/OpenItemPageDTO.md)
224+
- [OpenMissEnvDTO](docs/OpenMissEnvDTO.md)
220225
- [OpenNamespaceDTO](docs/OpenNamespaceDTO.md)
221226
- [OpenNamespaceIdentifier](docs/OpenNamespaceIdentifier.md)
222227
- [OpenNamespaceLockDTO](docs/OpenNamespaceLockDTO.md)
223228
- [OpenNamespaceSyncModel](docs/OpenNamespaceSyncModel.md)
224229
- [OpenNamespaceTextModel](docs/OpenNamespaceTextModel.md)
225230
- [OpenOrganizationDto](docs/OpenOrganizationDto.md)
226-
- [OpenPageDTOOpenInstanceDTO](docs/OpenPageDTOOpenInstanceDTO.md)
227-
- [OpenPageDTOOpenItemDTO](docs/OpenPageDTOOpenItemDTO.md)
228231
- [OpenReleaseBO](docs/OpenReleaseBO.md)
229232
- [OpenReleaseDTO](docs/OpenReleaseDTO.md)
230233
- [RichResponseEntity](docs/RichResponseEntity.md)

0 commit comments

Comments
 (0)