Skip to content

fix: NacosDataParserHandler yaml配置解析默认编码错误 #4032

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.

Sign up for GitHub

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

Open
ControlByDestiny wants to merge 1 commit into
base: 2023.x
Choose a base branch
from
Open

fix: NacosDataParserHandler yaml配置解析默认编码错误 #4032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...aba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosDataParserHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.alibaba.cloud.nacos.parser;

import java.nio.charset.StandardCharsets;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
Expand All @@ -30,6 +31,7 @@
import org.springframework.boot.env.OriginTrackedMapPropertySource;
import org.springframework.boot.env.PropertiesPropertySourceLoader;
import org.springframework.boot.env.PropertySourceLoader;
import org.springframework.boot.env.YamlPropertySourceLoader;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.support.SpringFactoriesLoader;
Expand Down Expand Up @@ -83,6 +85,12 @@ public List<PropertySource<?>> parseNacosData(String configName, String configVa
NacosConfigUtils.selectiveConvertUnicode(configValue).getBytes(),
configName);
}
else if (propertySourceLoader instanceof YamlPropertySourceLoader) {
// YamlPropertySourceLoader internal only support use unicode,
// The default encoding for Chinese windows system is GBK, need to transform
nacosByteArrayResource = new NacosByteArrayResource(
configValue.getBytes(StandardCharsets.UTF_8), configName);
}
else {
nacosByteArrayResource = new NacosByteArrayResource(
configValue.getBytes(), configName);
Expand Down