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

[ISSUE-#4258] Fix wrong path when -Dspring.config.location not set #4259

Merged
merged 11 commits into from
Nov 25, 2020

Conversation

horizonzy
Copy link
Collaborator

What is the purpose of the change

Fix-#4258

chuntaojun
chuntaojun previously approved these changes Nov 19, 2020
sys/src/main/java/com/alibaba/nacos/sys/env/EnvUtil.java Outdated Show resolved Hide resolved
chuntaojun
chuntaojun previously approved these changes Nov 19, 2020
Copy link
Collaborator

@Maijh97 Maijh97 left a comment

Choose a reason for hiding this comment

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

Solve CI error.

@horizonzy
Copy link
Collaborator Author

Solve CI error.

I think it's CI mistake

….properties -> classpath:/application.properties
chuntaojun
chuntaojun previously approved these changes Nov 20, 2020
Maijh97
Maijh97 previously approved these changes Nov 22, 2020
@KomachiSion KomachiSion added this to the 1.4.1 milestone Nov 23, 2020
@horizonzy horizonzy dismissed stale reviews from Maijh97 and chuntaojun via 613217b November 23, 2020 02:34
@KomachiSion KomachiSion merged commit dc266b0 into alibaba:develop Nov 25, 2020
KomachiSion added a commit that referenced this pull request Dec 3, 2020
* [ISSUE-#4262] Fix public namespace permission problem (#4273)

* fix public namespace permission problem

* move NamespaceUtilTest to common module

* [ISSUE-#4232] Use EnvUtil to replace ApplicationUtils about env operation (#4281)

* use EnvUtil to replace ApplicationUtils about env operation

* remove unuse import

* remove unuse import

* remove profile usage

* [ISSUE-#4294] Use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment (#4295)

* use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment.

* remove unuseful import

* remove unuseful import

* refactor: refactor issue #4291 (#4292)

* remove env operation code in ApplicationUtils (#4298)

* refactor issue #4275 (#4299)

* when auth open, use resource parser cache, not use reflect newInstance every time. (#4287)

* [ISSUE-#4256] Just inject environment in StartingSpringApplicationRunListener (#4257)

* just inject environment in StartingSpringApplicationRunListener

* make nacosStartingListener is decoupling with springApplicationRunListener.

* add api doc

* refactor. transfer nacos listeners to SpringApplicationRunListener.

* remove unuseful import

* add doc info

* [ISSUE #4311] Fix Derby data source related SQL LIMIT exception (#4313)

* for #4311,Fixed Derby data source related SQL LIMIT exception.

* fix code style.

* code format.

* [ISSUE-#4310] Delete the main function only for testing (#4312)

* [ISSUE #4320] Fixing the Naming consistency module could not start in cluster mode (#4321)

* refactor: refactor issue #4291

* fix: fixing the Naming consistency module could not start in cluster mode

* fix service list can not search by groupName only (#4308)

* fix service list can not search by groupName only

* fix service list can not search by groupName only

* fix checkStyle

* add ut for NamingUtils

* [ISSUE-#4258]  Fix wrong path when -Dspring.config.location not set (#4259)

* fix spring.config.location is nullapplication.properties when -Dspring.config.location is not set in env

* fix wrong path when -Dspring.config.location not set

* modify default file resource method name

* fix "/" magic value

* change the way of get file

* not judge pathSplit by self, use Paths.get(a, b);

* when spring.config.location is not set, use {nacos.home}/conf/application.properties to cover it.

* refactor code

* code quality enhance

* just use two level to load conf. {spring.config.location}/application.properties -> classpath:/application.properties

* code clean

* Upgrade jraft to 1.3.5 (#4339)

* 升级jraft到1.3.5以支持IPv6, 调整 NamingUtilsTest 代码格式以解决checkstyle问题

* 删除测试类的类注释

* [ISSUE-#4342] Fix nacos.core.protocol.raft.data.read_index_type isn't effect (#4343)

* fix nacos.core.protocol.raft.data.read_index_type=ReadOnlyLeaseBased isn't effect and enhance log hint

* define ReadOnlyOption param name just by self

* [ISSUE-#4333]Add MapRowMapper to RowMapperManager (#4334)

* for #4311,Fixed Derby data source related SQL LIMIT exception.

* Revert "for #4311,Fixed Derby data source related SQL LIMIT exception."

This reverts commit 49188f1

* fix #4333.

* Remove case conversion.

* [ISSUE-#4181]  Normalize ContextPath value in client-side (#4326)

* [ISSUE-#4181] Just use ContextPathUtil normalize ContextPath value

* [ISSUE-#4181] add some test cases

* fix styles at the button '新建命名空间' (#4362)

* [ISSUE-#4346] Fix import code (#4347)

* remove import.*

* transfer first_pre to final static variable

* use NamingBase.Xxx to replace constant

* reuse cliClientService (#4375)

* Sync code from upstream/develop

Co-authored-by: 赵延 <[email protected]>
Co-authored-by: liaochuntao <[email protected]>
Co-authored-by: zhuhao <[email protected]>
Co-authored-by: mai.jh <[email protected]>
Co-authored-by: 孙继峰 <[email protected]>
Co-authored-by: Mark4z <[email protected]>
Co-authored-by: 邪影oO <[email protected]>
Co-authored-by: Gagharv <[email protected]>
Co-authored-by: iochenlei <[email protected]>
@horizonzy horizonzy deleted the fix-envutils-getresource branch December 24, 2020 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants