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

856 Commits

Author SHA1 Message Date
李晓双 Li Xiao Shuang
88fb26cfc6
[ISSUE #5695] Add config encrypt spi for nacos server. (#7934) 
* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* fix code quality (#6727)

* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* [ISSUE#5695] Summer2021 Cache encryptedDataKey  (#6878)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* 秘钥缓存到内存中

* 解决冲突

* 修改filter继承AbstractConfigFilter (#6879)

* [ISSUE#5695] Summer2021   EncryptedDataKey is persisted to Derby (#6882)

* [ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0 (#6655)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* fix code quality (#6727)

* # This is a combination of 6 commits.tree cf7a399f99c4d81b8667c8de06f5ceb8c79fb6f0
parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800

# This is a combination of 3 commits.
# This is the 1st commit message:

[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化
# This is the commit message #2:

[ISSUE#5695] Summer2021 Cache encryptedDataKey  (#6878)

* Defines the interface

* 增加aes实现

* 客户端、服务端加解密实现

* 客户端、服务端加解密实现

* 秘钥持久化

* 秘钥持久化

* 秘钥缓存到内存中

* 解决冲突
# This is the commit message #3:

修改filter继承AbstractConfigFilter (#6879)


# This is the commit message #6:

客户端、服务端加解密实现

* parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631805204 +0800

parent 8024ecf31bf23a9edab416be8a3bfd1c0e48ce5e
author 李晓双 Li Xiao Shuang <644968328@qq.com> 1630028256 +0800
committer lixiaoshuang <644968328@qq.com> 1631804378 +0800

[ISSUE#5695] Add a plugin SPI for configuration encryption and decryption for Nacos 2.0, EncryptedDataKey is persisted (#6740)

* 配置加解密插件

* derby支持秘钥存储

* 克隆功能兼容配置加解密 (#6913)

* [ISSUE#5695] Summer2021 Import/export compatible with configuration encryption and decryption (#6956)

* 克隆功能兼容配置加解密

* 导入导出兼容配置加解密

* 秘钥base64编码、更换AES加密模式 (#6974)

* [ISSUE#5695] Summer2021 add unit test for ConfigCryptoFilter (#6991)

* add unit test for ConfigCryptoFilter

* add unit test for ConfigCryptoFilter

* [ISSUE#5695] Summer2021 add unit test for CryptoExecutor (#6990)

* add unit test for CryptoExecutor

* add Copyright

* [ISSUE#5695] Summer2021  add unit test for CryptoManager (#6989)

* add unit test for CryptoManager

* add unit test for CryptoManager

* [ISSUE#5695] Summer2021 add unit test for AesCrypto (#6988)

* add unit test for AesCrypto

* update AesCryptoTest

* Increased iv randomness

* add default Iv

* fix javadoc

* fix unit test

* defining plugin intergace

* Replace the client encryption and decryption actuator

* Replace the server encryption and decryption actuator

* add unit test

* add unit test

* remove old code

* fix NacosConfigServiceTest

* Encryption and decryption to achieve migration

Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2022-03-16 10:54:11 +08:00
胡俊
2e07c6a0c1
Package scan (#7917) 
* PayloadRegistry update use spi

* PayloadRegistry update use spi

* PayloadRegistry update use spi

* PayloadRegistry update use spi

* add test

* update comment

* remove code
rename code
 2022-03-11 15:50:44 +08:00
胡俊
fdf90133a2
[ISSUE#7886]Feature package scan (#7895) 
* for #7886

* nacos style

* nacos style

* code style

* .

* scan nacos style

* class reader

* class reader

* class reader

* class reader

* add comment

* update dependency

* update dependency

* rat update
check style update

* package change

* pdm exclude

* pdm update

* comment

* comment

* change pkg  final

* code structure update

* code style

* code style update
 2022-03-08 20:11:21 +08:00
realJackSun
a4ce82221f [#7904] Bad smell code in ClientWorker.java 2022-03-08 10:43:50 +08:00
胡俊
9a26a65bc5
[ISSUE#7738]Client code should use enabled to pass parameters (#7756) 
* use enabled

* add var
 2022-02-16 10:25:46 +08:00
胡俊
4c45a3afd3
fix by zero error (#7724) 
* fix by zero error

* fix by zero error --unit test
 2022-02-07 10:38:37 +08:00
KomachiSion
32d7ce3b66 Repackage some class 2022-01-24 15:35:45 +08:00
KomachiSion
135ab364fe Move client spi to nacos-auth-plugin module 2022-01-21 15:40:02 +08:00
KomachiSion
4e98013f8e Solve conflicts. 2022-01-12 17:02:20 +08:00
KomachiSion
78de31dbdd Merge remote-tracking branch 'upstream/develop' into issue#5696-merge-develop 
# Conflicts:
#	auth/src/main/java/com/alibaba/nacos/auth/common/AuthConfigs.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxy.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/NamingClientProxyDelegate.java
#	client/src/test/java/com/alibaba/nacos/client/naming/remote/AbstractNamingClientProxyTest.java
 2022-01-12 16:52:14 +08:00
胡俊
7bb6cf2d13
[ISSUE#6999]Logback overrides the automatic refresh of application logback . issu… (#7596) 
* Logback overrides the automatic refresh of application logback . issue #6999

* Logback overrides the automatic refresh of application logback . issue #6999
 2022-01-11 16:58:06 +08:00
pengten
626f79ad51
Optimize code style and fix bugs (#7469) 2022-01-09 22:28:27 +08:00
胡俊
cdd83e2117
optimize NotifySubscriberRequest (#7545) 2022-01-07 18:08:22 +08:00
胡俊
a17098df24
The configuration cannot be updated in the case of single core (#7561) 
* The configuration cannot be updated in the case of single core

* client threadPool

* log

* update style
 2022-01-06 16:16:56 +08:00
李晓双 Li Xiao Shuang
f5ef53ee2e
Merge pull request #7551 from KomachiSion/develop-issue#7550 
[ISSUE#7550] Add judgement for is subscribe services.
 2022-01-04 19:31:17 +08:00
KomachiSion
d3c76ceb0b Fix Unit test. 2022-01-04 18:04:17 +08:00
KomachiSion
351a290a25 Fix #7550, add judgement for is subscribe services. 2022-01-04 17:55:03 +08:00
李晓双 Li Xiao Shuang
b64e17a891
Merge pull request #7537 from hujun-w-2/feature_add_error_message 
Add error information to facilitate troubleshooting
 2022-01-01 14:22:00 +08:00
hujun
6ce2eb8d7c Add error information to facilitate troubleshooting 2021-12-31 20:53:48 +08:00
hujun
ef6b0c186b optimize judge 2021-12-31 20:37:41 +08:00
MajorHe1
c6bae6ba1d
[ISSUE #7276] init security proxy when construct in NacosNamingMainta… (#7287) 
* [ISSUE #7276] init security proxy when construct in NacosNamingMaintainService

* [ISSUE #7276] add something to make ci re-run
 2021-12-21 12:51:21 +08:00
赵延
78f783f55b
fix push again problem. (#7412) 2021-12-15 11:11:50 +08:00
李晓双 Li Xiao Shuang
4c27c03052
Merge pull request #7311 from li-xiao-shuang/feature_7310 
[ISSUE #7310] replace with <>
 2021-12-01 11:51:52 +08:00
李晓双 Li Xiao Shuang
6c2704dd3d
[ISSUE #7308] replace with lambda (#7309) 
* replace with lambda

* remote unused import
 2021-11-30 16:05:24 +08:00
lixiaoshuang
3059cf8683 replace with <> 2021-11-29 22:51:29 +08:00
赵延
c0fb69bdb3
fix update task can't stop problem. (#7248) 2021-11-29 10:28:10 +08:00
onewe
e5cb831965
[ISSUE #7229] Optimize the constants to the utils package for the client module. Part 5 (#7259) 
* add Constants.java

* Optimize the constants to the utils package for the client module
 2021-11-24 11:17:40 +08:00
onewe
e4c5368147
[ISSUE #7229] Optimize the constants to the logging package for the client module. Part 2 (#7256) 
* add Constants.java

* Optimize the constants to the logging package for the client module
 2021-11-24 11:16:09 +08:00
李晓双 Li Xiao Shuang
c6adbcaa20
replace with lambda (#7218) 2021-11-12 10:56:54 +08:00
李晓双 Li Xiao Shuang
774fcf74ce
[ISSUE ##7214] replace with lambda (#7215) 
* can be replaced with lambda

* can be replaced with <>

* replace with lambda

* delete unused import
 2021-11-12 10:28:25 +08:00
李晓双 Li Xiao Shuang
80874749bf
[ISSUE #7220] replace with lambda (#7222) 
* replace with lambda

* replace with lambda
 2021-11-12 10:20:54 +08:00
brotherlu-xcq
f51985e0b1
[ISSUE #7504] fix the typos in TemplateUtils.java. (#7162) 2021-11-04 09:58:34 +08:00
赵延
290316d2ac
not publish server list change event when the servers is not change. (#7165) 2021-11-04 09:58:09 +08:00
李晓双 Li Xiao Shuang
6121bc7e05
can be replaced with <> (#7137) 2021-10-28 10:14:27 +08:00
李晓双 Li Xiao Shuang
72bbd24c88
[ISSUE ##7131] replaced with lambda (#7136) 
* can be replaced with lambda

* can be replaced with <>
 2021-10-28 10:14:08 +08:00
KomachiSion
6317a3fc89 Fix ram type plugin not login for config module. 2021-10-09 15:13:23 +08:00
KomachiSion
dd600537b0 For PMD and copyright. 2021-10-09 14:20:39 +08:00
杨翊 SionYang
77afc50350
[ISSUE#5696] Move and repackage some ram class to ram package. (#7040) 
* move client.identity package to auth.ram.identity.

* move SignUtil to ram.utils.

* Add shutdown for auth plugin.

* Move SpasAdapter to new package.
 2021-10-09 11:38:43 +08:00
杨翊 SionYang
7ccd0773f1
[ISSUE#5695] Replace the usage of Ram in naming and config module. (#7038) 
* Change SecurityProxy usage

* Replace ram usage in naming module

* Replace ram usage in naming module

* Replace ram usage in config module

* Remove unused field and fix unit test.
 2021-10-09 10:32:45 +08:00
杨翊 SionYang
1cfbd45fda
[ISSUE#5696] Add Ram client auth service impl. (#7036) 
* Add Resource abstract.

* Add Ram client auth service impl.
 2021-10-08 16:59:08 +08:00
杨翊 SionYang
cbf80cd297
[ISSUE#5696] repackage client (#7029) 
* Rename and move classes make them more readable.

* Rename and move test classes.
 2021-10-08 10:03:36 +08:00
Wuyunfan-BUPT
c771c5d2b9
[ISSUE # 5696] Replace original auth client (#6885) 
* Replace auth client

* Replace auth client original implement

* Replace original auth client

* Revise client: combine function and modify name
 2021-09-18 09:43:30 +08:00
Wuyunfan-BUPT
b825bac845
Add auth client: plugin and implement (#6883) 2021-09-15 11:55:31 +08:00
secbro2
562cf6f579
optimize the HashMap’s initialCapacity (#6714) 2021-08-24 09:36:59 +08:00
secbro2
6a273c9451
format and optimize the log (#6675) 
* complete the warn log

* format and optimize the log

* format and optimize the log
 2021-08-17 09:31:43 +08:00
secbro2
8801be513d
complete the warn log (#6646) 
* complete the warn log

* format and optimize the log
 2021-08-16 10:11:35 +08:00
secbro2
0dffe2e769
change the "initialCapacity" of HashMap (#6588) 
* HashMap自动扩容因子0.75，此处默认值会自动扩容一次。

* Revert "HashMap自动扩容因子0.75，此处默认值会自动扩容一次。"

This reverts commit e7b2055e

* 修复HashMap自动扩容一次问题
 2021-08-11 13:31:49 +08:00
ZZQ的
d54789dbc3
Remove expired TODO (#6586) 
* Remove expired TODO

* Format code
 2021-08-09 09:50:11 +08:00
孙继峰
f91089eb90
[ISSUE #6595] Optimize RpcClient (#6596) 
* replace explicit type argument with <>

* replace anonymous class with lambda

* remove redundant initializer

* format comment & log and fix typo

* add unit test to RpcClient::resolveServerInfo

* extend CollectionUtils::getOrDefault

* simplify RpcClient::resolveServerInfo

* remove unused variable
 2021-08-09 09:42:37 +08:00
ZZQ的
449480f68b
Refactor the cache to replace guava (#6520) 
* Refactor the cache to replace guava

* Refactor CacheBuilder

* add unit test

* Format code
 2021-08-03 09:30:26 +08:00
Catcher Wong
54408d49b3
improve the code quality for naming client FailoverReactor (#6451) 2021-07-26 09:27:49 +08:00
MajorHe1
7441c3ad17
[ISSUE #6416] fix some typo in NamingGrpcRedoService (#6418) 2021-07-22 09:56:14 +08:00
杨翊 SionYang
fca259fd38
[ISSUE#6384] Add redo feature for nacos client naming (#6395) 
* Add RedoData

* Add NamingGrpcRedoService

* Add RedoScheduledTask

* Refactor NamingGrpcClientProxy to use new redo service.

* For PMD

* Remove NamingGrpcConnectionEventListener.java
 2021-07-21 10:08:10 +08:00
hunjipo
cdc276e829
To slightly improve performance, this commit switches to StringBuilder.append(char) instead of StringBuilder.append(String) whenever we append a single character to a StringBuilder. (#6300) 2021-07-12 13:51:14 +08:00
MajorHe1
5bb048cf7a
[ISSUE #6142] redo register and subscribe repeatedly if failed. get data from database if user and role info not in cache. (#6156) 
* [ISSUE #6142] redo register and subscribe repeatedly if failed. get data from database if user and role info not in cache.

* [ISSUE #6142] simplify redo register and subscribe strategy, use set to record failed task.

* [ISSUE #6142] change the return value of redoRegisterEachInstance. move connected judgement to start of loop.

* [ISSUE #6142] add unit test for NamingGrpcConnectionEventListener. remove cache missed judgement of user and role.

* [ISSUE #6142] Merge origin develop branch to fix CI failure. Change thread sleep implement.
 2021-06-30 17:44:07 +08:00
shalk(xiao kun)
38e907584a
[ISSUE #5807]Add unit tests for package com.alibaba.nacos.client.utils in nacos (#6136) 
* add more ut for package c.a.nacos.client.utils

* fix ParamUtilTest

* add more ut for package c.a.nacos.client.utils

* fix ParamUtilTest

* fix test

* fix ut
 2021-06-28 09:55:10 +08:00
shalk(xiao kun)
9e516839ed
[ISSUE #5806]Add unit tests for package com.alibaba.nacos.client.logging in nacos (#6137) 
* add ut for package c.a.nacos.client.logging

* fix Log4J2NacosLoggingTest
 2021-06-25 18:00:06 +08:00
杨翊 SionYang
0d3bf616e6
[ISSUE#5976] Fail CI directly if UT can't pass. (#6106) 
* For #5976. fail CI directly if UT can't pass.

For #5976. fail CI directly if UT can't pass.

For #5976. fail CI directly if UT can't pass.

* For #5976. fail CI directly if UT can't pass.
 2021-06-18 17:49:51 +08:00
brotherlu-xcq
b97644109d
[fix-#5845] remove the unused codes (#6096) 2021-06-17 19:18:14 +08:00
孙继峰
fb3e5ad290
simplify Assert (#6095) 2021-06-17 19:17:37 +08:00
realJackSun
467154833b
[#5984] Fix unit tests in nacos-client (#5998) 2021-06-16 10:21:15 +08:00
nov.lzf
f802b223d5
concurrent sync flag fix (#6049) 
* concurrent sync flag fix

* fix check style
 2021-06-16 10:18:31 +08:00
brotherlu-xcq
6c8bbf29a1
[FOR 5771 utils] improve the code quality of nacos-client. (#6006) 
* [code quality] [nacos-client] [utils] simple the judge logic, constant export

* the constants re-use
 2021-06-15 13:53:04 +08:00
Pixy Yuan
0d63616a29
[ISSUE #6019] Support fetching server list from endpoint with namespace. (#6020) 2021-06-09 16:41:31 +08:00
杨翊 SionYang
13fe9a84c7
Add/Remove cache before call server. (#6015) 2021-06-09 14:52:18 +08:00
brotherlu-xcq
79be070e1b
[code quality] [nacos-client] [naming] simple the judge logic, constant export (#6009) 2021-06-09 10:17:45 +08:00
brotherlu-xcq
bec96c1f19
[code quality] [nacos-client] [identity] simple the judge logic, constant export, chinese javadoc translate (#6005) 2021-06-09 09:56:55 +08:00
brotherlu-xcq
1daa598902
[FOR 5771 config impl] improve the code quality of nacos-client. (#5980) 
* [code quality] [nacos-client] [common/filter/http] simple the judge logic, constant export, chinese javadoc translate

* [code quality] [nacos-client] [impl] remove unused import

* [code quality] [nacos-client] [impl] fix CI problem
 2021-06-09 09:46:07 +08:00
brotherlu-xcq
32b20c906f
[code quality] [nacos-client] [utils] simple the judge logic, constant export, chinese javadoc translate (#5981) 2021-06-08 10:19:08 +08:00
brotherlu-xcq
23bd92b36f
[FOR 5771 config common/filter/http] improve the code quality of nacos-client. (#5979) 
* [code quality] [nacos-client] [common/filter/http] simple the judge logic, constant export, chinese javadoc translate

* [code quality] [nacos-client] [common/filter/http] remove unused import
 2021-06-08 09:53:45 +08:00
Pixy Yuan
4cbc6a4960
[ISSUE #5952] Feature make naming rpc client aware of server list change (#5974) 
* [ISSUE #5952] Optimize rpcClient creation lock.

* [ISSUE #5952] Make naming rpc client aware of server list change.
 2021-06-07 20:07:39 +08:00
nov.lzf
de6a4b803d
client aware server list change (#5952) 2021-06-04 19:34:38 +08:00
nov.lzf
55c6f44413
fix query sla multi connection model ;add rpc client error log; optimize client shutdown (#5949) 
* fix multi connection model ,query sla

* add rpc client error log

* optimize client shutdown

* optimize client log
 2021-06-04 15:27:32 +08:00
shalk(xiao kun)
0e4d13e789
[ISSUS #5804]add unit test for c.a.n.client.security (#5925) 
* wip

* add unit test for c.a.n.client.security

* remove file
 2021-06-04 09:42:39 +08:00
nov.lzf
3dc1a8cd96
fix ak sk and some tiny optimize (#5937) 
* fix ak bug.

* fix ak bug.

* revert version
 2021-06-04 09:41:40 +08:00
shalk(xiao kun)
7e11dcb916
[ISSUS #5805]add unit test for c.a.n.client.identify (#5916) 
* wip

* add unit test for c.a.n.client.identify
 2021-06-03 09:55:46 +08:00
mask
e2909b0796
[ISSUE #4208] Fix bug when configuring multiple ips. (#5891) 
* [ISSUE #4208] Fix bug when configuring multiple ips.

* [ISSUE #4208] Fix bug when configuring multiple ips.

* Format the code.

* Add unit test.
 2021-05-31 09:58:05 +08:00
孙继峰
15c71831e7
[ISSUE #5765] fix localhost not match ip (#5852) 
* rename IPUitl to InternetAddressUtil

* move isDomain to InternetAddressUtil

* [ISSUE #5765] fix localhost not match ip

* fix typo

* delete the verification IP, follow the single responsibility principle
 2021-05-27 19:01:39 +08:00
xiaoheng1
9cc023ed29
fix #5850 Modify the comment in CacheData to English (#5851) 2021-05-26 10:12:28 +08:00
xiaoheng1
ee621be74a
fix #5826 Optimize SecurityProxy code (#5828) 2021-05-25 09:36:07 +08:00
杨翊 SionYang
3d8b2c0b17
For #5831, Remove the sets in connection event lister (#5832) 2021-05-24 20:38:34 +08:00
liaozan
f5f03ac552
fix ConfigRequest.getType (#5760) 
* Update ConfigRequest.java

* Update ConfigRequestTest.java
 2021-05-18 09:32:57 +08:00
plusmancn
0cf05943c6
feat: support of specifying NAMING_CACHE_REGISTRY_DIR property (Nacos V2) (#5758) 2021-05-17 20:21:05 +08:00
KomachiSion
cf5a171ac5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	NOTICE
#	api/pom.xml
#	common/src/main/java/com/alibaba/nacos/common/notify/DefaultPublisher.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
#	naming/src/test/java/com/alibaba/nacos/naming/consistency/persistent/impl/NamingSnapshotOperationTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	naming/src/test/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTaskTest.java
#	pom.xml
#	test/src/test/java/com/alibaba/nacos/test/core/JacksonUtils.java
 2021-05-14 11:04:52 +08:00
shalk(xiao kun)
c8ad434ba9
[ISSUE #5155] Add unit tests for package com.alibaba.nacos.client.naming.remote in nacos 2.0 (#5679) 
* wip: add NacosNamingMaintainServiceTest

* wip

* add  NacosNamingServiceTest
 2021-05-12 14:44:59 +08:00
xiaoheng1
42ab4b0d71
Optimize ConfigRequest and ConfigResponse code, extract common constants (#5548) 
* fix 5547 Optimize ConfigRequest and ConfigResponse code, extract common constants

* modify Contants to ConfigConstants

* add summary javadoc
 2021-05-10 10:49:56 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +08:00
xiaoheng1
9fb0ec3b79
fix #5536 add configFilterChain test case (#5539) 2021-04-30 17:39:58 +08:00
xiaoheng1
56d3f3cc74
fix #5527 Optimize ParamUtil code and extract constants (#5528) 2021-04-29 19:10:42 +08:00
shalk(xiao kun)
ef15888658
[ISSUE #5153] Add unit tests for package com.alibaba.nacos.client.naming.remote in nacos 2.0 (#5518) 2021-04-29 18:58:34 +08:00
KomachiSion
ba676e01b8 Shade guava class after guava upgrade 2021-04-27 20:52:45 +08:00
KomachiSion
6609b14d53 Fix CI 2021-04-27 18:56:48 +08:00
KomachiSion
2847373fd0 Solve conflict 2021-04-27 16:19:56 +08:00
KomachiSion
92da848375 Merge remote-tracking branch 'upstream/develop' into merge-1.X-to-2.0 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/PushReceiver.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/core/SubscribeManager.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/SubscribeManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/BaseTest.java
 2021-04-27 15:57:24 +08:00
Robert LU
f336283a18
[ISSUE #5367]SPI IConfigFilter (#5474) 2021-04-26 15:49:25 +08:00
杨翊 SionYang
267d67190b
Some enhancement for logs and ability. (#5482) 2021-04-25 13:08:24 +08:00
brothelul
2f82f070fe
[ISSUE #5190]remove the unnecessary catch in the login method (#5456) 
* remove the unnecessary catch in the login method

* catch the throwable error when login and print the message
 2021-04-23 19:12:52 +08:00
杨翊 SionYang
6c064bfe41
For #5171, Fix all IT case (#5464) 2021-04-23 18:36:02 +08:00
张志勇
103e671d90
Support specified naming UDP push port for client (#5439) 
* Nacos client within docker container could not receive service changes via udp

* change code style
 2021-04-22 15:10:04 +08:00
Robert LU
024f73866a
[ISSUE #5429]fix spi (#5429) 2021-04-21 13:44:24 +08:00
Robert LU
df681900f0
[ISSUE #5367]SPI IConfigFilter (#5369) 
Co-authored-by: lidaoyang <lidaoyang@hotmail.com>

Co-authored-by: lidaoyang <lidaoyang@hotmail.com>
 2021-04-20 19:14:48 +08:00
brothelul
5e455af2a2
add the InterruptedException catch (#5416) 2021-04-20 16:39:29 +08:00
haoyann
f217246c48
[ISSUE #5291]Enhancement BeatTask always execute (#5410) 
* enhancement BeatTask always execute

* revert useless modify
 2021-04-20 10:36:36 +08:00
杨翊 SionYang
73eea9c0bb
Use ThreadUtil and EnvUtil replace Runtime.availableProcessor (#5388) 2021-04-16 17:32:14 +08:00
KomachiSion
77990982ef Solve Conflict 2021-04-13 14:44:21 +08:00
KomachiSion
51cc2b1b4b Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/test/java/com/alibaba/nacos/client/config/common/GroupKeyTest.java
#	common/src/test/resources/META-INF/services/com.alibaba.nacos.common.spi.SpiTestInterface
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigServletInner.java
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
#	istio/src/main/java/com/alibaba/nacos/istio/mcp/NacosMcpService.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ApiController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2021-04-13 14:28:30 +08:00
Wu Zhiguo
9bcb901174
Fix some typo (#5260) 
* fix some typo

* rollback some comment format
 2021-04-03 12:57:57 +08:00
shalk(xiao kun)
51a3cf9fe7
clean some inner method is never used (#5125) 2021-03-31 13:59:25 +08:00
shalk(xiao kun)
41b08c8b53
fix publishConfig lost type (#5186) 2021-03-31 13:48:26 +08:00
shalk(xiao kun)
975985ecc4
[ISSUE #5151] add ut for package c.a.nacos.client.naming.core (#5193) 
* add ut for package c.a.nacos.client.naming.core

* fix

* fix shutdown

* fix import
 2021-03-30 10:17:56 +08:00
shalk(xiao kun)
85c7d4e518
add ut for c.a.nacos.client.naming.utils in nacos 2.0 (#5230) 2021-03-30 10:16:09 +08:00
shalk(xiao kun)
712774f31b
remove unused utils; use threadlocalrandom from jdk since 1.7 (#5231) 2021-03-30 10:15:06 +08:00
shalk(xiao kun)
6d500c92ab
check group and dataId in groupKey (#5100) 2021-03-29 15:23:55 +08:00
shalk(xiao kun)
ebc64d2042
add ut for c.a.nacos.client.naming.event in nacos 2.0 (#5192) 2021-03-29 10:48:06 +08:00
杨翊 SionYang
46c9a96ec5
Fix #5178, Fix NPE when init server list failed. (#5188) 2021-03-26 09:36:20 +08:00
shalk(xiao kun)
2798aa90a1
add ut for c.a.nacos.client.naming.cache in nacos 2.0 (#5165) 2021-03-23 09:23:47 +08:00
shalk(xiao kun)
dee919ace9
add ut for package c.a.nacos.client.naming.backups (#5157) 2021-03-22 09:54:27 +08:00
shalk(xiao kun)
9afdd430bb
add ut for package c.a.nacos.client.naming.beat (#5156) 2021-03-22 09:53:50 +08:00
KomachiSion
5c7c108b65 Solve conflict 2021-03-18 13:38:07 +08:00
KomachiSion
6cda5ad55a Merge remote-tracking branch 'upstream/develop' into develop-merge-to-2.0 
# Conflicts:
#	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/config/impl/YmlChangeParserTest.java
#	common/src/main/java/com/alibaba/nacos/common/http/param/Header.java
#	common/src/main/java/com/alibaba/nacos/common/utils/ConcurrentHashSet.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	console/src/main/resources/static/js/main.js
#	core/src/main/java/com/alibaba/nacos/core/cluster/ServerMemberManager.java
#	core/src/main/java/com/alibaba/nacos/core/utils/Loggers.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckReactor.java
#	pom.xml
 2021-03-18 12:08:45 +08:00
shalk(xiao kun)
d8e54453a6
add ut for c.a.nacos.client.config (#5118) 2021-03-17 09:35:25 +08:00
shalk(xiao kun)
5b99b7d4eb
[ISSUE #5034] add ut for package com.alibaba.nacos.client.config.http (#5048) 
* add ut for package com.alibaba.nacos.client.config.http

* remove ut doc

* remove http request case
 2021-03-15 09:49:53 +08:00
shalk(xiao kun)
6d8440fd11
add ut for package com.alibaba.nacos.client.config.impl (#5104) 2021-03-15 09:28:30 +08:00
shalk(xiao kun)
711afc7bac
[ISSUE #5037]add ut for package com.alibaba.nacos.client.config.utils (#5050) 
* add ut for package com.alibaba.nacos.client.config.utils

* fix ut checkstyle
 2021-03-11 19:51:26 +08:00
shalk(xiao kun)
3a89725e28
[ISSUE #5036]add ut for com.alibaba.nacos.client.config.listener (#5049) 
* add ut for com.alibaba.nacos.client.config.listener

* remove ut doc
 2021-03-11 19:49:43 +08:00
shalk(xiao kun)
e7803d1c44
[ISSUE #5032] add ut for package com.alibaba.nacos.client.config.filter (#5046) 
* add ut for package com.alibaba.nacos.client.config.filter

* remove ut doc
 2021-03-11 19:43:51 +08:00
shalk(xiao kun)
3dd7915aa6
fix MetricsHttpAgent metrics twice (#5029) 2021-03-10 11:24:03 +08:00
nov.lzf
5247548e86
shade client and using remote ip from header (#5068) 
* shade client

* shade client

* fix default cluster port

* rollback client ip

* using remote ip from header

* using remote ip from header

* using remote ip from header
 2021-03-10 11:18:37 +08:00
shalk(xiao kun)
015a114822
add ut for package com.alibaba.nacos.client.config.common (#5045) 2021-03-09 18:05:27 +08:00
haoyann
2972d4f22f
fix UpdateTask some logic errors (#5041) 2021-03-08 10:03:26 +08:00
shalk(xiao kun)
63f7e337d9
fix TemplateUtils usage (#5010) 2021-03-05 09:33:53 +08:00
shalk(xiao kun)
f5a5fce4e1
Log4J2NacosLogging.loadConfiguration() return directly When location is blank (#4980) 2021-03-02 18:10:13 +08:00
nov.lzf
86b89842bb
compatible with the reflection logic of Dubbo 2.7.X (#4977) 2021-03-01 12:48:40 +08:00
杨翊 SionYang
8dfaabdaf3
Fix getSpasHeaders serviceName exception (#4883) 2021-02-05 11:13:48 +08:00
杨翊 SionYang
3a82d5d987
Add some enhancements (#4881) 
* Add some enhancements

* Add tps monitor for naming push

* Add some enhancement for client
 2021-02-05 10:15:31 +08:00
JackSun-Developer
c455a900d9
[ISSUE #3876] [NA] failed to update serviceName: DEFAULT_GROUP@@prod-zipkin (#4866) 2021-02-04 11:46:48 +08:00
nov.lzf
c272d78890
add client sign header and nacos default port；sync code with diamnd over nacos 2.0 (#4857) 
* add client sign header and nacos default port

* sync code with diamnd over nacos 2.0

* pmd and check style
 2021-02-02 17:31:01 +08:00
nov.lzf
d5af830d52
remove config resync request and add getting cluster metrics (#4846) 
* from diamond over nacos  2.0

* config notify task type bugfix

* keep consistent  with diamond over nacos 2.0

* remove config resync  request and add getting cluster metrics

* add using address server to look up interface

* add using address server to look up interface
 2021-02-01 13:33:56 +08:00
杨翊 SionYang
c275fc310e
Fix #4788, Fix client id judgement error for ipv6 (#4815) 2021-01-28 12:03:08 +08:00
shalk(xiao kun)
d4d245f2cc
make SecurityProxy.accessToken threadsafe in single writer multi reader (#4778) 2021-01-26 19:37:27 +08:00
nov.lzf
3cfa183400
convert payload type from full name to simple name;abilities both on client-server& server cluster submit (#4791) 
* convert payload type from full name  to simple name.

* abilities both on client-server& server cluster submit

* Cas of update config, beta,tag publish

* tenant support on connection.

* modify health check tps point name
 2021-01-25 14:11:35 +08:00
nov.lzf
7e58b5cb7b
fuzzy match support of tps control;remove http transport of client worker ; add internal executors of CacheData notifier (#4783) 
* keepalive time adjust

* fuzzy match support of tps control;remove http transport of client worker ; add internal executors of CacheData notifier
 2021-01-22 18:34:37 +08:00
nov.lzf
c4ffbab21f
connection manager ,active send interval increase (#4776) 
* connection manager ,active send interval increase

* adjust sync all interval
 2021-01-21 20:47:23 +08:00
杨翊 SionYang
a67f6b5854
Use SafeConstructor to parse yaml configuration for AbstractConfigChangeListener (#4753) 2021-01-20 11:13:31 +08:00
nov.lzf
91bf227c4a
tps control submit; connection rule (#4752) 
* tps reporter submit

* tps reporter submit

* log optimize; listen concurrent bugfix; async request exception fix

* server loader bugfix;increase keep alive default time

* tps report bugfix, tps log bugfix;

* rpc server push ack notify bugfix.

* change rule store dir ;add local file change event of connection rule.

* remove client side request meta; reduce client parameters

* 简化冗余代码

* 优化异常日志

* md5 sync bugfix

* client metrics submit; tps monitor ip list support

* client metrics submit; tps monitor ip list support
 2021-01-20 09:21:40 +08:00
杨翊 SionYang
7b85f4078c
Refactor naming client proxy to support auth (#4736) 2021-01-18 20:44:36 +08:00
KomachiSion
fd06b5a7b6 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	address/pom.xml
#	api/pom.xml
#	auth/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	consistency/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	istio/pom.xml
#	naming/pom.xml
#	pom.xml
#	sys/pom.xml
#	test/pom.xml
 2021-01-18 10:32:57 +08:00
杨翊 SionYang
1bd67269cd
Use revision to set version and upgrade to 1.4.2-SNAPSHOT (#4711) 
* Use revision set version

* Use revision set version

* Add flatten plugin
 2021-01-15 14:37:47 +08:00
杨翊 SionYang
67eb36976e
Upgrade to 1.4.1 (#4695) 2021-01-14 11:36:57 +08:00
KomachiSion
4899a7290f Solve conflict from develop 2021-01-13 19:31:54 +08:00