-
-
Notifications
You must be signed in to change notification settings - Fork 10.2k
feat: Provide a new open APl to return the organization list(#5349) #5365
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4bf7564
feat: Provide a new open APl to return the organization list(#5349)
wjwang00 01d124b
update the CHANGES.md
wjwang00 e69a736
Update apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi…
wjwang00 1dec4e9
Update apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi…
wjwang00 245b5af
Update apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi…
wjwang00 cbf83c0
Update apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi…
wjwang00 7d62d6c
Merge branch 'master' into open_organizations
wjwang00 3ff7b64
update the CHANGES.md
wjwang00 dc93da8
Update CHANGES.md
nobodyiam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
...a/com/ctrip/framework/apollo/openapi/server/service/ServerOrganizationOpenApiService.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright 2024 Apollo Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
| package com.ctrip.framework.apollo.openapi.server.service; | ||
|
|
||
| import com.ctrip.framework.apollo.openapi.api.OrganizationOpenApiService; | ||
| import com.ctrip.framework.apollo.openapi.dto.OpenOrganizationDto; | ||
| import com.ctrip.framework.apollo.openapi.util.OpenApiBeanUtils; | ||
| import com.ctrip.framework.apollo.portal.component.config.PortalConfig; | ||
| import org.springframework.stereotype.Service; | ||
| import java.util.List; | ||
|
|
||
| @Service | ||
| public class ServerOrganizationOpenApiService implements OrganizationOpenApiService { | ||
|
|
||
| private final PortalConfig portalConfig; | ||
|
|
||
| public ServerOrganizationOpenApiService(PortalConfig portalConfig) { | ||
| this.portalConfig = portalConfig; | ||
| } | ||
|
|
||
| @Override | ||
| public List<OpenOrganizationDto> getOrganizations() { | ||
| return OpenApiBeanUtils.transformFromOrganizations(portalConfig.organizations()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
...rc/main/java/com/ctrip/framework/apollo/openapi/v1/controller/OrganizationController.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Copyright 2024 Apollo Authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
| package com.ctrip.framework.apollo.openapi.v1.controller; | ||
|
|
||
| import com.ctrip.framework.apollo.openapi.api.OrganizationOpenApiService; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import com.ctrip.framework.apollo.openapi.dto.OpenOrganizationDto; | ||
| import java.util.List; | ||
|
|
||
| @RestController("openapiOrganizationController") | ||
| @RequestMapping("/openapi/v1") | ||
| public class OrganizationController { | ||
| private final OrganizationOpenApiService organizationOpenApiService; | ||
|
|
||
| public OrganizationController(OrganizationOpenApiService organizationOpenApiService) { | ||
| this.organizationOpenApiService = organizationOpenApiService; | ||
| } | ||
|
|
||
| @RequestMapping("/organizations") | ||
| public List<OpenOrganizationDto> getOrganization() { | ||
| return organizationOpenApiService.getOrganizations(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.