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

Fix the apollo portal start failed issue #4298

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Fix the apollo portal start failed issue #4298

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ Apollo 2.0.0
* [Fix the potential data inconsistency issue](https://github.com/apolloconfig/apollo/pull/4256)
* [Fix the deleted items display issue in text mode](https://github.com/apolloconfig/apollo/pull/4279)
* [Upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1](https://github.com/apolloconfig/apollo/pull/4295)
* [Fix the apollo portal start failed issue](https://github.com/apolloconfig/apollo/pull/4298)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
2 changes: 2 additions & 0 deletions .../src/main/java/com/ctrip/framework/apollo/portal/spi/configuration/AuthConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.context.annotation.Profile;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.Environment;
Expand Down Expand Up @@ -136,6 +137,7 @@ public static JdbcUserDetailsManager jdbcUserDetailsManager(PasswordEncoder pass
}

@Bean
@DependsOn("jdbcUserDetailsManager")
@ConditionalOnMissingBean(UserService.class)
public UserService springSecurityUserService(PasswordEncoder passwordEncoder,
UserRepository userRepository, AuthorityRepository authorityRepository) {
Expand Down
2 changes: 1 addition & 1 deletion apollo-portal/src/main/resources/static/open/manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h5>{{'Open.Manage.CreateThirdApp' | translate }}
<small>{{'Open.Manage.ThirdAppIdTips' | translate }}</small>
</div>
<div class="col-sm-1">
<button class="btn btn-info" ng-click="getTokenByAppId()">查询</button>
<button class="btn btn-info" ng-click="getTokenByAppId()">{{'Common.Search' | translate }}</button>
</div>
<div class="col-sm-6">
<h4 style="color: red" ng-show="consumerToken"
Expand Down