zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,998 Commits 2 Branches 3 Tags 58 MiB
826450532e
Commit Graph

2998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
杨翊 SionYang
826450532e
Move namespace cache to ServiceManager (#4345) 2020-11-26 20:53:20 +08:00
杨翊 SionYang
18439da98e
Merge pull request #4290 from KomachiSion/feature_support_grpc_core 
Sync develop branch and solve conflict
 2020-11-20 18:04:52 +08:00
KomachiSion
3dc7b34c58 Sync develop branch and solve conflict 2020-11-20 18:01:34 +08:00
KomachiSion
e56eb3680c Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	api/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	client/src/test/java/com/alibaba/nacos/client/naming/core/HostReactorTest.java
#	common/src/main/java/com/alibaba/nacos/common/notify/NotifyCenter.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/DistroFilter.java
#	pom.xml
 2020-11-20 17:13:49 +08:00
杨翊 SionYang
9f0406a1a6
Fix some push problem (#4285) 
* Fix client can query disable instances and server push disable instances problem

* Fix client reconnect but no re-subscribe service problem
 2020-11-20 16:07:56 +08:00
杨翊 SionYang
1546ff6206
Support update instance metadata and sync by raft (#4279) 2020-11-20 10:35:33 +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
liaochuntao
89342da468
Optimize Bean injection and fix unsafe Map removal issues (#4276) 
* refactor: refactor code

* fix: fix generic issues
 2020-11-20 09:12:14 +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
nov.lzf
5c656d6f42
memory gc optimize ; string pool bugfix (#4261) 2020-11-19 10:34:40 +08:00
杨翊 SionYang
d4b2d2f146
Adapt update service metadata api. (#4260) 
* Adapt update service metadata api.

* For checkstyle
 2020-11-18 21:09:47 +08:00
nov.lzf
69c84f1397
pmd ,checkstyle (#4252) 2020-11-18 13:46:27 +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
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +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
杨翊 SionYang
164ed33ada
Feature support grpc core (#4204) 
* NacosNamingMetadataManager --> NamingMetadataManager

* Try to add ServiceMetadata consistency

* add catalog api support new data

* Change version to 2.0.0-SNAPSHOT
 2020-11-11 19:50:14 +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
杨翊 SionYang
10e00e8cd3
Use SPI to load health check interceptor (#4154) 2020-11-06 17:31:24 +08:00
杨翊 SionYang
c81bb5b722
Add NacosServiceLoader and replace ServiceLoader usage directly (#4151) 
* Add NacosServiceLoader

* Replace ServiceLoader by NacosServiceLoader
 2020-11-06 14:46:28 +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
杨翊 SionYang
0d4f882835
Merge pull request #4149 from KomachiSion/feature_support_grpc_core 
Synchronize develop branch and upgrade version to 2.0.0-ALPHA
 2020-11-05 20:06:48 +08:00
KomachiSion
8829d3c6ed Upgrade to 2.0.0-ALPHA 2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/common/Constants.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
#	common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
#	core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-11-05 19:33:46 +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