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.

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

Conversation

nobodyiam
Copy link
Member

What's the purpose of this PR

fix the spring security beans dependency issue brought by #4212

Which issue(s) this PR fixes:

Fixes #4297

Brief changelog

  1. explicitly declare the springSecurityUserService bean depends on the jdbcUserDetailsManager bean to control the bean initialization sequence
  2. fix one missing label translation

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.
  • Update the CHANGES log.

2. fix the spring security beans dependency issue brought by apolloconfig#4212
@nobodyiam nobodyiam requested a review from lepdou April 5, 2022 05:27
@codecov-commenter
Copy link

Codecov Report

Merging #4298 (b76f787) into master (db6a439) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #4298      +/-   ##
============================================
- Coverage     53.17%   53.15%   -0.02%     
+ Complexity     2668     2666       -2     
============================================
  Files           488      488              
  Lines         15253    15253              
  Branches       1577     1577              
============================================
- Hits           8111     8108       -3     
- Misses         6587     6593       +6     
+ Partials        555      552       -3     
Impacted Files Coverage Δ
...lo/portal/spi/configuration/AuthConfiguration.java 8.33% <ø> (ø)
...framework/apollo/openapi/entity/ConsumerAudit.java 42.42% <0.00%> (-6.07%) ⬇️
...mework/apollo/openapi/service/ConsumerService.java 53.38% <0.00%> (-1.70%) ⬇️
...ervice/service/ReleaseMessageServiceWithCache.java 85.88% <0.00%> (+1.17%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update db6a439...b76f787. Read the comment docs.

Copy link
Contributor

@lepdou lepdou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lepdou lepdou merged commit d59638c into apolloconfig:master Apr 5, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Apr 5, 2022
@nobodyiam nobodyiam deleted the version-2-misc-fix branch April 5, 2022 05:46
@nobodyiam nobodyiam added this to the 2.0.0 milestone Apr 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apollo portal start failed
3 participants