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

493 Commits

Author SHA1 Message Date
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
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
chuntaojun
5cd5ca35b8 refactor: merge develop 2020-05-28 20:14:47 +08:00
KomachiSion
73a2ba634b Fix spelling error 2020-05-28 10:46:12 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
chuntaojun
e8533155c7 fix: fix startup problem 2020-05-27 22:05:38 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +08:00
chuntaojun
6fe1d0d0da improvement: adjust part of the code 2020-05-26 11:57:27 +08:00
chuntaojun
bf2adb4be5 feat: merge develop 2020-05-26 09:43:37 +08:00
chuntaojun
6b7a00ab00 fix: fix notify ut 2020-05-25 15:00:07 +08:00
chuntaojun
843692b10a fix: fix the class cast problem 2020-05-24 21:56:29 +08:00
chuntaojun
451351cfc0 refactor: optimize message publishers 2020-05-21 20:28:32 +08:00
chuntaojun
feebd1623f refactor: performance optimization 2020-05-16 19:23:11 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +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
0aefb6f0cc refactor: retain the expansion logic 2020-05-11 16:52:03 +08:00
chuntaojun
5b22ddfb78 refactor: remove discovery-memberlookup 2020-05-10 17:16:02 +08:00
chuntaojun
6a6725a269 fix: fix expansion issues 2020-05-09 20:32:55 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
613a8d6c40 refactor: the raft port computes the rule changes 2020-05-07 11:08:10 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
1563dc7104 fix: fixed a problem where parameters were encoded multiple times 2020-05-05 09:43:54 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
a82bcc1d6e fix: fix request transfer bug 2020-05-02 13:12:38 +08:00
chuntaojun
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
eb11ff945b fix: fix standalone sync node info bug 2020-04-30 20:02:54 +08:00
chuntaojun
041effebc7 refactor: some code refactor 2020-04-30 13:46:04 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
chuntaojun
e4c475295c refactor: remove complex logic, RPC ports can be customized 2020-04-23 15:22:16 +08:00
chuntaojun
853a8f587f refactor: core 
logic optimization
 2020-04-22 22:16:27 +08:00
chuntaojun
ef405e09e2 refactor: remove complex listening logic and bug fixes 2020-04-22 17:28:53 +08:00
chuntaojun
f222dccd3d refactor: code optimization 2020-04-21 17:14:59 +08:00
chuntaojun
0af4d4f510 refactor: addressing mode refactoring 2020-04-18 13:59:28 +08:00
chuntaojun
0b3b5e83ac refactor(all): code optimization 2020-04-16 23:50:08 +08:00
chuntaojun
1aca7bc3e0 refactor: core 2020-04-13 22:44:08 +08:00
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
f5125dd396 test: Modified unit test 2020-03-26 21:21:54 +08:00
chuntaojun
5e51859483 style: remove useless folder 2020-03-26 21:00:51 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
chuntaojun
b44e7d6f44 docs: remove dir 2020-03-09 15:52:46 +08:00
chuntaojun
0a325bf9c7 fix: fix merge confilt 2020-03-09 15:38:03 +08:00
chuntaojun
3e403c5655 refactor: remove unuse dir 2020-03-06 16:33:33 +08:00
chuntaojun
f65e4fcbc0 refactor(naming): Optimize the empty service removal logic 2020-03-06 16:32:59 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
025b1b4980 Fix test case error 2020-03-02 16:47:13 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
rushsky518
9c5bead6fb remove blank lines 2020-01-27 20:09:47 +08:00
rushsky518
93e730d95a wait for async op 2020-01-25 13:36:04 +08:00
rushsky518
8fe3eba1d7 #2237 add a IT_test 2020-01-24 09:56:52 +08:00
qq213539
bad5c53d9c no message 2020-01-17 15:32:38 +08:00
qq213539
9ff1c38762 修改测试用例 2020-01-17 15:09:50 +08:00
nkorange
7bbd867c2c #1105 Fix test case error 2020-01-16 22:39:09 +08:00
nkorange
bc5e3e1cce #1105 Finish auth IT cases 2020-01-15 17:57:01 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop 
receive config change event
 2020-01-10 15:41:24 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
02fea89f49 #1105 Add user test case 2020-01-06 16:23:00 +08:00
nkorange
3e312e7537 #1105 Add test cases 2020-01-06 16:02:32 +08:00
nkorange
a32a4f780c Fix #2123 2019-12-06 15:58:23 +08:00
nkorange
38590d060c Fix #2123 2019-12-06 11:53:01 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
1a4c8f8af1 #1550 加测试用例 2019-11-28 15:56:29 +08:00
nkorange
3a4de81981 Fix client beat task executing when health check is disabled. 2019-11-11 16:05:33 +08:00
sheiy
c8b88e6228 issues:调用修改实例接口,未传的参数值会被清空 
https://github.com/alibaba/nacos/issues/1957
 2019-10-25 18:12:43 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
nkorange
225f0cae51 Fix findbugs 2019-10-22 17:05:48 +08:00
nkorange
124bf07617 Fix test case error. 2019-10-21 18:00:11 +08:00
xianlaioy
08e69a0b21 refactor: 局部变量是线程安全的； 
urlPattern改成static final；
          GroupKey重构
 2019-09-09 20:15:19 +08:00
ly
3b4767384d [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:02:00 +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
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3 
format code
 2019-08-01 11:04:24 +08:00
nkorange
207e54631c Fix namespace vulnerability 2019-07-30 00:40:21 +08:00
赵禹光
ea974dc282 fmt 2019-07-11 20:25:08 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
赵禹光
ce4e4c64de fix CI 2019-07-05 16:01:52 +08:00
mingyixu
2988dabffd add testcase 2019-07-05 14:21:46 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
xiaochun.xxc
024cf2a1c3 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-07-04 13:53:31 +08:00
xiaochun.xxc
4f613691ae add batch config testcase 2019-07-04 13:53:12 +08:00
Fury Zhu
c031a275f7
Merge pull request #1457 from chuntaojun/fix_issue_1455 
Fix issue 1455
 2019-07-03 18:33:48 +08:00
chuntaojun
e6b09cb647 fix(client): fix Correction parameter name 2019-07-02 13:07:02 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
chuntaojun
ff9ddfc31c test(test): add issue #1455 test 2019-07-01 17:53:18 +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
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
86f0f3c6d7 #1229 Add test case 2019-06-28 17:06:06 +08:00
nkorange
fbb9ec8b20 #494 Add test cases 2019-06-28 16:40:05 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
Fury Zhu
94f034bccf
Merge pull request #1407 from slievrly/junit 
optimize junit
 2019-06-24 10:23:47 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier 
optimize modifier access
 2019-06-24 10:17:39 +08:00
slievrly
15ad43b924 optimize junit 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-20 14:40:57 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize 
remove unused import
 2019-06-20 13:58:50 +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
21bf279532 optimize modifier access 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +08:00
chuntaojun
c91f99b82e fix(nacos-client:config): Fix code conflicts 2019-06-18 23:27:28 +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
75868623b2 fix(nacos-api/nacos-client): Fix setting parameter acquisition problem and nacos properties add new 2019-06-14 17:06:50 +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
chuntaojun
aa41a10616 fix(nacos-client:config): Fix failed custom parameter setting error 2019-06-11 13:26:20 +08:00
chuntaojun
d43e079a97 test(nacos-test:config): add ConfigLongPoll_ITCase 2019-06-07 22:51:16 +08:00
chuntaojun
456e84785f refactor(nacos-client:config): Rewrite the HTTP retry rule 2019-06-07 18:41:08 +08:00
chuntaojun
be213f5601 test(nacos-client): add ConfigLongPollTest 2019-06-07 16:47:25 +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
keran
6bd8aebd21 增加集成测试 2019-05-24 15:19:02 +08:00
keran
14e8d92ec6 导入修改为阿里云ACM方式,支持导入ACM文件 2019-05-19 22:27:15 +08:00
keran
ad3a6953cb 导出重写,导出格式兼容阿里云ACM 2019-05-19 16:49:22 +08:00
chuntaojun
f21db94327 fix(test): 2019-05-16 16:57:02 +08:00
chuntaojun
51ded2c857 fix(fix NamingMaintainService_ITCase mistake): 2019-05-16 12:25:00 +08:00
chuntaojun
4c5c2a66e8 fix(test): fix NamingMaintainService_ITCase mistake 2019-05-16 12:08:28 +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
ac36a41d86 refactor(api、client): modify MaintainService to NamingMaintainService 2019-05-09 10:07:09 +08:00
Fury Zhu
e9d10d83e9
Merge pull request #1181 from mingyixu/master 
collation and analysis of the ignore test cases
 2019-05-07 17:31:00 +08:00
xiaochun.xxc
effb66c386 梳理nacos集测ignore用例 2019-05-07 16:05:41 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
Fury Zhu
2f766c5c2d
Merge pull request #1095 from alibaba/feature_naming_group 
Feature naming group
 2019-04-23 16:26:36 +08:00
xiaochun.xxc
808ddae799 add ignore flag 2019-04-19 10:20:30 +08:00
xiaochun.xxc
f002675af1 add cmdb testcases 2019-04-18 23:06:27 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
nkorange
18f714775b Merge branch 'master' into develop 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
 2019-04-15 11:23:22 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
nkorange
18b8c95a71 Fix test case error 2019-04-10 22:44:38 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
nkorange
cab10aa914 Merge branch 'master' into develop 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2019-04-09 16:30:03 +08:00
dungu.zpf
f3b13702b1 #502 Fix bug 2019-04-09 15:40:52 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
nkorange
4dc40311e6 Update version to 1.0.0-RC3 2019-04-03 10:43:08 +08:00
xiaochun.xxc
727768061d 适配测试用例 2019-04-01 11:01:00 +08:00
nkorange
a745423dec Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	pom.xml
#	test/pom.xml
 2019-03-25 15:03:31 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
nkorange
7303ea7b66 #745 Remove server mode 2019-03-20 18:08:36 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
qingliang.ql
4cf86dfc66 fix derby size 大于32kb报错问题 2019-03-18 15:49:48 +08:00
nkorange
7ca6143550 #502 Fix concurrent problem. 2019-03-16 20:07:04 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
xiaochun.xxc
9a0978a72a delete intance before removeBeat in AP mode 2019-03-13 11:16:41 +08:00
xiaochun.xxc
ca4a303d08 add instance api 2019-03-11 15:45:39 +08:00
nkorange
b75ea9f333 Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-03-08 17:18:13 +08:00
nkorange
8d28958cb7 #629 Fix bug 2019-03-08 17:18:01 +08:00
xiaochun.xxc
4a2e1be84a 增加接口用例 2019-03-08 16:52:08 +08:00
nkorange
fb8cf7d3b6 Fix config name error 2019-03-08 10:24:46 +08:00
xiaochun.xxc
a03d29a0c3 add cp mode testcases 2019-03-07 21:37:37 +08:00
xiaochun.xxc
5f41f0a53f 增加group用例 2019-03-06 16:24:39 +08:00
xiaochun.xxc
f186219f7c fix bug“ 2019-03-05 17:38:49 +08:00
nkorange
a4155fd939 #269 fix test case bug 2019-03-05 15:58:51 +08:00
xiaochun.xxc
d067ab5b6b delete testcase info 2019-03-05 11:50:49 +08:00
xiaochun.xxc
8293662940 Merge branch 'feature_naming_group' of https://github.com/alibaba/nacos into feature_naming_group 2019-03-05 11:45:07 +08:00
xiaochun.xxc
8e6fb909d6 add group test 2019-03-05 11:44:54 +08:00
nkorange
116e9119c2 #269 fix send client beat bug 2019-03-05 11:35:58 +08:00
xiaochun.xxc
dd9866a049 add group testcase 2019-03-05 11:07:01 +08:00
nkorange
8c23f34806 #269 fix bug 2019-03-04 17:12:29 +08:00
nkorange
af26af7e6e #502 fix bug 2019-03-04 11:24:41 +08:00
nkorange
7af1b480b8 #269 Support service group 2019-02-18 16:04:55 +08:00
nkorange
36b9b958f9 #634 Fix test case 2019-02-18 08:45:08 +08:00
nkorange
9f5f8bb379 #634 Add push switch 2019-02-18 08:42:24 +08:00
nkorange
469d976aee #502 Fix sync timestamp repeat bug 2019-02-15 11:40:19 +08:00
nkorange
81dd9fbc6b #745 Support service creation in AP mode 2019-02-12 20:11:57 +08:00
nkorange
cba85f0635 #502 Fix licence problem 2019-02-02 15:14:16 +08:00
nkorange
026ec980c5 #502 Fix test case not pass problem 2019-02-02 11:32:39 +08:00
nkorange
e2e11ba119 #502 Most of the functions test OK. 2019-02-01 17:35:49 +08:00
nkorange
d3a4834672 #650 Server list manager detects healthy servers 2019-01-30 10:06:37 +08:00
nkorange
6ebde678d3 #502 Reorganize parameter mapping. 2019-01-23 15:33:20 +08:00
nkorange
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
water.lyl
9947e8565c change default user/password to nacos/nacos 2019-01-22 09:42:25 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
nkorange
38e84cfb62 #502 Fix PMD 2019-01-17 19:50:57 +08:00
nkorange
806e7030d2 #502 Fix bean inject error 2019-01-17 10:15:51 +08:00
nkorange
980e2a62ef Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-01-16 18:12:54 +08:00
xiaochun.xxc
9e652a21df Revert "service list testcases" 
This reverts commit 94eb697e45.
 2019-01-15 19:27:55 +08:00
xiaochun.xxc
5c4662ae48 Revert "rename service list IT case" 
This reverts commit eb83e7607f.
 2019-01-15 19:26:11 +08:00
xiaochun.xxc
e9f0b548c9 Revert "add api testcases”" 
This reverts commit 63c704a1eb.
 2019-01-15 19:25:33 +08:00
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-01-15 18:15:55 +08:00
mingyixu
a689f0f694
Merge branch 'develop' into master 2019-01-15 17:00:43 +08:00
xiaochun.xxc
63c704a1eb add api testcases” 2019-01-15 15:17:07 +08:00
xiaochun.xxc
eb83e7607f rename service list IT case 2019-01-15 15:00:40 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
xiaochun.xxc
94eb697e45 service list testcases 2019-01-15 14:40:03 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2019-01-14 16:59:13 +08:00
nkorange
7abee38ff4 Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# 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/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
 2019-01-14 16:01:58 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# 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/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
 2019-01-14 16:01:14 +08:00
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
nkorange
104a7c55aa #498 Fix test case bug 2019-01-12 22:46:44 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
 2019-01-11 14:08:13 +08:00
qingliang.ql
eb2c33a88e metrics agent 2019-01-11 13:56:37 +08:00
nkorange
ad0a059a1d fix #592 2019-01-11 13:07:08 +08:00
xiaochun.xxc
c0ccbe9e53 update testcases 2019-01-10 16:25:12 +08:00
nkorange
5290c16539 #498 Update test case 2019-01-09 21:08:05 +08:00
Keep
8fdbf685a8
Merge pull request #596 from fudali113/fix-get-remote-ip 
Fixes #595
 2019-01-09 20:35:17 +08:00
xiaochun.xxc
9ff91ba621 testcase assert 2019-01-09 20:20:57 +08:00
xiaochun.xxc
f94c7878f3 add multiTenant api testcases” 2019-01-09 20:10:21 +08:00
xiaochun.xxc
4e1f587665 modify testcases 2019-01-09 16:04:28 +08:00
xiaochun.xxc
48e2dcc041 delete data 2019-01-09 15:52:14 +08:00
xiaochun.xxc
64489edb1e add multi tenant testcases 2019-01-09 15:48:08 +08:00
xiaochun.xxc
0eac9b89ca Revert "add multi tenant testcases" 
This reverts commit f7791b64cf.
 2019-01-09 15:31:17 +08:00
xiaochun.xxc
55e750e3d2 add multi tenant testcases 2019-01-09 15:16:15 +08:00
xiaochun.xxc
f7791b64cf add multi tenant testcases 2019-01-09 15:13:36 +08:00
nkorange
0df5798147 #498 Update test case 2019-01-07 21:17:31 +08:00
xiaochun.xxc
0987ff32a8 增加open api用例 2019-01-07 20:41:13 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
nkorange
3250533516 #526 Make more effort 2018-12-29 13:44:12 +08:00
nkorange
16794d15e5 #523 add switch 2018-12-25 20:59:08 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
nkorange
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0 
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
 2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00
xuechaos
d4edde980b Nacos release 0.6.0 version 
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
 2018-12-07 15:19:43 +08:00
mingyixu
ea1e8ab9dc
Merge pull request #394 from mingyixu/master 
[ISSUE #243]fix Integration testing too long
 2018-12-06 19:42:29 +08:00
mingyixu
c634ff8da2 [ISSUE #243]fix Integration testing too long 2018-12-05 18:56:34 +08:00
mingyixu
e15e902975 [ISSUE #243]fix Integration testing too long 2018-12-05 17:29:48 +08:00
JianweiWang
3f5955f69c
Merge pull request #392 from alibaba/hotfix_cluster_lost_in_instance 
Hotfix cluster lost in instance
 2018-12-05 17:08:48 +08:00
nkorange
baf7d61a70 #388 Add test case. 2018-12-05 15:16:43 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
nkorange
e3e6682231 Modify author info 2018-11-30 13:25:58 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
nkorange
93246b3ded Merge branch 'naming-model-refactor' into develop 
# Conflicts:
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2018-11-16 19:59:15 +08:00
nkorange
57f2ae4eca Update version 2018-11-16 19:41:19 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
nkorange
8df5e5e328 Fix test case error 2018-11-16 15:01:32 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
lingwei.clw
625f3a9159 新增自动注销和自动注册测试用例 2018-11-16 10:02:48 +08:00