Commit Graph

3028 Commits

Author SHA1 Message Date
mai.jh
f78bef9665
[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 49188f14

* fix #4333.

* Remove case conversion.
2020-11-27 10:10:11 +08:00
赵延
67a0ba3f8f
[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
2020-11-26 23:56:42 +08:00
邪影oO
85bdc1e644
Upgrade jraft to 1.3.5 (#4339)
* 升级jraft到1.3.5以支持IPv6, 调整 NamingUtilsTest 代码格式以解决checkstyle问题

* 删除测试类的类注释
2020-11-26 18:33:18 +08:00
赵延
dc266b03bc
[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
2020-11-25 17:02:21 +08:00
Mark4z
6ad8da4f68
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
2020-11-25 15:01:18 +08:00
liaochuntao
70a26959e3
[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
2020-11-25 11:10:09 +08:00
孙继峰
c8d46a6046
[ISSUE-#4310] Delete the main function only for testing (#4312) 2020-11-24 13:22:22 +08:00
mai.jh
3bf8844992
[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.
2020-11-24 13:21:15 +08:00
赵延
7f2a3307d6
[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
2020-11-24 11:17:13 +08:00
赵延
3d97e36785
when auth open, use resource parser cache, not use reflect newInstance every time. (#4287) 2020-11-23 13:51:13 +08:00
zhuhao
b7b7b1975f
refactor issue #4275 (#4299) 2020-11-23 13:50:14 +08:00
赵延
a3597de1bc
remove env operation code in ApplicationUtils (#4298) 2020-11-23 13:44:28 +08:00
liaochuntao
a43bf8fcfb
refactor: refactor issue #4291 (#4292) 2020-11-23 09:49:08 +08:00
赵延
8500279c79
[ISSUE-#4294] Use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment (#4295)
* use EnvUtils.setEnvironment to replace ApplicationUtils.injectEnvironment.

* remove unuseful import

* remove unuseful import
2020-11-21 19:03:51 +08:00
赵延
886715b2d7
[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
2020-11-21 06:54:05 +08:00
赵延
ba9ed8e736
[ISSUE-#4262] Fix public namespace permission problem (#4273)
* fix public namespace permission problem

* move NamespaceUtilTest to common module
2020-11-20 20:00:57 +08:00
赵延
44641d9431
fix twice invoke and the value is not same. (#4271) 2020-11-20 09:16:19 +08:00
shizhengxing
daf593823a
[ISSUE #4136] Fix the bug that cann't correctlly instantiate ServiceInfo from cache file #4249 (#4272) 2020-11-20 09:15:41 +08:00
mai.jh
6f4dbf065f
[ISSUE #4225] Replace http client in HttpHealthCheckProcessor (#4244)
* for #42255, Replace http client in HttpHealthCheckProcessor.

* Restore the old version number.

* Removes temporary attributes from a method.

* fix Code style.

* Use the EnvUtil.getProperty() method to get the HTTP parameter, leaving it customizable.

* Fix error symbol.

* Remove excess package import.

* Rollback the code about the custom HTTP parameter.

* fix Code style.
2020-11-19 19:07:44 +08:00
liaochuntao
f00423ff72
Merge pull request #4265 from horizonzy/modify-envutil-getcontext
[ISSUE-#4264] Fix always load property when the contextPath is '/'
2020-11-19 16:21:37 +08:00
赵延
7c30c4ea96 fix always load property when the contextPath is '/' 2020-11-19 12:27:59 +08:00
paderlol
501b1e73e4
Fix sql injection bug (#4245)
* Fix sql injection bug

* Fix checkstyle issue
2020-11-18 09:23:48 +08:00
mai.jh
0a983c823f
for #4236,fix error with the Apache HTTP client "Content-Length Header Already Present" (#4237) 2020-11-16 15:21:49 +08:00
liaochuntao
bcd62d5574
Refactor issue 4228 (#4229)
* refactor: adjusts conformance protocol layer objects

* feat: repair problems

* refactor: reafctor consistency model
2020-11-16 09:58:52 +08:00
liaochuntao
c183b77db4
[ISSUE #4090] Configuration file changes do not take effect (#4188)
* fix: fix issue #4090

* fix: fixed an issue where profile updates did not take effect
2020-11-14 14:14:14 +08:00
liaochuntao
d7cc42d8a4
Fix issue 4187 (#4205)
* fix: fix issue 4187

* fix: correct faulty repair logic

* fix: fixed unit test issues
2020-11-14 14:12:48 +08:00
赵延
5c38d0b5b8
[ISSUE-#4115] Refactor client naming event handle logic (#4137)
* refactor and supply api to async handle instances change event

* add async handle way to callback event listener

* refactor EventListener, supply getExecutor to handle event async and compatible old version.

* remove unnecessary code

* ignore abstract class name check

* fix EmptyLineSeparator

* remove unuseful import

* compatible old client sdk, add abstractEventListener to support async handle naming event.

* remove unuseful import

* refactor InstanceChangeListener. decouple AbstractEventListener's executor and InstanceChangeListener's executor

* 1.remove key if listeners is empty.
2.fix getSubscribeServices

* revert notify center code

* code quality enhance

* upgrade @since 1.4.0 -> 1.4.1

* change combineListenKey to ServiceInfo.getKey

* just deregisterSubscriber when hostReactor shutdown

* not export getSubscribers()

* add this key word, and move code place.
2020-11-13 11:58:12 +08:00
蚊子猫
01101c5cc4
[ISSUE #3102] remove lang/lang3 dependency from api/common/client. (#4207)
* add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client.

Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf

* remove lang dependency.

Change-Id: I5cbd811babc8269a54b93e278ad6e5e2663c8427

* remove lang/lang3 dependency from api/common/client.

Change-Id: I77b5cf5d922a7c031fa4676d1404de7cb255a010
2020-11-12 20:18:11 +08:00
mai.jh
a47e726f95
for #4199, Replace the http client implementation used by DistroFilter. (#4211) 2020-11-12 20:17:43 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18:45 +08:00
Gagharv
7baa696983
[ISSUE-#4181] fix url replace logic error,adjust the getContextPath logic (#4203) 2020-11-11 21:25:12 +08:00
蚊子猫
3e33851d17
[ISSUE #3102] remove lang dependency. (#4202)
* add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client.

Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf

* remove lang dependency.

Change-Id: I5cbd811babc8269a54b93e278ad6e5e2663c8427
2020-11-11 19:50:45 +08:00
liaochuntao
7a44dcbb7d
fix: fix issue 4187 (#4194) 2020-11-11 17:49:25 +08:00
蚊子猫
bc7a153ec0
add commons-lang3 dependency into core and sys, prepare to remove lang/lang3 dependency in common/api/client. (#4198)
Change-Id: I4b7a0bec09359e64ecf997b123b85c265bfe16cf
2020-11-11 17:46:47 +08:00
杨翊 SionYang
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 (#4195)" (#4196)
This reverts commit a0bbd562b0.
2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 (#4195) 2020-11-11 10:44:43 +08:00
赵延
4e26b0da84
move relation doc info to naming module. (#4193) 2020-11-11 10:31:35 +08:00
杨翊 SionYang
8950304f03
Revert "[ISSUE #3102] Create utils class to nacos-common (#4165)" (#4191)
This reverts commit cf92d19d03.
2020-11-10 18:21:59 +08:00
赵延
f808ffdb65
[ISSUE-#4179] Add index for db.user and db.password (#4186)
* add index for db.user and db.password, to avoid some situation that it contains symbol ','

* add multi data source template

* add line to separate

* Revert "add line to separate"

This reverts commit 390eb6fb

* Revert "add multi data source template"

This reverts commit 4470e633
2020-11-10 17:53:37 +08:00
杨翊 SionYang
6b7fb05601
For #3607, #4078, #4170, Datasource pool configuration can be configured. (#4178)
* For #3607, #4078, #4170, Datasource pool configuration.

* Fix ci error.
2020-11-09 20:18:27 +08:00
蚊子猫
cf92d19d03
[ISSUE #3102] Create utils class to nacos-common (#4165)
* [ISSUE #3102] Create utils class to nacos-common.

Change-Id: I30970371b86a032366bd66c7b031a4cc3085512e

* [ISSUE #3102] Create utils class to nacos-common, fix check style errors.

Change-Id: I4711ad2b64a4265379f5d7df7434352e69c3760d
2020-11-09 19:30:56 +08:00
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +08:00
赵延
39a2f20d56
[ISSUE #3907] when publishConfig, if type is absent, set default value 'text' (#3915)
* when publishConfig, if type is absent, set default value 'text'

* 1.add publishConfig api(add param type)
2.check type is valid in nacos server
2020-11-09 11:36:50 +08:00
赵延
48d0c68527
[ISSUE-#4166] Optimize notifyCenter code (#4167)
* enhance notify center code quality

* reverse the judge logic
2020-11-09 11:17:30 +08:00
sanxun0325
fb616483a2
updates the default time zone for interface results (#4073) 2020-11-09 10:56:29 +08:00
mai.jh
51fa1c052a
for #3832, add common http client shutdown method. (#4150) 2020-11-06 14:44:22 +08:00
邪影oO
538509502f
IPv6 support (#3773)
* IPv6 support

* AddressServerParamCheckUtil 合并到 IpUtil 及一些修改

* 解决魔法值

* 修改隐患

* 调整使用了类似 ip.indexOf(":") 查找是否有端口的地方的逻辑, 一些 ":" 替换为常量

* 删除无用测试

* IpUtil 改名 为 IPUtil, 涉及IP的相关方法名修改,涉及到的调用修改,检测IP的地方调用的isIPv4改为isIP. 修改涉及IP的字段长度及相关升级更新的sql

* no message

* no message

* no message

* no message

* 获取本机IP时,如果本机IP是IPv6并且包含网卡信息(V6地址中最后面的百分号和百分号后面的内容)则去除网卡信息

* 解决 AvoidComplexConditionRule(请不要在条件中使用复杂的表达式)

* 移除无用代码

* 添加注释

* 调整code style, 调整获取本机IP的逻辑
2020-11-05 20:15:06 +08:00
邪影oO
6ddfa3e997
fix the occasional failure of CI (#4131)
* fix the occasional failure of CI

* 修复错误的修改

* no message
2020-11-05 10:12:06 +08:00
赵延
4cd19990f2
[ISSUE-#4066] Make serviceNameList followed string order (#4087)
* make serviceNameList followed string order

* code format
2020-11-05 09:54:25 +08:00
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00