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

439 Commits

Author SHA1 Message Date
杨翊 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
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
赵延
6ac6a6c7ed
[ISSUE-#4346] Fix import code (#4347) 
* remove import.*

* transfer first_pre to final static variable

* use NamingBase.Xxx to replace constant
 2020-11-30 19:17:27 +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
Gagharv
aa4737f4bc
[ISSUE-#4181] Normalize ContextPath value in client-side (#4326) 
* [ISSUE-#4181] Just use ContextPathUtil normalize ContextPath value

* [ISSUE-#4181] add some test cases
 2020-11-27 23:41:22 +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
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
nov.lzf
70d976db18
更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志 (#4217) 
* listen context bugfix.

* 更新版本；集群整体重新负载均衡功能；变更推送内容；推送SLA日志；常量池改造；启动时长链接优化；删除rpc digest 日志
 2020-11-12 18:03:07 +08:00
邪影oO
027538ce2e
解决前端目录调整后前端访问不了问题 (#4206) 2020-11-12 09:18:45 +08:00
Gagharv
7baa696983
[ISSUE-#4181] fix url replace logic error，adjust the getContextPath logic (#4203) 2020-11-11 21:25:12 +08:00
杨翊 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
757fc1efeb
Revert "解决前端目录调整后前端访问不了问题 (#4195)" (#4196) 
This reverts commit a0bbd562b0.
 2020-11-11 13:59:50 +08:00
邪影oO
a0bbd562b0
解决前端目录调整后前端访问不了问题 (#4195) 2020-11-11 10:44:43 +08:00
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
KomachiSion
fc33fb211c Fix integration test error 2020-10-21 13:49:16 +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
JackSun-Developer
7527d76743
[ISSUE #3576] [Enhancement] Adding the destroy lifecycle method on NamingMaintainService (#3985) 2020-10-14 10:17:06 +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
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
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
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
mai.jh
136b45610d
refactor: unified implementation of http client api adjustment. (#3639) 2020-08-20 09:09:21 +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
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
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
nov.lzf
a0a1486fa2
rsocket support and optimize client abstract (#3559) 
* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> rpc Rsocket submit

* Add gprc support-> upgrade api client common jdk compiler to 1.8 for test Rsocket only

* Add gprc support-> rsocket client test code  submit

* Add gprc support-> rpc client factory optimize

* Add gprc support-> config client factory  rename

* Add gprc support-> rsocket submit

* Add gprc support-> rsocket client switch  submit

* Add gprc support-> rsocket support and optimize rpc client
 2020-08-10 09:11:53 +08:00
赵延
9734deeefc
[ISSUE #3486] Fix com.alibaba.nacos.core.code.ControllerMethodsCache will mismatch sometimes (#3487) 
* fix #3486

* modify code suit checkstyle

* add apache licenses

* change the publish version of new class

* set the char "-->" in interface

* set the char "-->" in interface

* code format

* add unit case of com.alibaba.nacos.core.code.ControllerMethodsCache.getMethod

* code format follow nacos-code-style

* code format follow nacos-code-style
 2020-08-07 10:51:39 +08:00
mai.jh
b1db2be4c1
[ISSUE #3192] replace nacos-core module http client (#3535) 
* core module replace http client

* replace http client
 2020-08-06 22:01:36 +08:00
mai.jh
a64a356e45
[ISSUE #3192] replace nacos-config module http client (#3523) 
* nacos-config module replace http client

* replace http client

* Remove redundant package import

* add license

* Delete JOSNUtils and use JacksonUtils instead; modify NacosAsyncRestTemplate exception handling.
 2020-08-06 11:53:27 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
mai.jh
5b76fd0d56
[ISSUE #2858] Unified http client implementation, enhanced async request callback interface (#3452) 
* Enhanced callback interface for asynchronous requests

* change class name

* add license

* change class name

* comment change

* delete AbstractCallback
 2020-07-27 13:15:50 +08:00
杨翊 SionYang
115c992c98
[ISSUE #3386] Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService (#3402) 
* Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService

* Use http client as default implement of some uncompleted api
 2020-07-21 15:02:44 +08:00
mai.jh
75a06834f5
unified implementation of http client package division (#3400) 2020-07-21 14:53:03 +08:00
杨翊 SionYang
39986a867a
[ISSUE #3386] Extract NamingClientProxy Interface (#3387) 
* Move and rename NamingProxy.java

* rename package naming.net --> naming.remote

* Create Naming client proxy interface
 2020-07-20 16:32:07 +08:00
KomachiSion
79c8521bde Merge 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/http/HttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
 2020-07-18 16:28:00 +08:00
mai.jh
63a4e30ae6
[ISSUE #3224]nacos-client module http client replace (#3348) 
* nacos-client module http client replace

* fix code style problem

* add HashMap initialCapacity

* fix code style problem

* Modify the header object, keep the original response header to avoid modifying the original logic code

* fix code style problem

* naming http client request exception messages output change

* Merge code
 2020-07-18 14:42:02 +08:00
杨翊 SionYang
6c8dfd6ed3
Add naming support gRPC for query instance list and service info (#3352) 
* Add naming support gRPC for query instance list and service info

* Update version to 1.4.0-SNAPSHOT
 2020-07-16 18:08:25 +08:00
mai.jh
0163d2d0c7
fix: #3324, Move http client close method to NamingProxy.shutdown() (#3333) 2020-07-15 14:12:44 +08:00
mai.jh
511ef88ccc
fix:#3311 Add specified Logger when constructing nacos resttemplate (#3312) 2020-07-13 18:54:06 +08:00
Hu Zongtang
665d9d7aaf
[ISSUE#3179]Replace the NotifyCenter with new refactor in the core and test module. (#3309) 
* [ISSUE#3179]Replace the NotifyCenter with new refactor in the core and test module.

* [ISSUE#3179]Replace package in the nacos-logback.xml.

* [ISSUE#3179]code reformat.
 2020-07-13 13:59:25 +08:00
mai.jh
c1515b6940
[ISSUE #3197] NacosRestTemplate enhance (#3198) 
* enhance nacosRestTemplate

* enhance nacosRestTemplate

* supplement throw exception

* Modify the iterate method of the interceptor and modify some method name

* Adjust the way to get HttpClientRequest implement in NacosRestTempalte

* Fix code style issue

* Fix code style issue

* Fix code style issue

* Fix code style issue

* Log output change
 2020-07-13 13:55:27 +08:00
mai.jh
092a08971f
[ISSUE #3210] Enhanced nacos resttemplate response handler (#3212) 
* Enhanced nacos resttemplate response handler

* Enhanced nacos resttemplate response handler

* Add license

* [#3212] Modify some class name and comment

* [#3212] Modify some class name and comment

* [#3212] Modify some class name and comment

* [#3212] change the name of property

* Fix code style issue
 2020-07-13 11:34:00 +08:00
zongtanghu
34fd36b115 [ISSUE#3179]fix import formate issue. 2020-07-12 13:52:29 +08:00
zongtanghu
d8e1d2aebc [ISSUE#3179]Replace the NotifyCenter with new refactor in the config and test module. 2020-07-12 11:28:54 +08:00
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
95f3bfb587
[ISSUE #2992]Recheck all checkstyle and open checkstyle during building (#3293) 
* Re-check code style for nacos-config module.

* Re-check code style for other module.

* Open checkstyle plugin check during build
 2020-07-10 17:18:53 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
Hu Zongtang
51c0eb25ad
[#3179]fix Notify's typos in common module and remove NotifyCenter's unit test in test module (#3187) 
* [#3141]fix Notify's typos in common module and remove NotifyCenter's unit test in test module.

* [#3141]fix variable naming issue.
 2020-06-28 13:01:12 +08:00
liaochuntao
2c733d57ff
[#2979] Inline storage support importing data from external data sources (#3138) 
* feat: data import Derby, Derby export complete

* feat: external data source import is complete

* feat: import data to derby and derby backup finished

* fix: fixed bug where external storage mode could not find beans

* style: fix code style

* style: remove unuse code

* refactor: fixed configuration file information

* improvement: merge upstream/develop

* style: fix code style

* fix: a way to fix the missing

* fix: fix derby data import in standalone mode

* style: fix code style

* refactor: merge upstream develop and fix code style

* test: modify ut

* style: fix code style
 2020-06-28 10:25:06 +08:00
liaochuntao
f5e1025f14
[ISSUE #3110] Hotfix member health (#3168) 
* improvement: merge upstream/develop

* fix: fix node status change not notified

* style: fix code style

* refactor: optimize node change event logic

* refactor: adjust the node change event receiver logic
 2020-06-24 15:30:10 +08:00
mai.jh
6ce8d8ca79
[ISSUE #3140]nacos-client module replace http client (#3142) 
* nacos-client http client replace

* Remove some explain

* Remove some explain

* Adjust some code styles and fix some misspelled method names

* Fix code style issues

* fix some misspelled method names

* Fix code style issues
 2020-06-22 20:42:46 +08:00
liaochuntao
bb7cfbcc5d
[ISSUE #2847] Fix config IT (#3120) 
* improvement: merge upstream/develop

* fix: fix config ut bug

* style: fix code style

* fix: fix ut bug
 2020-06-19 20:14:22 +08:00
杨翊 SionYang
532aad685e
upgrade version of Jackson and Guava (#3116) 2020-06-19 10:55:14 +08:00
mai.jh
e528ea82e9
[ISSUE #3094]abstract create nacos restTemplate factory (#3095) 
* abstract create nacos restTemplate factory, allowing users to customize the commonly used http client config

* add class file license.

* change class file name

* Adjust some code
 2020-06-17 17:53:37 +08:00
liaochuntao
b9ff53b49c
Merge pull request #3048 from KomachiSion/develop-issue#2873 
[ISSUE #2873] Unified copyright for file header.
 2020-06-12 21:23:28 +08:00
杨翊 SionYang
81f9eff928
Merge pull request #2926 from Maijh97/develop 
[ISSUE #2858] Unified implementation of Http requests
 2020-06-12 19:47:41 +08:00
KomachiSion
3af02f13f4 For #2873, unified copyrights for nacos-test. 2020-06-12 16:05:25 +08:00
zongtanghu
9b873797ca [#1815]fix ut. 2020-06-11 10:35:50 +08:00
zongtanghu
e6e3161c0e resolve the codes conflicts 2020-06-11 09:45:00 +08:00
zongtanghu
eb39830b6c [#1815]remove lifeCycle, lifeCycleManager, and adjust some related codes. 2020-06-11 09:42:44 +08:00
mai.jh
fa6bf9951d remove extra blank lines 2020-06-11 09:34:15 +08:00
杨翊 SionYang
f49eba341c
Merge pull request #2287 from rushsky518/sync_content 
HttpCLient uses ByteArrayEntity when sync data
 2020-06-10 16:21:07 +08:00
chuntaojun
902d609f1e perf: optimize configuration change event publishing 2020-06-08 23:38:53 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
yanlinly
f71c5d85c9
Merge pull request #2949 from alibaba/hotfix_config_clone 
Hotfix config clone
 2020-06-03 20:07:31 +08:00
chuntaojun
95eba16669 test: add ut 2020-06-03 19:50:25 +08:00
zongtanghu
15fad5d98a [#1815]remove destroyService from Factory Class. 2020-06-03 19:19:29 +08:00
zongtanghu
860a2d02b1 resolve codes conflicts 2020-06-03 17:41:22 +08:00
zongtanghu
09752e354d [#1815]adjust this keywords which just includes constructor and set method in the class and fix some unit test cases. 2020-06-03 17:35:06 +08:00
zongtanghu
e86c158262 resolve codes conflicts 2020-06-03 14:57:46 +08:00
KomachiSion
56da41357e Remove fastjson dependency from pom 2020-06-03 14:42:25 +08:00
KomachiSion
e9adf975af Replace fastjson with jackson for nacos-test/naming 2020-06-03 14:39:28 +08:00
KomachiSion
4dbe81418b Replace fastjson with jackson for nacos-test/auth 2020-06-03 14:39:17 +08:00
KomachiSion
c0b4385287 Replace fastjson with jackson for nacos-test/config 2020-06-03 14:39:05 +08:00
KomachiSion
9e21a2cf46 Replace fastjson with jackson for nacos-test/common 2020-06-03 14:38:23 +08:00
zongtanghu
5e2840a6bd [#1815]adjust and optimize codes. 2020-06-03 10:46:41 +08:00
zongtanghu
2ab274216a [#1815]adjust and optimize codes, reput the lifecycle to ConfigService class level at the same time. 2020-06-02 19:55:30 +08:00
liaochuntao
184141fc57
Merge pull request #2923 from jintonghuoya/feature_maven_version_unity 
[ISSUE #2860]Maven dependency optimizations, where only one version of each dependency exists
 2020-06-02 14:47:26 +08:00
mai.jh
a83241205c optimize response handler, remove AsyncRestOperations，RestOperations. 2020-06-01 23:51:53 +08:00
chuntaojun
3169424605 refactor: optimize old version information synchronization logic 2020-06-01 21:54:29 +08:00
Jack Dai
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
zongtanghu
8d6dd8f41b [#1815]adjust codes and reput the lifecycle to ConfigService class level. 2020-06-01 17:57:35 +08:00
mai.jh
177b8aa61c
Merge branch 'develop' into develop 2020-06-01 15:45:25 +08:00
chuntaojun
6fb2750021 fix: fixed compatibility issues with older versions 2020-06-01 15:35:21 +08:00
mai.jh
031c9ef521 perfect NacosRestTemplate and restResult 2020-05-31 17:24:01 +08:00
mai.jh
2b7ebbf5bc test change 2020-05-31 00:23:58 +08:00
mai.jh
6f3b3e3c9b test change 2020-05-31 00:10:14 +08:00
mai.jh
066968e9ca
Merge branch 'develop' into develop 2020-05-30 23:47:51 +08:00
mai.jh
ea03121e26 add NacosRestTemplate and NacosAsyncRestTemplate test example 2020-05-30 22:39:04 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +08:00
chuntaojun
5dcee2f1c6 fix: fix pmd 2020-05-29 19:59:08 +08:00
zongtanghu
6981fbc576 [#1815]add ResourceLifeCycleManager,adjust some code and fix some unit test cases. 2020-05-29 19:10:06 +08:00
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00