From 2d250c4d0e726d9fce0049d9e3cb3015b3fd67d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=8D=8E=E9=94=8B?= <799954772@qq.com> Date: Wed, 22 Nov 2023 11:37:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90FEATURE=E3=80=91=E9=92=88=E5=AF=B9naco?= =?UTF-8?q?s=E5=A2=9E=E5=8A=A0=E9=98=BF=E9=87=8C=E4=BA=91MSE=E7=9A=84?= =?UTF-8?q?=E9=89=B4=E6=9D=83=E6=96=B9=E5=BC=8F=20https://gitee.com/dromar?= =?UTF-8?q?a/liteFlow/issues/I8H1LT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parser/nacos/NacosXmlELParser.java | 6 ++++ .../parser/nacos/util/NacosParserHelper.java | 32 +++++++++++++---- .../parser/nacos/vo/NacosParserVO.java | 36 ++++++++++++++++--- 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java index 0633bd65..92b9a2af 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/NacosXmlELParser.java @@ -60,6 +60,12 @@ public class NacosXmlELParser extends ClassXmlFlowELParser { if (StrUtil.isBlank(nacosParserVO.getPassword())) { nacosParserVO.setPassword(""); } + if (StrUtil.isBlank(nacosParserVO.getAccessKey())){ + nacosParserVO.setAccessKey(""); + } + if (StrUtil.isBlank(nacosParserVO.getSecretKey())){ + nacosParserVO.setSecretKey(""); + } helper = new NacosParserHelper(nacosParserVO); } catch (Exception e) { diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java index 3765ccb4..31934e75 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/util/NacosParserHelper.java @@ -11,7 +11,6 @@ import com.yomahub.liteflow.spi.holder.ContextAwareHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.text.MessageFormat; import java.util.Properties; import java.util.concurrent.Executor; import java.util.function.Consumer; @@ -40,12 +39,8 @@ public class NacosParserHelper { catch (Exception ignored) { } if (this.configService == null) { - Properties properties = new Properties(); - properties.put(PropertyKeyConst.SERVER_ADDR, nacosParserVO.getServerAddr()); - properties.put(PropertyKeyConst.NAMESPACE, nacosParserVO.getNamespace()); - properties.put(PropertyKeyConst.USERNAME, nacosParserVO.getUsername()); - properties.put(PropertyKeyConst.PASSWORD, nacosParserVO.getPassword()); - this.configService = new NacosConfigService(properties); + Properties properties = getProperties(nacosParserVO); + this.configService = new NacosConfigService(properties); } } catch (Exception e) { @@ -53,6 +48,29 @@ public class NacosParserHelper { } } + private static Properties getProperties(NacosParserVO nacosParserVO) { + Properties properties = new Properties(); + properties.put(PropertyKeyConst.SERVER_ADDR, nacosParserVO.getServerAddr()); + properties.put(PropertyKeyConst.NAMESPACE, nacosParserVO.getNamespace()); + if (StrUtil.isNotEmpty(nacosParserVO.getUsername())) { + // 用户名密码模式 填写用户名就必有密码 + if (StrUtil.isEmpty(PropertyKeyConst.PASSWORD)){ + throw new NacosException("Nacos config password is empty"); + } + // 历史版本会使用用户名密码 + properties.put(PropertyKeyConst.USERNAME, nacosParserVO.getUsername()); + properties.put(PropertyKeyConst.PASSWORD, nacosParserVO.getPassword()); + } else if (StrUtil.isNotEmpty(PropertyKeyConst.ACCESS_KEY)){ + // 以下为阿里云RAM子账号使用 填写了ak就必有sk + if (StrUtil.isEmpty(PropertyKeyConst.SECRET_KEY)){ + throw new NacosException("Nacos config secretKey is empty"); + } + properties.put(PropertyKeyConst.ACCESS_KEY, nacosParserVO.getAccessKey()); + properties.put(PropertyKeyConst.SECRET_KEY, nacosParserVO.getSecretKey()); + } + return properties; + } + public String getContent() { try { return configService.getConfig(nacosParserVO.getDataId(), nacosParserVO.getGroup(), 3000L); diff --git a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/vo/NacosParserVO.java b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/vo/NacosParserVO.java index 010a240b..3d17f7f5 100644 --- a/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/vo/NacosParserVO.java +++ b/liteflow-rule-plugin/liteflow-rule-nacos/src/main/java/com/yomahub/liteflow/parser/nacos/vo/NacosParserVO.java @@ -16,6 +16,10 @@ public class NacosParserVO { private String group; + private String accessKey; + + private String secretKey; + private String username; private String password; @@ -68,11 +72,33 @@ public class NacosParserVO { this.password = password; } - @Override - public String toString() { - return "NacosParserVO{" + "serverAddr='" + serverAddr + '\'' + ", namespace='" + namespace + '\'' + ", dataId='" - + dataId + '\'' + ", group='" + group + '\'' + ", username='" + username + '\'' + ", password='" - + password + '\'' + '}'; + public String getAccessKey() { + return accessKey; } + public void setAccessKey(String accessKey) { + this.accessKey = accessKey; + } + + public String getSecretKey() { + return secretKey; + } + + public void setSecretKey(String secretKey) { + this.secretKey = secretKey; + } + + @Override + public String toString() { + return "NacosParserVO{" + + "serverAddr='" + serverAddr + '\'' + + ", namespace='" + namespace + '\'' + + ", dataId='" + dataId + '\'' + + ", group='" + group + '\'' + + ", accessKey='" + accessKey + '\'' + + ", secretKey='" + secretKey + '\'' + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + '}'; + } }