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

342 Commits

Author SHA1 Message Date
Roger3581321
29e799fd44
Update pom.xml (#6374) 
updated the copyright time
 2021-07-19 11:58:38 +08:00
ZZQ的
12a9bfb3c8
[ISSUE #6314] Remove common-lang3 from pom.xml (#6334) 2021-07-13 09:32:15 +08:00
shalk(xiao kun)
c973566db9
[ISSUE #6188]add ut for com.alibaba.nacos.naming.cluster (#6279) 
* add ut for  com.alibaba.nacos.naming.cluster

* fix ut
 2021-07-07 10:02:01 +08:00
brotherlu-xcq
89af6a97ae
[FOR 5094 remote/grpc] add unit tests in nacos-core. (#6226) 
* [ISSUE #5904] add grpc directory unit tests.

* [ISSUE #5904] add grpc directory unit tests, for GrpcRequestAcceptor.java.

* [ISSUE #5904] fix ci problem.

* [ISSUE #5904] remove the all parameter constructor and add test scope for grpc-testing.
 2021-07-02 17:45:45 +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
杨翊 SionYang
463a29f082
Develop fix ci (#6092) 
* Fix github CI

* Add github IT
 2021-06-17 15:15:54 +08:00
杨翊 SionYang
95d608a90c
Upgrade to 2.0.3-SNAPSHOT (#6075) 2021-06-16 10:39:01 +08:00
KomachiSion
86d65c44fe Upgrade to 2.0.2 2021-06-11 10:08:34 +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
KomachiSion
a4771d916c Upgrade version to 2.0.2-SNAPSHOT 2021-04-29 17:51:03 +08:00
KomachiSion
c0919f921b Upgrade version to 2.0.1 2021-04-29 16:38:52 +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
杨翊 SionYang
5fa05aef52
Upgrade dependency version to fix security alert (#5506) 2021-04-27 15:16:54 +08:00
杨翊 SionYang
6c064bfe41
For #5171, Fix all IT case (#5464) 2021-04-23 18:36:02 +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
lzp0412
95194bd93d
[ISSUE #4856]support mcp over xds (#5124) 
* support mcp over xds

* add some exclude for checkstyle and rat

* exclude some auto generate code for pmd checkstyle

* remove  redundancy property
 2021-03-31 17:23:47 +08:00
shalk(xiao kun)
51d57e083c
upgrade mockito from 2.4 to 3.8 (#5226) 2021-03-30 10:16:46 +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
杨翊 SionYang
b2fb8839b8
[#4822,#4823,#4824,#4825,#4979] Fix dependency security problem. (#5128) 
* For #4822,#4823,#4824,#4825,#4979, Fix dependency security problem

* Fix jackson annotation version problem.
 2021-03-17 17:55:54 +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
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
KomachiSion
db1314e78e 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:27:04 +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
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
KomachiSion
c8edd7de2e revert distributionManagement 2020-12-04 23:39:24 +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
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
杨翊 SionYang
8f009b30bd
Add metadata dump and load jraft snapshot (#4367) 
* Metadata support dump and load raft snapshot

* Fix metadata serialize error for hessian

* For checkstyle
 2020-11-30 19:14:12 +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
邪影oO
85bdc1e644
Upgrade jraft to 1.3.5 (#4339) 
* 升级jraft到1.3.5以支持IPv6, 调整 NamingUtilsTest 代码格式以解决checkstyle问题

* 删除测试类的类注释
 2020-11-26 18:33:18 +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
mai.jh
6f4dbf065f
[ISSUE #4225] Replace http client in HttpHealthCheckProcessor (#4244) 
* for #42255， Replace http client in HttpHealthCheckProcessor.

* Restore the old version number.

* Removes temporary attributes from a method.

* fix Code style.

* Use the EnvUtil.getProperty() method to get the HTTP parameter, leaving it customizable.

* Fix error symbol.

* Remove excess package import.

* Rollback the code about the custom HTTP parameter.

* fix Code style.
 2020-11-19 19:07:44 +08:00
nov.lzf
5c656d6f42
memory gc optimize ; string pool bugfix (#4261) 2020-11-19 10:34:40 +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
蚊子猫
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
邪影oO
f01aae73ee
console\src\main\resources\static\console-fe 挪到根目录并改名为 console-ui (#4174) 2020-11-09 11:53:33 +08:00
KomachiSion
8829d3c6ed Upgrade to 2.0.0-ALPHA 2020-11-05 19:38:15 +08:00
KomachiSion
9cbc0bfeea Merge branch 'upsteam-develop' into feature_support_grpc_core 
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/common/Constants.java
#	client/src/main/java/com/alibaba/nacos/client/naming/remote/http/HttpClient.java
#	common/src/main/java/com/alibaba/nacos/common/utils/VersionUtils.java
#	core/src/main/java/com/alibaba/nacos/core/distributed/distro/DistroProtocol.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/GlobalExecutor.java
 2020-11-05 19:33:46 +08:00
邪影oO
6ddfa3e997
fix the occasional failure of CI (#4131) 
* fix the occasional failure of CI

* 修复错误的修改

* no message
 2020-11-05 10:12:06 +08:00
杨翊 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
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
sanxun0325
e2c037dd48
update spring boot dependencies version (#3900) 
Co-authored-by: yanlinly <yan.lin2009@163.com>
Co-authored-by: 杨翊 SionYang <263976490@qq.com>
 2020-09-23 20:15:15 +08:00
KomachiSion
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
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
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
682a46d541
loader balance basic support: adjust loader count once and up limit ; switch single (#3752) 2020-09-03 20:29:34 +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
杨翊 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
mai.jh
df9ae66fe0
create a nacos-auth module, And add nacos-auth dependency for nacos-core module. (#3590) 2020-08-12 19:15:58 +08:00
蚊子猫
6607a1efbf
[ISSUE #3515] upgrade spring-boot-dependencies version to 2.1.16.RELEASE, tomcat-embed-jasper version to 9.0.37 (#3563) 
Change-Id: I021396ae0b75fc889f087c4a4c253549ad46b46f
 2020-08-12 16:44:14 +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
linqunhui
ac8ced1cb5
[ISSUE #3536] upgrade Jjwt to 0.11.2 (#3547) 
* 15096346912@163.com

更新jjwt-api版本为0.11.2，更新Deprecated Method

* 15096346912@163.com

nacos-all  pom.xml更改版本

* 1509346912@163.com

格式检查
 2020-08-07 17:00:20 +08:00
杨翊 SionYang
df4b006b36
Upgrade version to 1.3.2 (#3512) 2020-08-04 12:58:45 +08:00
杨翊 SionYang
5f528d8036
[ISSUE #1097] Naming support grpc server forward request (#3480) 
* re subscribe service when reconnect

* change grpc instance maintain by heartbeat

* Add lifecycle for remoting workers

* Refactor naming client redo when reconnect

* Fix checkstyle and PMD

* Implement forward instance request to responsible server

* Implement forward heart beat to servers
 2020-07-30 17:00:57 +08:00
nov.lzf
85a0398978
1.server side client connection listener optimize 2. listen context and notifier updated . (#3385) 
* Add gprc support-> client reconnection optimize

* Add gprc support-> 1.client connection listener optimize  2.listen context an notifier updated .

* Add gprc support->merge problem fix

* Add gprc support->check style fixed.

* Add gprc support->check style fixed and remove  gRpc classes in source package.
 2020-07-20 16:27:58 +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
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
bc9861c615
[ISSUE #2992] Use new code style for nacos-cmdb module. (#3289) 
* Use new code style for nacos-cmdb module.

* Check again for nacos-common module.

* Check again for nacos-core module.

* Check again for nacos-naming module.

* skip nacos-test in checkstyle
 2020-07-09 22:10:13 +08:00
yangy
aa020e0b81
upgrade log4j version (#3229) 2020-07-03 09:22:44 +08:00
dependabot[bot]
86d8ff1a81
Bump mysql-connector-java from 8.0.13 to 8.0.16 (#3222) 
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.13 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.13...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-02 09:17:49 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
杨翊 SionYang
49c163b266
Hotfix frequent member change logs after #3168 (#3174) 
* Fix operate for unmodifiableList error

* Hotfix frequent member change logs after #3168
 2020-06-25 11:14:38 +08:00
杨翊 SionYang
532aad685e
upgrade version of Jackson and Guava (#3116) 2020-06-19 10:55:14 +08:00
zhanglong
1b55e68fd4 Upgrade the database driver version of Mysql to 8 # 3036 #2993 #1868 2020-06-13 19:05:22 +08:00
KomachiSion
d4bdb69831 For #2873, unified copyrights. 2020-06-12 16:24:00 +08:00
KomachiSion
4deb718859 For #2873, unified copyrights for nacos-api. 2020-06-12 15:31:20 +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
KomachiSion
56da41357e Remove fastjson dependency from pom 2020-06-03 14:42:25 +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
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
jintonghuoya
89c0388d18 初步整理根pom中的版本号 2020-05-29 00:02:19 +08:00
chuntaojun
6426440a8e refactor: code refactor 2020-05-23 14:33:56 +08:00
chuntaojun
be75c582c2 Merge remote-tracking branch 'origin' into feature_1.3.0_beta_grpc 2020-05-21 22:09:10 +08:00
liaochuntao
bcec069e90
Merge pull request #2675 from alibaba/dependabot/maven/com.fasterxml.jackson.core-jackson-databind-2.9.10.4 
build(deps): bump jackson-databind from 2.9.10.3 to 2.9.10.4
 2020-05-21 21:35:13 +08:00
chuntaojun
587a0937c9 refactor: perform consistency logic 2020-05-17 23:13:40 +08:00
chuntaojun
07dd129dd0 refactor: fixed instance information update heartbeat information not updating 2020-05-17 16:22:49 +08:00
chuntaojun
b86f633c8a Merge branch 'develop' of https://github.com/alibaba/nacos into feature_1.3.0_beta_grpc 2020-05-16 14:36:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
f5af822963 refactor: merge develop 2020-05-14 20:35:32 +08:00
chuntaojun
0c6a03724a fix: fix grpc-version bug 2020-05-14 16:25:41 +08:00
chuntaojun
e231590335 fix: grpc 2020-05-14 14:38:46 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
5f921225ad feat: use jraft-grpc 2020-05-11 20:21:11 +08:00
chuntaojun
588b184ce2 fix: none 2020-05-11 18:02:28 +08:00
chuntaojun
fa5769381c feat: jraft use grpc 2020-05-10 17:14:06 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
dependabot[bot]
c99ac322af
build(deps): bump jackson-databind from 2.9.10.3 to 2.9.10.4 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.3 to 2.9.10.4.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-23 17:52:58 +00:00
chuntaojun
e4c475295c refactor: remove complex logic, RPC ports can be customized 2020-04-23 15:22:16 +08:00
chuntaojun
ef405e09e2 refactor: remove complex listening logic and bug fixes 2020-04-22 17:28:53 +08:00
chuntaojun
0b3b5e83ac refactor(all): code optimization 2020-04-16 23:50:08 +08:00
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
chuntaojun
fad5e4d6ad refactor: modify pom.xml 2020-04-04 11:22:50 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
chuntaojun
9133814bb9 fix: 2020-03-27 19:03:21 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
57fc219f72 style: Fix License problem 2020-03-27 14:43:55 +08:00
chuntaojun
da7ef15196 style: fix code style 2020-03-26 20:53:46 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
dependabot[bot]
a65d687bc3
build(deps): bump jackson-databind from 2.9.10.1 to 2.9.10.3 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.1 to 2.9.10.3.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-04 22:32:43 +00:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
da4192c4a5 Fix bug 2020-02-06 16:33:23 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
dependabot[bot]
a026820201
Bump jackson-databind from 2.9.10 to 2.9.10.1 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10 to 2.9.10.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-13 09:32:15 +00:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp 
Feature mcp
 2019-10-22 18:02:15 +08:00
nkorange
225f0cae51 Fix findbugs 2019-10-22 17:05:48 +08:00
Beldon
927e8d6fe4 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
 2019-10-21 22:36:24 +08:00
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +08:00
nkorange
21e7bcdde0 #1409 Fix PMD 2019-10-15 18:07:27 +08:00
dependabot[bot]
395b20c8ea
Bump netty-all from 4.0.42.Final to 4.1.42.Final 
Bumps [netty-all](https://github.com/netty/netty) from 4.0.42.Final to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.0.42.Final...netty-4.1.42.Final)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-12 03:04:56 +00:00
nkorange
0b66b0c6fd Update jackson version, see https://nvd.nist.gov/vuln/detail/CVE-2019-16335 2019-09-24 10:57:02 +08:00
chuntaojun
2802247d6c Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-08-13 21:41:30 +08:00
chuntaojun
e981f3f787 feat: 2019-08-13 21:41:26 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
pbting
e45546bc66 upgrade the fastjson version 2019-07-29 09:30:02 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458 
support address server mode ,so nacos client will use the endpoint to initializer
 2019-07-01 23:08:08 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
nkorange
bce13d20ac Fix config error 2019-06-12 16:45:46 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
pbting
37b880b72a remove the distributionManagement 2019-05-31 16:16:43 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
Fury Zhu
d5b5dbb85e
Merge branch 'develop' into hotfix_jackson_vulnerability 2019-05-24 19:35:36 +08:00
nkorange
9ccce18e16 Update jackson version 2019-05-24 17:23:51 +08:00
keran
6bd8aebd21 增加集成测试 2019-05-24 15:19:02 +08:00