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

2953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
邪影oO
13599fd83d
Fix#3973 (#3974) 
* fix #3973

* 重复代码抽取到一个方法

* 删除私有方法的注释

* 处理namespace参数的方法提出到一个工具类中

* 修改注释

* 添加licences

* 增加 TenantUtil 的测试

* TenantUtil 改名为 NamespaceUtil
 2020-10-13 15:48:46 +08:00
chuntaojun
73a29ebc85 Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-10-13 15:16:08 +08:00
chuntaojun
686ff8d886 Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming 2020-10-13 15:15:53 +08:00
KomachiSion
018e0bff8c refactor instance heart beat storage 2020-10-12 17:43:56 +08:00
KomachiSion
72f3476c57 Add get client data after verify failed 2020-10-12 16:34:33 +08:00
KomachiSion
b3b6c30ef0 Move remove listener logic to ServiceManager 2020-10-12 16:00:50 +08:00
KomachiSion
b8b111320a Move remove listener logic to ServiceManager 2020-10-12 14:17:31 +08:00
赵延
49ff149dfb
1.fix unit test can't pass (#3956) 
2.update the unit test
 2020-10-12 13:13:07 +08:00
赵延
c0496b364e
[ISSUE #3909] add domain's judgement (#3913) 
* add domain's judgement

* modify domain's judgement, can resolve = true

* remove judgement in 'if' code block

* replace Ip to IP in InetUtils

* log warn info when domain can not be resolved

* fix vaiable name
 2020-10-12 12:19:02 +08:00
赵延
d6cc8ce5b0
fix typo error (#3954) 2020-10-12 12:18:14 +08:00
nov.lzf
336269891e
ak auth support;log optimize; client port aware on server side (#3970) 
* ak auth support on long connection

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* server side aware of client port;basic optimize

* cluster config notify bugfix and log optimize

* client rpc log support for rpc

* reconnect rate control
 2020-10-12 11:53:43 +08:00
JackSun-Developer
714b9671a3
[ISSUE#3533] change cache dir with namespace -- part 2: unify the log dir (#3882) 2020-10-12 11:25:06 +08:00
JackSun-Developer
17be3984e7
[ISSUE#3533] change cache dir with namespace -- part 1: unify the cache dir (#3859) 2020-10-12 11:24:22 +08:00
chuntaojun
3c8b84166c refactor: merge upstream jraft-naming 2020-10-11 22:11:47 +08:00
chuntaojun
04fcbeba31 Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming 2020-10-06 22:00:48 +08:00
赵延
5745922786
isAddressServerHealth set as true when request success (#3952) 2020-10-06 21:53:23 +08:00
chuntaojun
4987276eda fix: fix merge conflict 2020-09-30 17:14:57 +08:00
chuntaojun
8ad399a4aa feat: merge upstream develop 2020-09-30 17:00:39 +08:00
chuntaojun
c442a71a5f Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-30 14:24:27 +08:00
赵延
f6c6a9f3b2
[ISSUE #3850] ignore socket exception when client destroy already (#3906) 
* if client destroy already, ignore socket exception.

* remove the exception's judgement

* remove unuseful import
 2020-09-30 13:14:42 +08:00
chuntaojun
a6a09d221f refactor: merge xiwen branch 2020-09-30 01:17:02 +08:00
KomachiSion
ea515428ce Fix 1.3.2 upgrade 1.4.0 can't notify service change problem 2020-09-25 18:55:57 +08:00
KomachiSion
402ad12c85 Move datum key check to KeyBuilder 2020-09-25 15:17:12 +08:00
KomachiSion
481a1f972f Revert PR#2849. 2020-09-25 15:06:21 +08:00
KomachiSion
170f979d44 Use multiple kv storage in new raft processor to compatible old data 2020-09-25 13:58:19 +08:00
KomachiSion
eceab55cef Use datum in new raft processor to compatible old data 2020-09-24 17:03:24 +08:00
chuntaojun
bb4bc3c457 Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-23 20:41:16 +08:00
KomachiSion
f792300da2 Fix Performance logger thread call old raft error 2020-09-23 20:29:35 +08:00
KomachiSion
63dafba085 Fix Listener do not listen new consistency problem 2020-09-23 20:28:26 +08:00
sanxun0325
787ea47cfe
[ISSUE #3781]Fix service list intermittently lost service (#3891) 
* update service init

* commit futureMap.remove()

* update serviceManager

Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-09-23 20:17:07 +08:00
sanxun0325
e2c037dd48
update spring boot dependencies version (#3900) 
Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-09-23 20:15:15 +08:00
KomachiSion
825fe6c470 Temp fix raft server can't refresh raft configuration problem 2020-09-23 13:59:07 +08:00
chuntaojun
0da7224d1a Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming 2020-09-22 20:49:30 +08:00
chuntaojun
11873f925d feat: merge from xiwen 2020-09-22 20:49:25 +08:00
ljhrot
7902b22e05
Fix chinese string are truncated in ConcunrrentDiskUtil (#3883) 2020-09-22 20:42:13 +08:00
KomachiSion
3592846ad9 Fix jraft problem 2020-09-22 20:39:46 +08:00
shizhengxing
5df146e26b
[ISSUE #3871] fix description don't match the error (#3886) 2020-09-22 15:55:46 +08:00
chuntaojun
acb6b1f40c Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming 2020-09-22 13:15:22 +08:00
杨翊 SionYang
d5d78b7ff0
Refactor distro filter to support route by ip port (#3881) 
* Refactor distro filter

* Fix some sync problem
 2020-09-21 19:31:35 +08:00
赵延
f01cd59bf7
[ISSUE #3867] replace the way which get version (#3872) 
* replace the way which get version

* remove version sign application.properties in nacos-api
 2020-09-21 19:11:21 +08:00
mai.jh
4ce897e409
bug: fix the problem of incorrect judgment of http response code in SubscribeManager#getSubscribers() method (#3879) 2020-09-21 15:18:23 +08:00
杨翊 SionYang
833e02bc19
Merge pull request #3865 from KomachiSion/feature_support_grpc_core 
Synchronize code from develop branch
 2020-09-18 16:32:48 +08:00
KomachiSion
ddf2dc0247 Solve conflict 2020-09-18 16:31:09 +08:00
KomachiSion
6e5b09aee7 Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultSharePublisher.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-09-18 16:16:00 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805) 
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
 2020-09-18 16:05:36 +08:00
杨翊 SionYang
d69823e4a6
Refactor Instance Controller (#3864) 
* Move some old logic code to InstanceOperator

* Support sync ip port client
 2020-09-18 15:59:26 +08:00
杨翊 SionYang
1c935d1053
Add heart check for instance registered by http client and openAPI (#3860) 
* Add heart check

* For checkstyle and pmd
 2020-09-17 20:53:53 +08:00
mai.jh
473090ba13
Fix http client contentType charset problem (#3848) 2020-09-17 17:49:11 +08:00
杨翊 SionYang
4b31f895ca
Add upd push for ip port client (#3849) 
* Add upd push for ip port client

* auto clean expire ip port client
 2020-09-16 20:32:11 +08:00
KomachiSion
fdee6b8b69 For checkstyle and pmd 2020-09-16 16:51:44 +08:00