From 658c0d696287d87167de9357ddbbc4f6c18827bc Mon Sep 17 00:00:00 2001 From: weizhile <348358584@qq.com> Date: Tue, 19 Dec 2023 21:13:32 +0800 Subject: [PATCH 1/3] Update ApolloAuditSpanAspectTest.java --- .../apollo/portal/spi/configuration/AuthConfiguration.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java index d7bfcd078fb..5d9d60fa53b 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java @@ -195,14 +195,11 @@ static class SpringSecurityLDAPAuthAutoConfiguration { private final LdapProperties properties; private final Environment environment; - private final LdapTemplate ldapTemplate; public SpringSecurityLDAPAuthAutoConfiguration(final LdapProperties properties, - final Environment environment, - final LdapTemplate ldapTemplate) { + final Environment environment) { this.properties = properties; this.environment = environment; - this.ldapTemplate = ldapTemplate; } @Bean @@ -225,7 +222,7 @@ public LogoutHandler logoutHandler() { @Bean @ConditionalOnMissingBean(UserService.class) - public UserService springSecurityUserService() { + public UserService springSecurityUserService(LdapTemplate ldapTemplate) { return new LdapUserService(ldapTemplate); } From 9ee791aee8e35d6c6a689b8ad45c5c1d5ea0f14e Mon Sep 17 00:00:00 2001 From: weizhile <348358584@qq.com> Date: Thu, 21 Dec 2023 13:48:20 +0800 Subject: [PATCH 2/3] update changes-2.2.0.md --- changes/changes-2.2.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/changes-2.2.0.md b/changes/changes-2.2.0.md index 3996f783893..be4429587f2 100644 --- a/changes/changes-2.2.0.md +++ b/changes/changes-2.2.0.md @@ -31,6 +31,7 @@ Apollo 2.2.0 * [Fix the issue that namespace content being cleared when identical content is pasted into the namespace](https://github.com/apolloconfig/apollo/pull/4922) * [feat(openapi): allow user create app via openapi](https://github.com/apolloconfig/apollo/pull/4954) * [Support grayscale feature for non-properties namespaces](https://github.com/apolloconfig/apollo/pull/4952) +* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1) \ No newline at end of file From 33b9ab7219a79d9cd201c8f4b023952ac02f8007 Mon Sep 17 00:00:00 2001 From: weizhile <348358584@qq.com> Date: Thu, 21 Dec 2023 19:27:57 +0800 Subject: [PATCH 3/3] update changes.md --- CHANGES.md | 1 + changes/changes-2.2.0.md | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index e1f9fc846ac..ec4d138378b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ Release Notes. Apollo 2.3.0 ------------------ +* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055) ------------------ diff --git a/changes/changes-2.2.0.md b/changes/changes-2.2.0.md index be4429587f2..3996f783893 100644 --- a/changes/changes-2.2.0.md +++ b/changes/changes-2.2.0.md @@ -31,7 +31,6 @@ Apollo 2.2.0 * [Fix the issue that namespace content being cleared when identical content is pasted into the namespace](https://github.com/apolloconfig/apollo/pull/4922) * [feat(openapi): allow user create app via openapi](https://github.com/apolloconfig/apollo/pull/4954) * [Support grayscale feature for non-properties namespaces](https://github.com/apolloconfig/apollo/pull/4952) -* [Fix circular references on LdapAutoConfiguration](https://github.com/apolloconfig/apollo/pull/5055) ------------------ All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1) \ No newline at end of file