Skip to content
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

[type:fix] SpringCloud Plugin builds nacos repository from YAML with inconsistent configuration properties (#5900) #5902

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+6 −1
Open

[type:fix] SpringCloud Plugin builds nacos repository from YAML with inconsistent configuration properties (#5900) #5902

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
de6fdfa
[type:fix] SpringCloud Plugin builds nacos repository from YAML with …
Jan 17, 2025
59bd808
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 18, 2025
9b2c8f9
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 18, 2025
0c9620a
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 18, 2025
8552bcc
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 20, 2025
a802b4b
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 21, 2025
539831c
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 21, 2025
c91244a
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 22, 2025
3dba5c7
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 22, 2025
d3c4736
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 23, 2025
4600488
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 24, 2025
d1a36ad
Merge branch 'master' into dev-springcloud-plugin
Aias00 Jan 24, 2025
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
7 changes: 6 additions & 1 deletion .../main/java/org/apache/shenyu/plugin/springcloud/handler/SpringCloudPluginDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ public class SpringCloudPluginDataHandler implements PluginDataHandler {

private static final Logger LOG = LoggerFactory.getLogger(SpringCloudPluginDataHandler.class);

private static final String NAMESPACE = "nacosNameSpace";

private static final String GROUP = "groupName";

private final ShenyuConfig.SpringCloudCacheConfig springCloudCacheConfig;

private final Environment env;
Expand Down Expand Up @@ -192,7 +196,8 @@ private void readYmlBuildRepository() {
final String serverLists = env.getProperty("spring.cloud.nacos.discovery.server-addr");
final String prefix = "spring.cloud.nacos.discovery.";
Properties properties = new Properties();
properties.put(PropertyKeyConst.NAMESPACE, env.getProperty(prefix + PropertyKeyConst.NAMESPACE));
properties.put(NAMESPACE, env.getProperty(prefix + PropertyKeyConst.NAMESPACE));
properties.put(GROUP, env.getProperty(prefix + "group"));
if (env.getProperty(prefix + PropertyKeyConst.USERNAME) != null) {
properties.put(PropertyKeyConst.USERNAME, env.getProperty(prefix + PropertyKeyConst.USERNAME));
}
Expand Down
Loading