-
Notifications
You must be signed in to change notification settings - Fork 224
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#1350] change load router configs by dataId prefix and add switch co…
- Loading branch information
1 parent
71911f5
commit 9a05055
Showing
6 changed files
with
372 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
157 changes: 157 additions & 0 deletions
157
...g/src/main/java/com/huaweicloud/nacos/config/client/NacosPropertiesFuzzyQueryService.java
This file contains 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,157 @@ | ||
| /* | ||
| * Copyright (C) 2020-2024 Huawei Technologies Co., Ltd. All rights reserved. | ||
| * 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.huaweicloud.nacos.config.client; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.alibaba.cloud.nacos.NacosConfigProperties; | ||
| import com.alibaba.nacos.client.auth.impl.NacosAuthLoginConstant; | ||
| import com.alibaba.nacos.client.auth.impl.process.HttpLoginProcessor; | ||
| import com.alibaba.nacos.client.config.impl.ConfigHttpClientManager; | ||
| import com.alibaba.nacos.common.http.HttpRestResult; | ||
| import com.alibaba.nacos.common.http.client.NacosRestTemplate; | ||
| import com.alibaba.nacos.common.http.param.Header; | ||
| import com.alibaba.nacos.common.http.param.Query; | ||
| import com.alibaba.nacos.plugin.auth.api.LoginIdentityContext; | ||
| import com.huaweicloud.nacos.config.NacosConfigConst; | ||
| import com.huaweicloud.nacos.config.manager.ConfigServiceManagerUtils; | ||
|
|
||
| public class NacosPropertiesFuzzyQueryService { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(NacosPropertiesFuzzyQueryService.class); | ||
|
|
||
| private static final String NACOS_CONFIG_QUERY_URI = "%s/nacos/v1/cs/configs"; | ||
|
|
||
| private NacosConfigProperties configProperties; | ||
|
|
||
| private Properties properties; | ||
|
|
||
| private final Map<String, String> address_token = new ConcurrentHashMap<>(); | ||
|
|
||
| private long tokenTtl; | ||
|
|
||
| private long lastRefreshTime; | ||
|
|
||
| private long refreshWindow; | ||
|
|
||
| private static final NacosPropertiesFuzzyQueryService INSTANCE = new NacosPropertiesFuzzyQueryService(); | ||
|
|
||
| private NacosPropertiesFuzzyQueryService() { | ||
|
|
||
| } | ||
|
|
||
| public static NacosPropertiesFuzzyQueryService getInstance() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| public List<PropertyConfigItem> loadRouterProperties() { | ||
| try { | ||
| String address = chooseAddress(); | ||
| NacosRestTemplate nacosRestTemplate = ConfigHttpClientManager.getInstance().getNacosRestTemplate(); | ||
| HttpRestResult<PropertiePageQueryResult> response = nacosRestTemplate.get(buildUrl(address), initHeader(address), | ||
| buildQuery(), PropertiePageQueryResult.class); | ||
| return response.getData().getPageItems(); | ||
| } catch (Exception e) { | ||
| LOGGER.error("load router properties failed!", e); | ||
| return Collections.emptyList(); | ||
| } | ||
| } | ||
|
|
||
| private Query buildQuery() { | ||
| Query query = new Query(); | ||
| query.addParam("dataId", NacosConfigConst.LABEL_ROUTER_DATA_ID_PREFIX + "*"); | ||
| query.addParam("group", configProperties.getGroup()); | ||
| query.addParam("tenant", getNamespace()); | ||
|
|
||
| // this value is fixes when using blur query configs | ||
| query.addParam("search", "blur"); | ||
| query.addParam("pageNo", 1); | ||
| query.addParam("pageSize", 100); | ||
| return query; | ||
| } | ||
|
|
||
| private Header initHeader(String address) { | ||
| Header header = Header.newInstance(); | ||
| if (!StringUtils.isEmpty(configProperties.getUsername())) { | ||
| header.addParam(NacosAuthLoginConstant.ACCESSTOKEN, getAccessToken(address)); | ||
| } | ||
| return header; | ||
| } | ||
|
|
||
| private String buildUrl(String address) { | ||
| String prefix = ""; | ||
| if (!configProperties.getServerAddr().startsWith("http")) { | ||
| prefix = "http://"; | ||
| } | ||
| return prefix + String.format(NACOS_CONFIG_QUERY_URI, address); | ||
| } | ||
|
|
||
| private String getNamespace() { | ||
| return StringUtils.isEmpty(configProperties.getNamespace()) ? "" : configProperties.getNamespace(); | ||
| } | ||
|
|
||
| private String chooseAddress() { | ||
| properties = configProperties.assembleMasterNacosServerProperties(); | ||
| if (!configProperties.isMasterStandbyEnabled()) { | ||
| return configProperties.getServerAddr(); | ||
| } | ||
| if (ConfigServiceManagerUtils.checkServerConnect(configProperties.getServerAddr())) { | ||
| return configProperties.getServerAddr(); | ||
| } | ||
| if (ConfigServiceManagerUtils.checkServerConnect(configProperties.getStandbyServerAddr())) { | ||
| properties = configProperties.assembleStandbyNacosServerProperties(); | ||
| return configProperties.getStandbyServerAddr(); | ||
| } | ||
| return configProperties.getServerAddr(); | ||
| } | ||
|
|
||
| private String getAccessToken(String address) { | ||
| if (address_token.get(address) != null | ||
| && (System.currentTimeMillis() - lastRefreshTime) < TimeUnit.SECONDS.toMillis(tokenTtl - refreshWindow)) { | ||
| return address_token.get(address); | ||
| } | ||
| HttpLoginProcessor httpLoginProcessor | ||
| = new HttpLoginProcessor(ConfigHttpClientManager.getInstance().getNacosRestTemplate()); | ||
| properties.setProperty(NacosAuthLoginConstant.SERVER, address); | ||
| LoginIdentityContext identityContext = httpLoginProcessor.getResponse(properties); | ||
| if (identityContext != null | ||
| && !StringUtils.isEmpty(identityContext.getParameter(NacosAuthLoginConstant.ACCESSTOKEN))) { | ||
| tokenTtl = Long.parseLong(identityContext.getParameter(NacosAuthLoginConstant.TOKENTTL)); | ||
| refreshWindow = tokenTtl / 10; | ||
| lastRefreshTime = System.currentTimeMillis(); | ||
| address_token.put(address, identityContext.getParameter(NacosAuthLoginConstant.ACCESSTOKEN)); | ||
| return identityContext.getParameter(NacosAuthLoginConstant.ACCESSTOKEN); | ||
| } | ||
| lastRefreshTime = System.currentTimeMillis(); | ||
| return ""; | ||
| } | ||
|
|
||
| public void setConfigProperties(NacosConfigProperties nacosConfigProperties) { | ||
| if (configProperties == null) { | ||
| this.configProperties = nacosConfigProperties; | ||
| } | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
...os-config/src/main/java/com/huaweicloud/nacos/config/client/PropertiePageQueryResult.java
This file contains 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,62 @@ | ||
| /* | ||
| * Copyright (C) 2020-2024 Huawei Technologies Co., Ltd. All rights reserved. | ||
| * 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.huaweicloud.nacos.config.client; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class PropertiePageQueryResult { | ||
| private Integer totalCount; | ||
|
|
||
| private Integer pageNumber; | ||
|
|
||
| private Integer pagesAvailable; | ||
|
|
||
| private List<PropertyConfigItem> pageItems; | ||
|
|
||
| public Integer getTotalCount() { | ||
| return totalCount; | ||
| } | ||
|
|
||
| public void setTotalCount(Integer totalCount) { | ||
| this.totalCount = totalCount; | ||
| } | ||
|
|
||
| public Integer getPageNumber() { | ||
| return pageNumber; | ||
| } | ||
|
|
||
| public void setPageNumber(Integer pageNumber) { | ||
| this.pageNumber = pageNumber; | ||
| } | ||
|
|
||
| public Integer getPagesAvailable() { | ||
| return pagesAvailable; | ||
| } | ||
|
|
||
| public void setPagesAvailable(Integer pagesAvailable) { | ||
| this.pagesAvailable = pagesAvailable; | ||
| } | ||
|
|
||
| public List<PropertyConfigItem> getPageItems() { | ||
| return pageItems; | ||
| } | ||
|
|
||
| public void setPageItems(List<PropertyConfigItem> pageItems) { | ||
| this.pageItems = pageItems; | ||
| } | ||
| } |
Oops, something went wrong.