-
Notifications
You must be signed in to change notification settings - Fork 8.8k
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
feature: compatible with file.conf and registry.conf configurations #5668
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
slievrly
reviewed
Jul 2, 2023
server/src/main/java/io/seata/server/spring/listener/SeataPropertiesLoader.java
Outdated
Show resolved
Hide resolved
slievrly
reviewed
Jul 2, 2023
server/src/main/java/io/seata/server/spring/listener/SeataPropertiesLoader.java
Outdated
Show resolved
Hide resolved
funky-eyes
added
type: feature
Category issues or prs related to feature request.
module/config
config module
module/server
server module
labels
Jul 2, 2023
funky-eyes
changed the title
feature: seata-server support load registry conf
feature: compatible with file.conf and registry.conf configurations in version 1.4.2 and below
Jul 3, 2023
slievrly
changed the title
feature: compatible with file.conf and registry.conf configurations in version 1.4.2 and below
feature: compatible with file.conf and registry.conf configurations
Jul 4, 2023
slievrly
approved these changes
Jul 4, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
module/config
config module
module/server
server module
type: feature
Category issues or prs related to feature request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
直接复用configurationfactory中load出来的fileconfiguration,fileconfiguration自带对老配置的读取,这怒地fileconfiguration读到的配置转换成springboot可识别的配置进行合并,优先级为自带的application.yml>老配置config,application.yml中没有的配置会从config中读取,全局顺序是-d>env>application.properties/yaml>file.conf®istry.conf
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews