Commit Graph

286 Commits

Author SHA1 Message Date
rushsky518
3c1d6d00c3 #1550 添加单元测试;部分类移动到 api 模块 2019-11-28 11:56:04 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
zzh
7582de9910 Modify the string splicing method of getgroupedname() 2019-11-06 10:15:38 +08:00
nkorange
5caa57351a Fix PMD 2019-10-30 10:20:16 +08:00
nkorange
f4f90a08ed Fix add metadata method NPE. 2019-10-29 15:36:12 +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
Vettal Wu
07d08b381e Support snowflake instance id generator
Signed-off-by: Vettal Wu <vettal.wd@alibaba-inc.com>
2019-10-21 17:44:08 +08:00
dizhe
d248bc9ecc Support unique instance index for each registered server
Signed-off-by: dizhe <vettal.wd@alibaba-inc.com>
2019-10-18 16:05:51 +08:00
rushsky518
a815d7b7de Merge branch 'develop' of https://github.com/rushsky518/nacos into develop
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317 #1550 nacos server return config type 2019-10-11 19:58:42 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:55:02 +08:00
pbting
2431edae4c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 13:27:52 +08:00
nkorange
95b92b06e9 Fix #1621 2019-09-06 12:53:31 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5
# Conflicts:
#	console/src/main/resources/static/js/main.js
2019-08-21 16:49:48 +08:00
rushsky518
b29e8c089c #1550 yaml 展平 2019-08-16 17:11:24 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
3bd5dcb1cf add comma division with some case to use 2019-08-16 09:44:06 +08:00
rushsky518
1877e7d307 #1550 流程调通 2019-08-15 17:37:03 +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
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
chuntaojun
09ce016ac8 fix(api): fix issue #1500 2019-07-07 11:39:21 +08:00
nkorange
15eff1c3db Merge remote-tracking branch 'upstream/develop' into develop 2019-07-05 22:00:06 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
chuntaojun
9277db2084 docs(api): add details desc 2019-07-05 17:26:27 +08:00
chuntaojun
039baee47d refactor(api): Restore the yaml() method to be compatible with older clients 2019-07-05 17:18:25 +08:00
得少
b2253301c3 1. Optimize code design and comment
2. Optimize address server repacakge
2019-07-05 11:05:37 +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
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
Fury Zhu
dc7485b108
Merge pull request #1427 from chuntaojun/feat_config_prefix
[FEATURE] @NacosConfigurationProperties support prefix setting
2019-06-30 22:54:27 +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
Fury Zhu
00f989f51e
Merge pull request #1426 from IanCao/master
【issue】 #1425
2019-06-27 18:51:38 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
chuntaojun
0885d08778 feat(api): @NacosConfigurationProperties support prefix setting 2019-06-24 20:25:24 +08:00
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11
【issue】#1278
2019-06-24 14:21:22 +08:00
caoyixiong
6d6e4a184c format 2019-06-24 14:00:49 +08:00
caoyixiong
2ca8e0c1b3 fix 2019-06-24 13:57:51 +08:00
caoyixiong
4c87550750 update nacosException 2019-06-24 13:55:50 +08:00
caoyixiong
502fa0dcdc 【issue】 #1425 2019-06-24 10:54:15 +08:00
Fury Zhu
c7fe374af6
Merge pull request #1413 from chuntaojun/develop
feat(nacos-api): add enableRemoteSyncConfig properties setting
2019-06-24 10:24:58 +08:00
Fury Zhu
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
caoyixiong
1decd04008 #1278 2019-06-21 11:41:55 +08:00
caoyixiong
b2242194f4 fix 2019-06-20 23:11:02 +08:00
chuntaojun
090b047d4b feat(nacos-api): add enableRemoteSyncConfig properties setting 2019-06-20 14:52:07 +08:00
slievrly
e01a44702b optimize charset、continue and return
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:47:55 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
chuntaojun
c91f99b82e fix(nacos-client:config): Fix code conflicts 2019-06-18 23:27:28 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
chuntaojun
44e3c5e224 refactor(nacos-api:config): Modify ConfigYype to be an enumeration class 2019-06-17 18:31:50 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
chuntaojun
21ff07563d refactor(nacos-client:config): rmove un use construct of CacheData 2019-06-16 08:24:17 +08:00
chuntaojun
ade510f31d feat(nacos-client:config): fix issue #1317 2019-06-15 23:37:12 +08:00
chuntaojun
240ee50aa2 fix(nacos-client:config): fix issue 1317 2019-06-15 19:12:54 +08:00
chuntaojun
22df13b0e2 feat(nacos-api): add config type setting 2019-06-14 21:18:45 +08:00
chuntaojun
cc5e636a31 feat: 2019-06-14 19:31:11 +08:00
赵禹光
10aa620315 All overriding methods must be preceded by @Override annotations. 2019-06-14 18:54:04 +08:00
caoyixiong
4f56452999
Merge pull request #3 from alibaba/master
merge
2019-06-14 05:35:19 -05:00
chuntaojun
75868623b2 fix(nacos-api/nacos-client): Fix setting parameter acquisition problem and nacos properties add new 2019-06-14 17:06:50 +08:00
chuntaojun
ac846dfe08 fix(nacos-api): fix some property name 2019-06-14 16:56:28 +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
IanCao
63560370ae Different instance has different TTL. 2019-06-11 14:40:28 +08:00
chuntaojun
aa41a10616 fix(nacos-client:config): Fix failed custom parameter setting error 2019-06-11 13:26:20 +08:00
chuntaojun
dd9676c2e4 fix(nacos-client): fix merge conflict 2019-06-11 09:16:22 +08:00
chuntaojun
0e653a9b39 refactor(nacos-client:config): Modify the long poll timeout parameter to add Max retry custom Settin 2019-06-11 09:12:59 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +08:00
yongchao9
0a58348438 Merge remote-tracking branch 'upstream/develop' into hotfix_169
合并远程develop分支
2019-06-05 20:43:20 +08:00
yongchao9
c1ac93aee8 同步远程develop分支 2019-06-05 20:43:12 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified
Namespace And Endpoint Support Multi Enviroment Switch
2019-06-04 17:15:26 +08:00
pbting
3b869fcdbe change the comment from Chinese to English 2019-06-04 16:44:12 +08:00
Fury Zhu
3174aae243
Merge pull request #1290 from chuntaojun/develop
feat(client): @NacosConfigurationProperties support yaml style config
2019-06-04 16:29:53 +08:00
pbting
302ae79b3f 1. 注释改成中文
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
2019-06-04 15:55:47 +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
chuntaojun
97ff458422 feat(client): @NacosConfigurationProperties support yaml style config 2019-05-29 11:21:04 +08:00
Fury Zhu
5cab208cbd
Merge pull request #1228 from sheiy/master
Update pom.xml
2019-05-17 19:24:52 +08:00
sheiy
229262f5a1
Update pom.xml
java.util.Objects 至少需要jdk7
2019-05-15 23:06:46 +08:00
Fury Zhu
1f1b047984
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359
[#359] provide a way for user to implement their health checkers.
2019-05-12 11:04:14 +08:00
Fury Zhu
df6f3a8df7
Merge pull request #1130 from chuntaojun/feature_service_curd
[ISSUE #747、#1154] Add create and update service methods in SDK and update instance operation
2019-05-09 10:45:54 +08:00
chuntaojun
221ce1237a fix(api): fix NamingMaintainFactory create NamingMaintainService cannot find Class 2019-05-09 10:22:16 +08:00
chuntaojun
ac36a41d86 refactor(api、client): modify MaintainService to NamingMaintainService 2019-05-09 10:07:09 +08:00
chuntaojun
141f8a19ea refactor(client): 2019-05-08 15:29:01 +08:00
chuntaojun
8c82f85a74 refactor: 2019-05-07 12:03:34 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
chuntaojun
320aca4d90 style(api): The revised code is in compliance with the specification 2019-04-30 19:27:06 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
chuntaojun
ea214e1d50 feat(client): add feature of service curd 2019-04-27 22:32:28 +08:00
XCXCXCXCX
6615ae8106 [#359] Use SPI to make health scalable 2019-04-27 13:55:04 +08:00
huangyonghui
8ac94b61b4 NamingEvent add getGroupName and getClusters method 2019-04-24 15:08:16 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00