From 8f70cf23c859acefe4e2bdfd43491fac98e482fa Mon Sep 17 00:00:00 2001 From: xuancd25 <48271887+xuancd25@users.noreply.github.com> Date: Wed, 28 Jul 2021 18:38:30 +0800 Subject: [PATCH 1/4] Update ConfigService.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit push 配置时指定内容类型，原推送String格式的yaml时，指定不了格式，导致推送上去没有实现yaml格式 --- .../com/alibaba/nacos/api/config/ConfigService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java index 114fa69dcb1..84c4c93a6c3 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java +++ b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java @@ -79,6 +79,18 @@ String getConfigAndSignListener(String dataId, String group, long timeoutMs, Lis */ boolean publishConfig(String dataId, String group, String content) throws NacosException; + /** + * Publish config. + * + * @param dataId dataId + * @param group group + * @param content content + * @param type type + * @return Whether publish + * @throws NacosException NacosException + */ + boolean publishConfig(String dataId, String group, String content,String type) throws NacosException; + /** * Remove config. * From 3fed4d0c58cf1ffd1a3bce1bff044df1c02e321a Mon Sep 17 00:00:00 2001 From: xuancd25 <48271887+xuancd25@users.noreply.github.com> Date: Wed, 28 Jul 2021 18:41:53 +0800 Subject: [PATCH 2/4] Update NacosConfigService.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit push时，指定不了格式，导致格式为txt文本，添加指定格式接口 --- .../nacos/client/config/NacosConfigService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java index a0c614011f9..4cc9c5a8b63 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java @@ -112,7 +112,12 @@ public void addListener(String dataId, String group, Listener listener) throws N @Override public boolean publishConfig(String dataId, String group, String content) throws NacosException { - return publishConfigInner(namespace, dataId, group, null, null, null, content); + return publishConfigInner(namespace, dataId, group, null, null, null, content, null); + } + + @Override + public boolean publishConfig(String dataId, String group, String content, String type) throws NacosException { + return publishConfigInner(namespace, dataId, group, null, null, null, content, type); } @Override @@ -211,7 +216,7 @@ private boolean removeConfigInner(String tenant, String dataId, String group, St } private boolean publishConfigInner(String tenant, String dataId, String group, String tag, String appName, - String betaIps, String content) throws NacosException { + String betaIps, String content, String type) throws NacosException { group = null2defaultGroup(group); ParamUtils.checkParam(dataId, group, content); @@ -237,6 +242,9 @@ private boolean publishConfigInner(String tenant, String dataId, String group, S if (StringUtils.isNotEmpty(tag)) { params.put("tag", tag); } + if (StringUtils.isNotEmpty(type)) { + params.put("type", type); + } Map headers = new HashMap(1); if (StringUtils.isNotEmpty(betaIps)) { headers.put("betaIps", betaIps); From eb337236507c7a449f908d7ccfac6712c73d167e Mon Sep 17 00:00:00 2001 From: xuancd25 <48271887+xuancd25@users.noreply.github.com> Date: Thu, 29 Jul 2021 14:29:34 +0800 Subject: [PATCH 3/4] Update ConfigService.java add @since --- .../main/java/com/alibaba/nacos/api/config/ConfigService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java index 84c4c93a6c3..a8f4ca54b45 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java +++ b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java @@ -88,6 +88,7 @@ String getConfigAndSignListener(String dataId, String group, long timeoutMs, Lis * @param type type * @return Whether publish * @throws NacosException NacosException + * @since 1.4 */ boolean publishConfig(String dataId, String group, String content,String type) throws NacosException; From 7028fd364df264fb1c5f8b41f68ac508344e2d48 Mon Sep 17 00:00:00 2001 From: "306597699@qq.com" <306597699@qq.com> Date: Fri, 30 Jul 2021 17:33:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9@since?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/nacos/api/config/ConfigService.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java index b894ae5ff1e..39a8178140b 100644 --- a/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java +++ b/api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java @@ -89,6 +89,7 @@ String getConfigAndSignListener(String dataId, String group, long timeoutMs, Lis * @param type config type {@link ConfigType} * @return Whether publish * @throws NacosException NacosException + * @since 1.4.0-SNAPSHOT */ boolean publishConfig(String dataId, String group, String content, String type) throws NacosException; @@ -118,19 +119,6 @@ String getConfigAndSignListener(String dataId, String group, long timeoutMs, Lis boolean publishConfigCas(String dataId, String group, String content, String casMd5, String type) throws NacosException; - /** - * Publish config. - * - * @param dataId dataId - * @param group group - * @param content content - * @param type type - * @return Whether publish - * @throws NacosException NacosException - * @since 1.4 - */ - boolean publishConfig(String dataId, String group, String content,String type) throws NacosException; - /** * Remove config. *