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

911 Commits

Author SHA1 Message Date
MajorHe1
5665cfe072
[ISSUE #7966] modify returned msg in Auth/Distro/Curcuit-Filter when internal server error (#7967) 
* [ISSUE #7966] modify returned msg in Auth/Distro/Curcuit-Filter when internal server error

* [ISSUE #7966] add log output instead of return stacktrace
 2022-03-28 10:22:55 +08:00
Oliver
5a8c088a2f
remove unused variety and define constant (#8010) 
* remove unused variety and define constant

* fix spelling error
 2022-03-28 10:18:56 +08:00
chenhao26
b4cc3fcddb
Optimize HTTP constants (#7998) 
* Optimize HTTP constants

* check nacos style

* check nacos style2

* check nacos style3

* deleet Unused constants in UtilAndComs
 2022-03-25 16:05:42 +08:00
myifeng
6aa867337e
[ISSUE #7941] FIX: Missing parameters 'dataId' and 'group'. (#7964) 
* [ISSUE #7941] FIX: Missing parameters 'dataId' and 'group'.

* check tenant.
 2022-03-24 09:50:44 +08:00
onewe
4a7d875eca remove duplicate import 2022-03-22 09:07:29 +08:00
onewe
9110dd8aa9
Merge branch 'develop' into optimize/config-2 2022-03-22 08:58:19 +08:00
李晓双 Li Xiao Shuang
f93813b38d
配置接口兼容解密 (#7949) 2022-03-21 15:17:35 +08:00
onewe
97deaae995
remove unused import 2022-03-19 13:36:14 +08:00
onewe
c69339fd0d
Merge branch 'develop' into optimize/config-2 2022-03-19 13:31:28 +08:00
chaos
37a1083e58 fix ConfigSubService memberManager null 2022-03-16 18:31:48 +08:00
李晓双 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
chenhao26
9543b6b613
add junit test for RpcConfigChangeNotifier (#7884) 2022-03-04 16:22:19 +08:00
胡俊
f8e83e4a12
[ISSUE#5092]Config change batch listen request handler test (#7800) 
* add ConfigChangeBatchListenRequestHandlerTest

* style

* style
 2022-03-03 13:59:50 +08:00
MajorHe1
47f0c36235
[ISSUE #5092] add unit test for ExternalDataSourceServiceImpl (#7834) 
* [ISSUE #5092] add unit test for ExternalDataSourceServiceImpl

* [ISSUE #5092] delete line about ExternalDataSourceServiceImplTest to make ci re-run
 2022-03-03 13:59:19 +08:00
MajorHe1
29bb690abc
[ISSUE #5092] add test for LocalDataSourceServiceImpl (#7835) 
* [ISSUE #5092] add test for LocalDataSourceServiceImpl

* [ISSUE #5092] delete line about LocalDataSourceServiceImpl to test cla check
 2022-03-03 13:59:04 +08:00
胡俊
f8cc85d6a8
add ConfigChangeListenContextTest (#7847) 2022-03-03 13:58:29 +08:00
胡俊
1ecdee3a26
add InternalConfigChangeNotifierTest (#7852) 2022-03-03 13:58:09 +08:00
李晓双 Li Xiao Shuang
21c48dd0cf
Merge pull request #7848 from hujun-w-2/add_ConfigQueryGroupParserTest 
[ISSUE#5092]ConfigQueryGroupParserTest
 2022-03-02 15:04:33 +08:00
李晓双 Li Xiao Shuang
81d1dc7d6e
Merge pull request #7849 from hujun-w-2/ConfigPublishGroupParserTest 
[ISSUE#5092]ConfigPublishGroupParserTest
 2022-03-02 15:01:20 +08:00
李晓双 Li Xiao Shuang
c34fc09b2a
Merge pull request #7851 from hujun-w-2/ConfigRemoveRequestHandlerTest 
[ISSUE#5092]add ConfigRemoveRequestHandlerTest
 2022-03-01 10:05:06 +08:00
hujun3
3e1f00362c add ConfigRemoveRequestHandlerTest 2022-02-26 14:28:46 +08:00
hujun3
b553dac47e add ConfigRemoveRequestHandlerTest 2022-02-26 14:25:19 +08:00
hujun3
d4c499aec5 add ConfigQueryGroupKeyParserTest 2022-02-26 13:35:35 +08:00
hujun3
9c805fd4f3 ConfigPublishGroupParserTest 2022-02-26 13:30:04 +08:00
hujun3
92964a66db ConfigQueryGroupParserTest 2022-02-26 13:21:50 +08:00
MajorHe1
c5c72ab874
[ISSUE #5092] add unit test for TenantCapacityPersistService (#7826) 2022-02-24 14:22:11 +08:00
MajorHe1
4a3dec75f4 [ISSUE #5092] add unit test for DynamicDataSourceTest 2022-02-23 20:58:12 +08:00
胡俊
bcf2951ac1
fix his_config query (#7763) 2022-02-23 16:48:56 +08:00
MajorHe1
46cb3c8d6e
[ISSUE #5092] add unit test for GroupCapacityPersistService (#7819) 2022-02-23 09:45:43 +08:00
胡俊
b695036c88
add ConfigPublishGroupKeyParserTest (#7820) 2022-02-23 09:44:54 +08:00
hujun3
f8e2e87b58 add ConfigChangeClusterSyncRequestHandlerTest 2022-02-22 20:21:37 +08:00
MajorHe1
ade162c4be
[ISSUE #7593] judge whether file exists in disk (#7677) 2022-02-21 18:33:16 +08:00
chaos
d1d451f3a2 format code style 2022-02-09 16:01:29 +08:00
chaos
af34095b3e Delete redundant code 2022-02-09 15:09:58 +08:00
chaos
48a7af4610 Delete redundant code 2022-02-09 15:07:58 +08:00
onewe
3f31ac08aa [Optimize] Optimize some code of config controller 
- Remove unnecessary annotation `Autowired`
- Replace with <>
- Remove unnecessary init statement
- Change injection method from field injection to constructor injection
- Remove unnecessary bool string
- Remove unnecessary judgment statement
 2022-02-09 14:35:50 +08:00
onewe
2afad2a22f
[Optimize] Optimize some code (#7736) 
- Remove unnecessary annotation `Autowired`
- Replace with <>
- Remove unnecessary judgment statement
- Remove unnecessary init statement
- Remove unnecessary exception declaration statement
 2022-02-09 10:36:59 +08:00
Roger3581321
939e381d36
Strengthening the code (#7729) 2022-02-08 09:53:23 +08:00
杨翊 SionYang
6a6f32ce6d
Merge pull request #7732 from alibaba/summer2021_issue#5696 
[ISSUE#5696] Add the authentication plugin
 2022-02-07 10:30:53 +08:00
杨翊 SionYang
f654026d69 Revert "[ISSUE#5696] Add the authentication plugin (#7712)" 
This reverts commit 97c7b9b849.
 2022-01-28 18:01:52 +08:00
杨翊 SionYang
97c7b9b849
[ISSUE#5696] Add the authentication plugin (#7712) 
* [ISSUE#5696] Add auth plugin interface. (#6593)

* define plugin

* add User model

* add authContext

* add SPI

* add resource, modify request, reformat code

* copyright, Serverloader, IdentityContext

* add unit test

* modify ClassLoader, and delete GrantType

* delete redundancy code

* remove authservice default name

* Change to StringUtils

* Add auth client: plugin and implement (#6883)

* Revise Auth server plugin (#6890)

* [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

* [ISSUE #5696] Add auth server implement (#6901)

* Add auth server implement.

* Modify auth server: class name

* Add MySQL DataBase (#6968)

* add derby database (#6996)

* [ISSUE#5696] Fix auth server type (#7004)

* Add MySQL DataBase

* Add Derby Database

* Replace Auth Server

* Revise: change to AuthSystemType

* [ISSUE#5696] repackage client (#7029)

* Rename and move classes make them more readable.

* Rename and move test classes.

* [ISSUE#5696] Add Ram client auth service impl. (#7036)

* Add Resource abstract.

* Add Ram client auth service impl.

* [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.

* [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.

* For PMD.

* For PMD and copyright.

* Fix ram type plugin not login for config module.

* [ISSUE #7114] Enhance the constants for auth module. (#7170)

- Create a Constants.java
- Move all the string literal to the Constants.java
- Delete the PropertiesConstant.java

* [ISSUE#5696] revert nacos server plugin implementation moved operation (#7636)

* Revert "[ISSUE#5696] Fix auth server type (#7004)"

This reverts commit e3b7f0e7

* Revert "add derby database (#6996)"

This reverts commit fea9d727

* Revert "Add MySQL DataBase (#6968)"

This reverts commit 3c0508d2

* Revert "[ISSUE #5696] Add auth server implement (#6901)"

This reverts commit 76ac8434

* Move JwtAuthenticationTokenFilter to security package.

* refactor constants about auth.

* Solve conflicts.

* Add resource parser

* Do some refactor for IdentityContextBuilder

* Repackage some auth classes.

* For checkstyle

* Add SignType

* Add MockAuthPluginService for unit test.

* Add new ProtocolAuthService to replace AuthManager.

* Http request use new plugin.

* Http request use new plugin.

* Grpc request use new plugin.

* Remove AuthManager.java

* Add plugin and auth-plugin module, and move class into module.

* Move client spi to nacos-auth-plugin module

* Remove NamingResourceParser.java

* Remove ConfigResourceParser.java

* remove unused parseName in ResourceParser

* Use specified parser to parse resource when can't find parser by type.

* Repackage some class

* Move default auth impl from console to nacos-plugin-default-impl module.

* Move user controller to nacos-plugin-default-impl module.

* Move auth persistence to nacos-plugin-default-impl module.

* Move user to nacos-plugin-default-impl module.

* Move plugin config to nacos-auth-plugin-impl module.

* Remove unused constants

* Fix compile problem.

* For pmd.

* Fix unit test.

Co-authored-by: Wuyunfan-BUPT <30968107+Wuyunfan-BUPT@users.noreply.github.com>
Co-authored-by: onewe <admin@onew.me>
 2022-01-28 17:26:42 +08:00
KomachiSion
aba0facf90 Move user to nacos-plugin-default-impl module. 2022-01-26 10:05:39 +08:00
KomachiSion
1e2f938f7b Move auth persistence to nacos-plugin-default-impl module. 2022-01-25 16:01:44 +08:00
胡俊
5dd094e9a8
请求参数srcUser不起作用 (#7702) 2022-01-24 14:10:53 +08:00
KomachiSion
79ef816277 Remove ConfigResourceParser.java 2022-01-21 16:47:51 +08:00
KomachiSion
89cc6caade Add plugin and auth-plugin module, and move class into module. 2022-01-21 15:06:09 +08:00
KomachiSion
be9516d037 Remove AuthManager.java 2022-01-21 13:49:30 +08:00
KomachiSion
79e7a95e62 Add SignType 2022-01-17 17:15:42 +08:00
KomachiSion
dc1c05d2dc Repackage some auth classes. 2022-01-17 16:32:23 +08:00
KomachiSion
956df153d6 Add resource parser 2022-01-14 16:52:21 +08:00
胡俊
b90051448f
[ISSUE#7519] Optimize configuration history deletion logic (#7531) 
* remove config history .for#7519

* remove config history .for#7519

* remove config history .for#7519

* update style
 2022-01-14 15:55:50 +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
杨翊 SionYang
b7910a6219
[ISSUE#5696] revert nacos server plugin implementation moved operation (#7636) 
* Revert "[ISSUE#5696] Fix auth server type (#7004)"

This reverts commit e3b7f0e7

* Revert "add derby database (#6996)"

This reverts commit fea9d727

* Revert "Add MySQL DataBase (#6968)"

This reverts commit 3c0508d2

* Revert "[ISSUE #5696] Add auth server implement (#6901)"

This reverts commit 76ac8434

* Move JwtAuthenticationTokenFilter to security package.

* refactor constants about auth.
 2022-01-12 16:45:18 +08:00
onewe
825227ff49
[ISSUE #7623] Optimize the AggrWhitelistTest (#7624) 
* [ISSUE #7623] Optimize the AggrWhitelistTest

Close #7623

* [ISSUE #7623] Remove unnecessary code
 2022-01-12 11:14:35 +08:00
onewe
a6e74dd06a
[ISSUE #7627] Remove unnecessary Service annotation (#7628) 2022-01-12 11:12:59 +08:00
李晓双 Li Xiao Shuang
27ed668695
Strengthen the code (#7511) 2022-01-07 18:09:55 +08:00
guozhongkui
fd01d3614d
Update TraceLogUtilTest.java 2021-12-23 10:54:06 +08:00
guozhongkui
3975975c21 [ISSUE #5092] add unit test for TraceLogUtilTest in util 2021-12-23 10:16:45 +08:00
李晓双 Li Xiao Shuang
79ca04a737
Merge pull request #7369 from MajorHe1/add_unit_test_for_util_phase8 
[ISSUE #5092] add unit test for SystemConfig/TimeoutUtils/UrlAnalysis…
 2021-12-22 15:40:47 +08:00
MajorHe1
9c5307a99c [ISSUE #5092] update unit test for TimeUtils in util. 2021-12-22 14:59:05 +08:00
李晓双 Li Xiao Shuang
701f3fd93d
Merge pull request #7381 from MajorHe1/add_unit_test_for_util_phase9 
[ISSUE #5092] add unit test for ConfigExecutor in util.
 2021-12-22 11:47:19 +08:00
李晓双 Li Xiao Shuang
a2c807e5ce
Merge pull request #7370 from onewe/unittest/MD5UtilTest#getClientMd5Map 
[ISSUE #5092] add unit test for the MD5UtilTest#getClientMd5Map
 2021-12-22 11:20:27 +08:00
李晓双 Li Xiao Shuang
3eb168c6aa
Merge pull request #7365 from MajorHe1/add_unti_test_for_util_phase6 
[ISSUE #5092] add unit test for SimpleCache/SimpleFlowData/SimpleIpFl…
 2021-12-22 11:16:56 +08:00
MajorHe1
e5da9be27f
[ISSUE #5092] add unit test for Request/Response/RegexParser in util (#7350) 2021-12-21 12:50:37 +08:00
MajorHe1
f3e8d22b54
[ISSUE #5092] add unit test for CapacityService in service. (#7430) 2021-12-21 12:50:02 +08:00
MajorHe1
2b8f18a112
[ISSUE #5092] add unit test for SimpleReadWriteLock in util, add zero judgement when release read lock. (#7366) 2021-12-21 12:49:39 +08:00
MajorHe1
37cb76433a [ISSUE #5092] add unit test for ConfigExecutor in util. 2021-12-08 15:34:24 +08:00
onewe
9814bac80f [ISSUE #5092] add unit test for the MD5UtilTest#getClientMd5Map 2021-12-07 09:09:28 +08:00
MajorHe1
de46f8045f [ISSUE #5092] add unit test for SystemConfig/TimeoutUtils/UrlAnalysisUtils/ZipUtils in util. 2021-12-06 21:51:33 +08:00
MajorHe1
dd51e9b4b1 [ISSUE #5092] add unit test for SimpleCache/SimpleFlowData/SimpleIpFlowData in util 2021-12-06 16:18:11 +08:00
hujun
972e18fe0f Add unit tests for class ConfigPublishRequestHandlerTest in nacos 2.0 2021-12-05 16:14:20 +08:00
hujun
e93f97fd17 Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-05 00:04:59 +08:00
hujun
ce3edbc098 Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 23:55:46 +08:00
hujun
2d02118391 Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 23:52:37 +08:00
hujun
d0fee765d5 Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 23:51:42 +08:00
hujun
b6a733f6ce Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 23:34:55 +08:00
hujun
1665f3ee6e Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 19:58:56 +08:00
hujun
f5ad8c83ca Add unit tests for class ConfigQueryRequestHandler in nacos 2.0 2021-12-04 19:18:46 +08:00
MajorHe1
7123fedcd6
[ISSUE #5092] format unit test for utils about param\property\protocol in nacos-config (#7278) 2021-11-29 10:06:57 +08:00
MajorHe1
a0543adafc
[ISSUE #5092] add unit test for utils in nacos-config (#7251) 2021-11-24 11:19:33 +08:00
rui.zhang
d05dff5139
fix: 在请求中保存用户信息到 httpsession 修复issue:#7141 (#7252) 2021-11-24 11:18:50 +08:00
MajorHe1
33427e83bf
[ISSUE #5092] add unit test for DiskUtils in nacos-config (#7263) 2021-11-24 11:07:32 +08:00
MajorHe1
6743fe6931
[ISSUE #5092] add unit test for utils about group\log\MD5 in nacos-co… (#7271) 
* [ISSUE #5092] add unit test for utils about group\log\MD5 in nacos-config

* [ISSUE #5092] format unit test for utils about group\log\MD5 in nacos-config
 2021-11-24 11:06:48 +08:00
MajorHe1
21ebf4c8ee
[ISSUE #5092] uniform name of HealthController to HealthControllerTest in nacos-config (#7201) 2021-11-16 11:23:36 +08:00
MajorHe1
604034d4d8
[ISSUE #5092] add unit test for ConfigServletInner in nacos-config (#7206) 
* [ISSUE #5092] add unit test for ConfigServletInner in nacos-config

* [ISSUE #5092] update ConfigServletInnerTest in nacos-config
 2021-11-16 11:16:32 +08:00
MajorHe1
9e1b094985
[ISSUE #5092] add unit tests for ConfigOpsController in nacos-config (#7198) 2021-11-12 10:55:38 +08:00
MajorHe1
4fdba5f902
[ISSUE #5092] add unit tests for HistoryController in nacos-config (#7199) 2021-11-12 10:55:24 +08:00
MajorHe1
8016eb7003
[ISSUE #5092] add unit tests for ListenerController in nacos-config (#7200) 2021-11-12 10:55:09 +08:00
MajorHe1
cc568a6ee9
[ISSUE #5092] add unit tests for ConfigController in nacos-config (#7186) 2021-11-08 09:52:52 +08:00
onewe
ef5bb0a83d
[ISSUE #7114] Enhance the constants for auth module. (#7170) 
- Create a Constants.java
- Move all the string literal to the Constants.java
- Delete the PropertiesConstant.java
 2021-11-04 09:57:17 +08:00
MajorHe1
d6b18120d2
[ISSUE #5092] add unit tests for CapacityController in nacos-config (#7140) 2021-11-03 10:21:58 +08:00
MajorHe1
e6ebad22d9
[ISSUE #5092] add unit tests for ClientMetricsController in nacos-config (#7143) 2021-11-03 10:21:27 +08:00
MajorHe1
093534c492
[ISSUE #5092] add unit tests for CommunicationController in nacos-config (#7144) 2021-11-03 10:21:09 +08:00
MajorHe1
70f7c5674e
[ISSUE #5092] add unit tests for configuration in nacos-config (#7135) 2021-10-28 10:13:31 +08:00
MajorHe1
ca1dfa0c94
[ISSUE #5092] add unit tests for constant in nacos-config (#7133) 
* [ISSUE #5092] add unit tests for constant in nacos-config

* [ISSUE #5092] add license for CounterModeTest.java
 2021-10-28 10:13:09 +08:00
Wuyunfan-BUPT
e3b7f0e79f
[ISSUE#5696] Fix auth server type (#7004) 
* Add MySQL DataBase

* Add Derby Database

* Replace Auth Server

* Revise: change to AuthSystemType
 2021-09-28 19:30:20 +08:00
孙继峰
c61440f32c
fix unit test fail (#6958) 2021-09-23 09:58:38 +08:00
andotorg
99e6ce9c81
support issues #6645 (#6903) 
* add ldap print error log

* update history dataId and group filter is select

* fix select add showSearch properties

* To avoid unexpected NPE

* add security annotation on controller configs method
 2021-09-17 19:28:26 +08:00
brotherlu-xcq
470b7bb37c
[ISSUE #6347] the delete his_config_info SQL modify in EmbeddedStorage. (#6574) 2021-08-06 11:10:39 +08:00
ZZQ的
ea864c8c5a
Remove pom dependency (#6561) 2021-08-05 09:35:49 +08:00
ZZQ的
c6c5cd45f1
Replace "google.common.base.Joiner" API with jdk API (#6501) 2021-08-02 10:07:08 +08:00
ZZQ的
b0f7bfbba7
replace "google.common.base.Preconditions" API with jdk API (#6502) 
* replace "google.common.base.Preconditions" API with jdk API

* delete static method import "lenitentFoment"

* add unit test
 2021-07-30 16:35:46 +08:00
ZZQ的
8282f3d617
replace "google.common.base.Stopwatch" API with jdk API (#6500) 2021-07-29 10:56:12 +08:00
ZZQ的
47c6706a63
[Reduce dependence]>[Lists] Replace "google.common.collect.*" API wit… (#6404) 
* [Reduce dependence]>[Lists] Replace "google.common.collect.*" API with jdk API

* use elements.size to init the array length

* Replace IllegalArgumentException with NullPointerException

* Refactor CollectionUtilsTest#list()

* Add exception message

* update annotation

* update unit test method name
 2021-07-27 13:47:41 +08:00
haoyann
26240022e1
fix yaml parse concurrent problem (#6423) 2021-07-22 11:04:15 +08:00
ZZQ的
12a9bfb3c8
[ISSUE #6314] Remove common-lang3 from pom.xml (#6334) 2021-07-13 09:32:15 +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
ZZQ的
b9e388bff9
[core module] replace *commons.lang3*.*Utils to com.alibaba.nacos.com… (#6288) 
* [core module] replace *commons.lang3*.*Utils to com.alibaba.nacos.common.utils.*Utils

* Use StringUtils replace jdk String method.

* Fix error logic.
 2021-07-08 15:13:34 +08:00
ZZQ的
a82a5359d6
[ISSUE #6256] [config module] replace "*commons.lang3*.*Utils" to "co… (#6265) 
* [ISSUE #6256] [config module] replace "*commons.lang3*.*Utils" to "com.alibaba.nacos.common.utils.*Utils"

* fix error logic
 2021-07-07 09:57:31 +08:00
mask
5aab4266eb
[ISSUE #6216] Unify SQL naming style. (#6239) 
* [ISSUE #6216] Unify SQL naming style.

* [ISSUE #6216] Unify SQL naming style.

* [ISSUE #6216] Unify SQL naming style.
 2021-07-05 09:53:16 +08:00
李晓双 Li Xiao Shuang
4f0900b0aa
[ISSUE #5092] Add unit tests for class ExternalUserPersistServiceImpl in nacos 2.0 (#6237) 
* add unit test for ExternalUserPersistServiceImpl

* add unit test for ExternalUserPersistServiceImpl
 2021-07-02 09:59:22 +08:00
ZZQ的
5fa6441099
[ISSUE #6216]All SQL keywords are modified to uppercase (#6233) 
* [ISSUE #6216]All SQL keywords are modified to uppercase

* "count(0)" replace to "count(*)"

* All SQL keywords are modified to uppercase
 2021-07-02 09:57:50 +08:00
孙继峰
f36556657f
[ISSUE #6197] Use java.util.Objects instead of com.alibaba.nacos.common.utils.Objects (#6218) 2021-07-01 11:32:34 +08:00
李晓双 Li Xiao Shuang
ccd674497c
add unit test for ExternalRolePersistServiceImpl (#6193) 2021-06-30 10:26:55 +08:00
李晓双 Li Xiao Shuang
95892bcd24
[ISSUE #5092] Add unit tests for class EmbeddedPermissionPersistServiceImpl in nacos 2.0 (#6183) 
* add unit test for EmbeddedPermissionPersistServiceImpl

* test() to test
 2021-06-29 15:14:28 +08:00
李晓双 Li Xiao Shuang
0b66c540bc
add unit test for EmbeddedRolePersistServiceImpl (#6192) 2021-06-29 15:12:04 +08:00
李晓双 Li Xiao Shuang
8648642f60
[ISSUE #5092] Add unit tests for class EmbeddedUserPersistServiceImpl in nacos 2.0 (#6194) 
* add unit test for EmbeddedUserPersistServiceImpl

* add unit test for EmbeddedUserPersistServiceImpl

* add unit test for EmbeddedUserPersistServiceImpl
 2021-06-29 15:11:15 +08:00
李晓双 Li Xiao Shuang
ad3b62e43c
[ISSUE #5092] Add unit tests for class ExternalPermissionPersistServiceImpl in nacos 2.0 (#6184) 
* add unit test for ExternalPermissionPersistServiceImpl

* add unit test for ExternalPermissionPersistServiceImpl
 2021-06-28 19:22:29 +08:00
brotherlu-xcq
01e3352e8e
[ISSUE #5884] add permission check to history config. (#6173) 2021-06-28 10:10:41 +08:00
realJackSun
c13f800c5b
[#5983] Fix unit tests in nacos-config (#5995) 2021-06-17 20:34:21 +08:00
Kamran Ahmed
08c26d6fae
Resolve dependency import path errors (#6070) 
* fix #3215 bug by improve code quality for client.

* Fix line indent.

* Resolve dependency import path errors

Co-authored-by: jiele.cao <jiele.cao@sinocare.com>
 2021-06-16 10:29:27 +08:00
Kamran Ahmed
4df0cd0c7c
fix #3215 bug by improve code quality for client. (#6050) 
* fix #3215 bug by improve code quality for client.

* Fix line indent.

Co-authored-by: jiele.cao <jiele.cao@sinocare.com>
 2021-06-15 14:01:18 +08:00
邪影oO
cdc2e3409a
fix #5934 (#6017) 2021-06-09 14:47:07 +08:00
Cherish 蔡
c025dc2c18
Feat resource parser group (#5889) 
* feat(#5888): ResourceParser groupName change the splicing method.

* feat(#5888): add UT for NamingResourceParser and ConfigResourceParser
 2021-06-09 09:48:18 +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
孙继峰
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
李晓双 Li Xiao Shuang
d9902175a6
constant variables (#5773) 2021-05-18 19:50:58 +08:00
brotherlu-xcq
8d927c1341
[ISSUE #5727 utils] improve the code quality of nacos-config (#5761) 
* [code quality] [nacos-config] [utils] the Chinese javadoc translate, return javadoc complete, the magic number fix, the code logic format

* [code quality] [nacos-config] [utils] fix space
 2021-05-18 09:29:02 +08:00
brotherlu-xcq
162b0ea499
[ISSUE #5727 service-1] improve the code quality of nacos-config (#5744) 
* [code quality] [nacos-config] [service-1] add change the position of variable to match common code habits , return first, reduce the if/for nest, change the Chinese javadoc to English.

* [code quality] [nacos-config] [service-1] ci problem

* [code quality] [nacos-config] [service-1] ci problem

* [code quality] [nacos-config] [service-1] indent problem fix

* [code quality] [nacos-config] [service-1] indent problem
 2021-05-18 09:25:28 +08:00
brotherlu-xcq
7b912fefe7
[ISSUE #5727 service-2] improve the code quality of nacos-config (#5752) 
* [code quality] [nacos-config] [service-2] add change the position of variable to match common code habits , add the mission @Override, remove the unnesessary judgement.

* [code quality] [nacos-config] [service-2] indent problem fix
 2021-05-17 20:18:58 +08:00
brotherlu-xcq
5f87992321
[code quality] [nacos-config] [controller] add mission @Override, return first, reduce the if/for nest. (#5732) 2021-05-17 09:53:35 +08:00
brotherlu-xcq
26bbf08f2f
[code quality] [nacos-config] [controller] translate the Chinese log to English, the if condition nest optimized, return result optimized. (#5731) 2021-05-17 09:51:54 +08:00
brotherlu-xcq
b24d97c70b
[code quality] [nacos-config] [aspect] translate the Chinese log to English (#5730) 2021-05-17 09:50:11 +08:00
brotherlu-xcq
efd5af6dcb
improve the code quality of nacos-config [auth] (#5729) 2021-05-17 09:49:35 +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
brotherlu-xcq
c756da3c88
Change the invalid compare in NotifySingleService (#5587) 
* optimize the compare in NotifySingleService.java

* delete the unused method setupNotifyExecutors
 2021-05-14 09:37:03 +08:00
xiaoheng1
5386096b1d
Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs (#5561) 
* fix #5560 Deal with the concurrency of ClientLongPolling and DataChangeTask about allSubs

* add log to default log.
 2021-05-11 15:25:39 +08:00
plusmancn
7e57b90160
[ISSUE #3548] The srcUser fills with username when auth is disabled (console case) (#5566) 
* feat: srcUser fills with username (console case)

* fix: code sytle of Constants.java

* fix: code style of the remaining files

* fix: the back button of HistoryDetail.js won't work

* fix: change '源 IP' to '来源 IP'

* fix: undo changes of goList
 2021-05-10 20:41:35 +08:00
xiaoheng1
e0a9ecb976
fix #5583 Modify the Chinese log in CapacityController (#5584) 2021-05-10 11:24:16 +08:00
孙继峰
818d37b71c
delete duplicated dependency (#5622) 2021-05-10 10:43:58 +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
brothelul
b148d4b503
fix the press F1 to full screen issue (#5505) 2021-04-27 14:07:12 +08:00
Cherish 蔡
e0fe828542
[ISSUE #5437]: change dump-task taskKey (#5440) 
* feat(fix-#5437): change dump-task taskKey

* feat(fix-#5437): Handle CI issues and add doc comments.
 2021-04-22 11:27:08 +08:00
赵延
b746b47100
when peer is null, set isOpenService = false directly. (#5428) 2021-04-21 09:33:30 +08:00
haoyann
394230309d
[ISSUE #4602]add new version config export feat (#5345) 
* add new version config export feat

* add new export button

* fix ci

* fix magical value

* add YamlParserConstructor
parse config reduce loop

* fix ci
 2021-04-16 10:39:55 +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
杨翊 SionYang
e689c1a3a1
Remove blocked thread for Protocol metadata (#5354) 2021-04-13 14:12:19 +08:00
Wu Zhiguo
9bcb901174
Fix some typo (#5260) 
* fix some typo

* rollback some comment format
 2021-04-03 12:57:57 +08:00
mai.jh
9cdfd9599d
[ISSUE-#5182] Remove ConfigController#removeRequestContext method. (#5201) 
* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* fix #5182, After some discussion, 2.0 adopted a long connection approach and decided to remove RemoveRequest Context

* Removing invalid import
 2021-03-26 13:52:56 +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
nov.lzf
481d25a6c7
listener bugfix (#5079) 2021-03-12 10:30:52 +08:00
nov.lzf
3afa7eac89
shutdown long connection where server rollback; use client submit client ip (#5013) 
* use  client ip from connection setup request.

* reset remote connection for rollback

* npe bugfix

* npe bugfix

* stop long connection where server rollback

* stop long connection where server rollback
 2021-03-05 09:28:01 +08:00
zhangcly
f8d8e658da
[ISSUE #4274] skip master-select task when db.num is 1 (#4790) 2021-03-04 10:37:10 +08:00
nov.lzf
2315a745d3
tag publish bugfix; ignore server port for connection reset request. (#4947) 
* grpc port modified;change notify bugfix.

* default member port fix

* modify grpc port to offset

* modify grpc port to offset
 2021-02-25 10:38:25 +08:00
nov.lzf
ed0edaa023
listen config auth bugfix (#4882) 2021-02-05 10:44:16 +08:00
nov.lzf
4f0ec0a196
optimize config file read (#4875) 2021-02-04 16:22:50 +08:00
nov.lzf
0449fbc707
move server loader controller from console to core; modify common server scheduler count to solve large cpu usage (#4872) 
* move server loader controll from  console to core

* modify common server scheduler count to solve large cpu usage
 2021-02-04 14:09:08 +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
01ea27501e
Full support for registering custom instances (#4828) 
* Move out `cluster` from extendInfo in InstancePublishInfo

* Fix unit test error

* Rename instanceId in instanceMetadata to metadataId

* Fix unit test

* Adapt 1.X client instance Id

* Full support for registering custom instances
 2021-01-28 20:20:01 +08:00
huqingfeng
0e42a75833
log error (#4799) 2021-01-28 20:08:34 +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
wjm0729
0545e851db
导入优化 (#4775) 
* import 优化

* 无法识别项目 提示优化

* revert

* revert

* 改回原来的格式
 2021-01-22 17:03:37 +08:00
nov.lzf
4e7346db1d
tps monitor key use self define submit；active detection both on client and server (#4767) 
* tps monitor key use self define submit

* pmd and check style.

* active detection of client and server

* connection manager ,active send interval increase
 2021-01-21 14:40:07 +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
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
haoyann
de23466363
fix cloning configuration last desc (#4697) 2021-01-15 19:41:46 +08:00
haoyann
63513b44f2
[ISSUE #4661]configServletInner#doGetConfig code optimization (#4666) 
* configServletInner#doGetConfig code optimization

* add comment

* update comment

* update comment
 2021-01-15 19:26:47 +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
nov.lzf
79b39db5ca
query config line break miss bugfix . (#4688) 2021-01-13 19:35:16 +08:00
KomachiSion
902f501fac Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	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
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/ClientInfo.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2021-01-13 15:53:50 +08:00
liaochuntao
2eac367970 fix: fix Jraft WriteRequest type problem. 2021-01-13 14:39:00 +08:00
杨翊 SionYang
998947315e
Add server identity to replace user-agent white list. (#4683) 2021-01-13 14:12:56 +08:00
nov.lzf
6027d36222
client use same executor during different connection;metrics count bugfix.;recommend server check (#4659) 
* client use same executor during different connection.

* metrics count bugfix.

* recommend server check

* remove rsocket ;add client metrics

* add client metrics to get cache value

* rpc tps control basic api submit.

* check style ,pmd fix.
 2021-01-11 14:11:32 +08:00
nov.lzf
2d8d4c5f5a
onnectionLimitRule submit.client use same executor during different … (#4651) 
* ConnectionLimitRule submit.

* ConnectionLimitRule submit.client use same executor during different connection.
 2021-01-08 09:59:03 +08:00
KomachiSion
11210c057d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-dev 2021-01-07 17:09:30 +08:00
nov.lzf
afb1a28135
log optimize; config re sync request (#4638) 2021-01-06 21:25:14 +08:00
wjm0729
4da3c82895
优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支 (#4607) 
* 优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支
异常的代价是很大的, 非必要情况下. 应该尽量避免

* comment

* comment

* license
 2020-12-31 15:50:07 +08:00
mai.jh
2af6784f55
for #4594,#4594 Fix IO close problem. (#4606) 2020-12-31 15:48:26 +08:00
KomachiSion
7f3a17c620 Solve conflict with develop branch. 2020-12-31 14:24:41 +08:00
KomachiSion
bdacd0958d Merge remote-tracking branch 'upstream/develop' into 2.0.0-sync-develop 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/NamingHttpClientProxy.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
 2020-12-31 11:48:52 +08:00
nov.lzf
0ad5bcbb17
call back bugfix. rpc executor extract... (#4592) 2020-12-29 16:23:32 +08:00
nov.lzf
6c5e52cf1b
rpc config listen notify optimize;connection_id name optimize;listeners query bugfix; (#4591) 
* rpc config listen notify optimize

* connection_id name optimize

* listeners query bugfix;
 2020-12-29 15:35:23 +08:00
haoyann
dd854e3b49
fix cluster mode query config type is null (#4579) 2020-12-28 09:48:11 +08:00
nov.lzf
6e34f2886b
encode bugfix (#4548) 
* basic spell fix.import
 fail bugfix

* encode bugfix

* remote log bugfix;  create client concurrent bugfix;optimize log

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle  fix

* checkstyle pmd fix

* checkstyle pmd fix

* http poll sla bugfix; rpc config listen notify optimize
 2020-12-26 15:53:10 +08:00
杨翊 SionYang
4445bad715
Add unit test for naming push (#4545) 
* Add single push task for retry push

* Add unit test for Push task

* Add unit test for Push executor

* Add unit test for Subscriber service v2

* PushService.java --> UdpPushService

* Refactor and add unit test for ClientInfo

* Solve Conflict and compile problem
 2020-12-22 17:56:34 +08:00
nov.lzf
452410825f
20201221 lzf grpc (#4535) 
* basic spell fix.

* basic spell fix.
 2020-12-21 20:46:36 +08:00
haoyann
1bc350b99a
fix derbyOps interface security problem (#4517) 2020-12-21 09:55:49 +08:00
nov.lzf
caffec2d5b
rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix. (#4473) 
* rsocket parse bugfix; auth bugfix;some checkstyle and basic spell fix.

* auth bugfix
 2020-12-14 19:31:33 +08:00
Brent
b8b57dc980
fix: 修复参数类型注释及单词拼写错误 (#4419) 2020-12-07 19:42:05 +08:00
liaochuntao
81d4a6d2fd
fix: fix bug (#4411) 2020-12-05 01:57:17 +08:00
杨翊 SionYang
93a3ac7816
Upgrade to 2.0.0-ALPHA.1 (#4410) 
* Add some new server config parameters

* Upgrade to 2.0.0-ALPHA.1
 2020-12-04 18:46:24 +08:00
KomachiSion
049b4e4e61 Sync code from upstream/develop 2020-12-03 20:06:12 +08:00
KomachiSion
d6fcac85c5 Merge remote-tracking branch 'upstream/develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingMaintainService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	config/src/main/java/com/alibaba/nacos/config/server/auth/ConfigResourceParser.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/result/ResultBuilder.java
#	core/src/main/java/com/alibaba/nacos/core/listener/StartingApplicationListener.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/ClientBeatCheckTask.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HealthCheckCommon.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/NamingResourceParser.java
#	sys/src/main/java/com/alibaba/nacos/sys/utils/ApplicationUtils.java
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
 2020-12-03 18:41:41 +08:00
nov.lzf
ad98020770
负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix (#4365) 
* memory gc optimize ; string pool bugfix

* grpc executor

* grpc executor

* 负载均衡bugfix；监听并发问题bugfix；direct memory泄漏bugfix

* check style fix
 2020-11-30 16:17:34 +08:00
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
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
zhuhao
b7b7b1975f
refactor issue #4275 (#4299) 2020-11-23 13:50:14 +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
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
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
nov.lzf
5c656d6f42
memory gc optimize ; string pool bugfix (#4261) 2020-11-19 10:34:40 +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
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
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +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
杨翊 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
赵延
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
邪影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
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
杨翊 SionYang
ccea6ee112
Upgrade to 1.4.1-SNAPSHOT (#4135) 2020-11-05 09:43:33 +08:00
KomachiSion
adbcb7549d Upgrade to 1.4.0 2020-11-02 19:09:19 +08:00
杨翊 SionYang
6eeeb76473
Develop fix jraft null datum (#4048) 
* Fix old raft sync null datum problem

* Fix TimerContext NPE problem
 2020-10-22 15:40:00 +08:00
jiang
6df2b229d0
[ISSUE-#3855] Provided a feature to view version comparisons in the configDetails page (#3988) 
* add detail previous config history api

* modify the previous config history url

* modify log description

* 详情页面添加“历史对比”按钮，点击可打开对比面板

* 点击“历史对比”按钮，获取上一版本数据

* 在查看历史对比的时候 不显示revert按钮

* append doc info

* Add unit tests for ISSUE#3855

* Add the previous updates to main.js and main.css

Co-authored-by: 赵延 <1060026287@qq.com>
 2020-10-19 09:29:59 +08:00
KomachiSion
9a0e8705dd solve conflict from develop branch and for checkstyle 2020-10-16 15:39:03 +08:00
KomachiSion
47481fedfb Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/resources/nacos-log4j2.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/src/main/java/com/alibaba/nacos/core/cluster/MemberMetaDataConstants.java
 2020-10-16 15:26:33 +08:00
杨翊 SionYang
d78ebbbce1
Refactor dispatch task execute (#3995) 
* Refactor nacos task execute engine

* Refactor nacos task execute engine

* For checkstyle

* For checkstyle

* Use ThreadUtils to reduce duplicate codes

* Set custom logger for TaskExecuteWorker

* Set custom logger for TaskExecuteWorker
 2020-10-16 14:32:39 +08:00
邪影oO
13599fd83d
Fix#3973 (#3974) 
* fix #3973

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

* 删除私有方法的注释

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

* 修改注释

* 添加licences

* 增加 TenantUtil 的测试

* TenantUtil 改名为 NamespaceUtil
 2020-10-13 15:48:46 +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
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
nov.lzf
d83a4b12b3
ak auth support on long connection (#3821) 2020-09-14 16:47:59 +08:00
nov.lzf
fac4879e92
optimize dumpService warning on starting up ； async request suppport in cluster rpc client proxy. (#3808) 
* optimize  dumpService warning on starting up .

* async request suppport in cluster rpc client proxy.

* async request suppport in cluster rpc client proxy.
 2020-09-11 18:02:28 +08:00
nov.lzf
721791a41e
optmize rpc client lifecycle ；request timeout to rpc client； some bugfix (#3797) 
* optmize rpc client lifecycle and some bugfix

* get server load optimize； add request timeout to rpc client
 2020-09-10 10:56:36 +08:00
nov.lzf
167dba13d2
check stype and pmd fix; future request optimize. (#3782) 2020-09-08 15:30:11 +08:00
nov.lzf
723dedebfe
request callback timeout support both at client and server; split sdk (#3776) 
and cluster grpc server port.
 2020-09-07 18:49:17 +08:00
KomachiSion
334e401f11 Fix merged error 2020-09-04 17:23:52 +08:00
KomachiSion
ee406d5e5e Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/http/ServerHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/test/java/com/alibaba/nacos/client/ConfigTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/notify/AsyncNotifyService.java
#	core/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-09-04 17:03:26 +08:00
邪影oO
043a504a33
fix: #3617 (#3678) 
* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释
 2020-09-03 21:14:23 +08:00
nov.lzf
cf550b9f43
optimize request /header /meta info model, uniform request resolver pattern. (#3749) 
* body string compress and opitimize request and meta info

* optimize request /header /meta info model, uniform request  resolver pattern.

* delete useless code
 2020-09-03 15:00:08 +08:00
nov.lzf
d279aad940
gzip support; using object list instead of string concat for batch listen config (#3742) 
* gzip support; using object list  instead of string concat for batch listen config

* gzip support; using object list  instead of string concat for batch listen config
 2020-09-02 14:25:33 +08:00
nov.lzf
3a5c3cb19f
refactor request/response registry ; server side request push refactor (#3739) 
* limiter support in rpc transport

* get next server optimize; server side notify concurrent bugfix; multi rpc client support in config module.

* toast alibaba repo refer. add client name

* rpc config change beta ips filter

* payload registry submit

* refactor request/response registry ; build response aware of server side in connection level.

* refactor request/response registry ; build response aware of server side in connection level.

* bi stream submit.

* bi stream submit.
 2020-09-02 09:12:53 +08:00
nov.lzf
3d222268af
as-sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware (#3693) 
* optimize rpc listen notify

* remove cache bugfix

* code optimize

* code optimize

* config client abstract optimize, remove if/else code

* config client abstract optimize, remove if/else code

* as sk abstract ; simplify server http agent; optimize io netty import; client side server change event aware
 2020-08-26 15:52:25 +08:00
Gagharv
3428d8830e
[ISSUE #3671] move some tools class into common package (#3672) 2020-08-24 13:24:56 +08:00
杨翊 SionYang
a0c8353b70
[ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663) 
* Add TaskManagerTest

* Move Abstract Task and Task processor to nacos-common

* Add Nacos execute engine interface and nacos task interface

* Refactor Task Manager to NacosDelayTaskExecuteEngine

* for code style
 2020-08-23 16:39:58 +08:00
nov.lzf
03e58df04f
listen context query support on console ; basic api for lader balance ;server side push retry submit (#3630) 
* listen context query with groupy and ip support long connect

* remove connection on cleint side, server will generate instead.

* connect reset request support appointing ip address.

* server push retry

* basic api for loader balance

* basic api for loader balance
 2020-08-18 20:20:21 +08:00
nov.lzf
33df55d40a
remote support on servers and optimize connection and client model (#3609) 
* Add gprc support-> optimize rpc listen execute task  notify

* Add gprc support->  add listener optimize.

* Add gprc support-> cluster rpc client support

* cluster rpc client support

* config change notify bettween server long connect support

* server push future refactor.

* server rpc sync compatibility support

* connection labels  support

* code fail fix
 2020-08-14 17:40:00 +08:00
mai.jh
526e2bc130
[ISSUE #3566] move the permission code of nacos-core module to nacos-auth module (#3593) 
* move the permission code of nacos-core module to nacos-auth module.

* Fix some code style issues

* address server module auth package name change.

* test change

* Incorrect package name correction
 2020-08-14 09:50:05 +08:00