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

1026 Commits

Author SHA1 Message Date
nov.lzf
3f06a7a0f8
response model optimize (#3357) 
* Add gprc support-> add grpc log to distribution logback

* Add gprc support-> response model optimize
 2020-07-17 12:03:30 +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
d00c133c3e
Add naming support gRPC for register and deregister instance (#3343) 2020-07-15 20:22:07 +08:00
nov.lzf
139b211e21
Nacos config support gRPC (#3334) 
* Add gprc support-> client side code submit ,and create server side naming module abstract handler template.

* Add gprc support-> config data change  notify code submit....

* Add gprc support-> serve side healthy check code submit and solve some checkstyle problems.

* Add gprc support-> 1.config client worker ,cancel long polling task  2. test add listener,remove listener in config module  3.add response resolve
 2020-07-15 13:56:29 +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
杨翊 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
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
Gagharv
3f145e6374
[ISSUE #2856]Adjust the use of thread pools (naming module) (#3136) 
Change-Id: I626179bd9ee8e852d9d51787950ad80744ec71cd
 2020-06-28 10:59:09 +08:00
Joe
41525b0a5c
Update ServiceController.java (#3176) 
adjust order for start and end ，avoid end value is negative number
 2020-06-28 09:21:28 +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
mai.jh
aac1c6f013
[ISSUE #3160]fix compatibility issue when reading cache files with suffix ".datum" (#3163) 
* fix: #3160

* change the name definition
 2020-06-24 19:18:24 +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
liaochuntao
9a44b920a8
[ISSUE #3107] Style format core (#3108) 
* improvement: merge upstream/develop

* style: format code style

* style: modify pom.xml

* fix: fix code style
 2020-06-18 21:27:49 +08:00
pengzhengfa
961f0d14f2
Schedule naming optimization of cp architecture (#3109) 
* Instance eliminate module naming optimization

* Solve PMD check failed

* Method name optimization

* Solve code space problem

* Method name optimization

* Optimize the naming of persistence layer

* Schedule naming optimization of cp architecture
 2020-06-18 19:17:20 +08:00
杨翊 SionYang
f864880136
[ISSUE #2992] use new code style for nacos-common (#3106) 
* use new code style for nacos-common

* Fix code style file can't set java import problem.
 2020-06-18 17:05:15 +08:00
pengzhengfa
38d0b6bdbe
Method name optimization (#3104) 
* Instance eliminate module naming optimization

* Solve PMD check failed

* Method name optimization

* Solve code space problem

* Method name optimization

* Optimize the naming of persistence layer
 2020-06-18 16:32:14 +08:00
pengzhengfa
d24f36b9eb
Instance eliminate module naming optimization (#3093) 
* Instance eliminate module naming optimization

* Solve PMD check failed
 2020-06-17 21:04:50 +08:00
杨翊 SionYang
67829bb5e3
[ISSUE #2992] Use new code style for nacos-naming (#3090) 
* Update check style to ignore spring bean java doc

* use new code style for nacos-naming
 2020-06-17 18:21:41 +08:00
赵延
aea7dd69ed
[ISSUE #2810] don't send beat when standalone model (#3047) 
* don't send beat when standalone model

* format the code.
 2020-06-17 11:33:34 +08:00
pengzhengfa
ee8da9ba6f
Method name optimization (#3068) 2020-06-15 14:27:44 +08:00
KomachiSion
a614589000 For #2873, unified copyrights for nacos-naming. 2020-06-12 16:04:52 +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
杨翊 SionYang
7f7ee0d5b3
Merge pull request #1877 from ly641921791/issue_1865 
Fix #1865 use DriverManager instead of MysqlDataSource to get the connection
 2020-06-10 14:26:46 +08:00
杨翊 SionYang
e6c578f4e2
Merge pull request #3008 from zhouhailin/develop 
FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一
 2020-06-10 14:01:40 +08:00
杨翊 SionYang
ecf65eec01
Merge pull request #2849 from lin-mt/develop 
fix:#2839
 2020-06-10 10:35:43 +08:00
zhouhailin
2efe317597 FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一 2020-06-09 23:02:18 +08:00
Brian Huang
0f1d0abcc1 hi.here 'addAll()' call can be replaced with parametrized constructor call,performance will be better 2020-06-07 19:55:21 +08:00
lengleng
56eeb35ffc ♻️ Refactoring pom. com.alibaba.nacos to ${project.groupId} Uniform variable 2020-06-06 17:24:37 +08:00
water.lyl
7b8bdc4e71 Merge branch 'develop' of github.com:alibaba/nacos into develop 2020-06-05 09:03:21 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
KomachiSion
3e37ac4bf2 Fix 1.3 version don't report server status to lower version. 2020-06-04 15:09:18 +08:00
liaochuntao
5d9c0798d0
Merge pull request #2940 from Maijh97/fix_http_client_bug 
[ISSUE #2939]
 2020-06-02 21:18:38 +08:00
mai.jh
98ee23e248 fix: #2939 2020-06-02 14:53:09 +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
chuntaojun
c196c8f52f fix: adjust where version information is inserted 2020-06-02 12:32:26 +08:00
chuntaojun
01bb02b943 refactor: long volume, annotation optimization 2020-06-02 10:32:18 +08:00
chuntaojun
3169424605 refactor: optimize old version information synchronization logic 2020-06-01 21:54:29 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
chuntaojun
a7556fa776 fix: fix old version information not available in new version reality issue 2020-06-01 16:59:01 +08:00
chuntaojun
6fb2750021 fix: fixed compatibility issues with older versions 2020-06-01 15:35:21 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +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
KomachiSion
d396a885ea Fix deserialize error for raft beat 2020-05-29 16:22:33 +08:00
KomachiSion
da4cc10e8a Fix deserialize error for raft beat 2020-05-29 15:38:25 +08:00
KomachiSion
fc714dac74 Fix deserialize error for raft beat 2020-05-29 15:14:13 +08:00
KomachiSion
866f134262 Fix circle dependency error in Cluster 2020-05-29 14:18:08 +08:00
KomachiSion
810827c91c Fix serverStatus api jackson error 2020-05-29 12:05:22 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
KomachiSion
90db4f17a9 Replace fastjson with jackson for nacos-naming transport 2020-05-27 15:40:43 +08:00
KomachiSion
3b0e9df9a9 Replace fastjson with jackson for nacos-naming controller and consistency 2020-05-27 15:40:21 +08:00
KomachiSion
eec067ffbd Replace fastjson with jackson for nacos-naming misc 2020-05-27 15:39:41 +08:00
KomachiSion
a980e4ea65 Replace fastjson with jackson for nacos-naming pojo 2020-05-27 15:39:13 +08:00
KomachiSion
61135f6dce Replace fastjson with jackson for naming.core 2020-05-27 15:38:17 +08:00
KomachiSion
ff6e09e58d Handle serialization exception in JacksonUtils 2020-05-26 14:59:23 +08:00
liaochuntao
041416790d
Merge pull request #2880 from jzdayz/develop 
code optimize
 2020-05-26 12:16:00 +08:00
胡晴风
c277d2a438 code optimize 2020-05-25 17:18:05 +08:00
KomachiSion
d34bef36a9 Replace fastjson with jackson for Service 2020-05-25 16:13:37 +08:00
KomachiSion
4607bb7c00 Replace fastjson with jackson for Selector 2020-05-25 16:13:37 +08:00
KomachiSion
5c8ccfde0f Replace fastjson with jackson for naming.Cluster 2020-05-25 16:13:37 +08:00
KomachiSion
8c5bcd8715 Replace fastjson with jackson for health checker. 2020-05-25 16:12:04 +08:00
KomachiSion
70a0bb7c1b replace fastJson with jackson for naming instance 2020-05-25 16:12:04 +08:00
lin-mt
a7bc539d22 fix the style 2020-05-22 08:27:04 +08:00
lin-mt
ba5098eaa3 fix:#2839 2020-05-22 08:02:13 +08:00
liaochuntao
4ddfe0c1c3
Merge pull request #2691 from jiangcaijun/develop 
hashMap constructor : choose more appropriate initialCapacity
 2020-05-21 21:37:33 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
5e281892a1 refactor: remove debug log 2020-05-07 00:33:06 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +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
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
jiangcaijun
2b10aebb76 hashMap constructor : choose more appropriate initialCapacity 2020-04-26 17:19:18 +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
wangwei
dcdbaf50ea use MD5Utils replace MD5 2020-04-20 14:18:23 +08:00
wangwei
aeb14910e7 unify the MD5 generation on both sides by MD5 utility classes in the common module 2020-04-19 18:42: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
42626c029b docs: 2020-04-03 19:06:55 +08:00
chuntaojun
9f8c19cafb refactor: Change the distributed ID logic 2020-04-02 19:24:11 +08:00
Peter Zhu
fea9e2d09e
Merge pull request #2550 from nkorange/hotfix_client_beat_lost_in_redirect 
Hotfix client beat lost in redirect
 2020-03-31 11:07:17 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
Peter Zhu
b7a2c756fe
Merge pull request #2403 from lkxiaolou/develop 
fix checksum bug #2401
 2020-03-29 23:01:48 +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
a74d057d6d Fix #2537 2020-03-27 17:57:29 +08:00
nkorange
b29e6dc33b Fix #2537 2020-03-27 16:50:37 +08:00
nkorange
5b8d8fd763 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-27 15:48:40 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
qq213539
88e65ff1b9 fix #2533 2020-03-27 00:07:52 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
lkxiaolou
83c098b8ca 统一md5计算 2020-03-14 17:54:06 +08:00
chuntaojun
a659493205 refactor: Uniform configuration format 2020-03-09 15:57:22 +08:00
chuntaojun
8b848873e4 docs: 2020-03-09 15:48:31 +08:00
chuntaojun
0a325bf9c7 fix: fix merge confilt 2020-03-09 15:38:03 +08:00
Peter Zhu
f4c527f9b6
Merge branch 'master' into develop 2020-03-09 11:33:31 +08:00
chuntaojun
0886653a08 feat(naming): Support empty service cleanup task time configurable 2020-03-08 00:00:44 +08:00
chuntaojun
4f264fed2d style(naming): Variable name specification 2020-03-07 11:39:08 +08:00
chuntaojun
86e3b0dbc9 fix(naming): Fixed a namespace parameter passing error 2020-03-06 19:33:06 +08:00
chuntaojun
f8fb011bd6 fix(naming): Fixed finalizeCnt error count problem 2020-03-06 16:36:50 +08:00
chuntaojun
f65e4fcbc0 refactor(naming): Optimize the empty service removal logic 2020-03-06 16:32:59 +08:00
chuntaojun
502e9c7597 feat(naming): Support for automatic removal of empty services 2020-03-06 11:42:05 +08:00
lkxiaolou
e70787b25b commit 2020-03-03 18:47:13 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
lkxiaolou
c7ca2c1df4 改为threadLocal实现 2020-03-03 16:22:00 +08:00
lkxiaolou
b76c040826 fix checksum bug 2020-03-03 15:41:25 +08:00
nkorange
043a091445 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-02 16:47:28 +08:00
jzdayz
deab304d5b fix log error 2020-02-27 14:41:25 +08:00
jzdayz
1b9e1db351 去掉重复代码 2020-02-27 14:33:47 +08:00
nkorange
0f513c1f20 Merge remote-tracking branch 'upstream/develop_1.2.0' into develop_1.2.0 2020-02-23 20:03:10 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
zhixiang.yuan
c2743f90eb #2381 modify taskDispatchPeriod defalue value 2020-02-22 19:37:26 +08:00
zhixiang.yuan
aa141e0aac update taskDispatchPeriod default value 2020-02-21 15:24:42 +08:00
nkorange
13126a3af6 Add namespace page access control 2020-02-11 12:26:04 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
e0f9398e91 #1105 fix bug 2020-02-05 14:02:15 +08:00
nkorange
374c575c79 #1105 fix bug 2020-02-04 17:21:33 +08:00
nkorange
23a44df512 #1105 fix bug 2020-02-04 09:27:02 +08:00
Peter Zhu
1d148202ef
Merge branch 'master' into hotfix_distro_load_data_failed_cause_start_failed 2020-01-16 13:59:49 +08:00
rushsky518
b1ffbad483 #2237 directly use byte[] 2020-01-15 11:52:13 +08:00
rushsky518
c99747609f revert 2020-01-13 11:27:46 +08:00
nkorange
7a17ad28e2 Fix CI error 2020-01-12 16:43:23 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control 
Feature access control
 2020-01-10 17:54:29 +08:00
rushsky518
0d304c0b7d #2237 1. use ByteArrayEntity 2. getDeclaredMethods 2020-01-10 17:50:17 +08:00
Peter Zhu
8df4c0ed54
Merge pull request #2286 from lidaoyang/hotfix_2285 
Hotfix 2285
 2020-01-10 17:48:52 +08:00
lidaoyang
848b1b1349 Fix #2285 2020-01-10 17:38:21 +08:00
lidaoyang
ac502b305b Fix #2285 2020-01-10 17:11:55 +08:00
lidaoyang
3aa42b6014 Revert "Fix #2285" 
This reverts commit 1d9495d5
 2020-01-10 17:10:34 +08:00
wb-ldy613915
1d9495d50b Fix #2285 2020-01-10 15:33:59 +08:00
rushsky518
91368b4389 #2245 correct log config 2020-01-10 14:46:32 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
f32d6c864a #2232 Code consistency 2020-01-06 16:27:01 +08:00
nkorange
95a9ba9a98 Fix #2258 2020-01-06 16:09:56 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
ca1d85c852 Fix #2232 2019-12-27 17:47:54 +08:00
nkorange
aef7565403 #1105 Access control finish 82% 2019-12-19 15:33:20 +08:00
Peter Zhu
bf10a32a0b
Merge pull request #2149 from codeimport/develop-fuzzyget-subscriber 
[ISSUE #2148] subscribers list page support fuzzy query
 2019-12-19 11:35:18 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
Peter Zhu
264f686d1c
Merge pull request #2142 from easyhaloo/code_optimization 
refactor #2134 optimization code
 2019-12-12 22:42:20 +08:00
nkorange
2460dcddcb #1105 Access control finish 70% 2019-12-12 21:50:34 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
codeimport
7b31daf89b add test case 2019-12-06 19:06:12 +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
codeimport
c01e3e88b6 fuzzy search subscribers 2019-12-04 19:49:36 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
Peter Zhu
3b19a30a32
Merge pull request #2085 from lzf971107/a_1 
optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type
 2019-11-25 13:20:23 +08:00
黄大相
31a59e8451 fix 2025 2019-11-21 16:19:51 +08:00
withthewind
ec6e52ee9d optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type 2019-11-21 15:59:28 +08:00
nkorange
3a4de81981 Fix client beat task executing when health check is disabled. 2019-11-11 16:05:33 +08:00
nkorange
b9c3b545ba fix #1842 2019-11-11 00:50:29 +08:00
Fury Zhu
5cd905c9a3
Merge pull request #2012 from satjd/issue1994 
make RequestVote RPC handler thread-safe
 2019-11-07 18:56:10 +08:00
Fury Zhu
6176360597
Merge pull request #1971 from sheiy/develop 
issues:调用修改实例接口,未传的参数值会被清空
 2019-11-07 16:28:49 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
satjd
7968dbb008 make RequestVote RPC handler thread-safe 2019-11-05 17:54:55 +08:00
sheiy
96f81e0db4 issues:调用修改实例接口,未传的参数值会被清空 
https://github.com/alibaba/nacos/issues/1957
 2019-11-04 10:42:32 +08:00
nkorange
f57a3d8781 #1947 add test cases. 2019-11-04 10:30:08 +08:00
nkorange
92bbf9ef22 fix #1947 2019-10-31 20:51:06 +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
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp 
Feature mcp
 2019-10-22 18:02:15 +08:00
nkorange
4c5d42466e Add switch to turn on/off MCP server 2019-10-22 17:33:28 +08:00
Fury Zhu
f54785c999
Merge branch 'develop' into develop 2019-10-22 11:39:20 +08:00
Beldon
3e03462038 fix the CI errors 2019-10-21 23:16:58 +08:00
Beldon
92fcfce50a clean code 2019-10-21 22:53:02 +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
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
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +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
Nicholas2015
5939cec9bc fix the getting subscribers error 2019-10-17 22:47:40 +08:00
nkorange
21e7bcdde0 #1409 Fix PMD 2019-10-15 18:07:27 +08:00
satjd
299c533c6c fix #1916 2019-10-11 11:28:58 +08:00
ly
e189cca8f0 Fix #1865 2019-09-25 19:06:47 +08:00
nkorange
f0c19859ce #1873, set default server expire timeout to 10 seconds and configurable. 2019-09-25 16:15:31 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
nkorange
9cf3f5747e Add synchronized when add/remove instance 2019-09-21 15:09:19 +08:00
Fury Zhu
43d44d015a
Merge pull request #1836 from universefeeler/improve_instance_health_flag 
[ISSUE 182]Improve instance health flag
 2019-09-20 14:59:13 +08:00
universefeeler
5413402869 improve(triggerFlag): improve instance health flag 2019-09-19 20:03:09 +08:00
Beldon
514ae80c9a merge 2019-09-18 21:20:27 +08:00
Beldon
977e2f76b7 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
 2019-09-18 21:18:04 +08:00
universefeeler
c0a6adc083 chore(reiggerFlag): delete unused function 2019-09-18 12:04:48 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
universefeeler
0f3c9f3c87 improve(triggerFlag): adjust triggerFlag calculation chance 2019-09-17 19:52:12 +08:00
Fury Zhu
e24a75c2bc
Merge pull request #1822 from EZLippi/hotfix/fix1665 
ISSUE #1665
 2019-09-17 14:46:13 +08:00
Fury Zhu
1e9fefca34
Merge pull request #1828 from universefeeler/fixed_cluster_page_bug 
[ISSUE#1602] Fixed cluster page show bug
 2019-09-17 14:28:02 +08:00
universefeeler
54ae846cb7 improve(instanceHealth): add update logic 2019-09-10 15:53:26 +08:00
universefeeler
f95215f218 chore(triggerFlag): adjust some details 2019-09-09 21:25:38 +08:00
universefeeler
935918ed9e improve(triggerFlag): add pre check for triggerFlag 2019-09-09 20:24:59 +08:00
fox
d3b586b8e7
Merge pull request #4 from alibaba/develop 
update
 2019-09-09 17:45:07 +08:00
universefeeler
7f0bcaa5cb feature(triggerFlag): add triggerFlag for service 2019-09-09 10:48:11 +08:00
pbting
1ecd5f385c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 21:22:16 +08:00
wangchenjun
8162533179 Make error information more specifically 2019-09-06 17:57:53 +08:00
Fury Zhu
29a013816a
Merge pull request #1752 from ly641921791/issue_1671 
[ISSUE] #1671 Unified request header "Client-Version"
 2019-09-06 15:06:16 +08:00
Fury Zhu
ad5405937d
Merge pull request #1760 from finalcola/fix1652 
[ISSUE #1652] Update service description error in Open API Guide
 2019-09-06 14:35:33 +08:00
pbting
2431edae4c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 13:27:52 +08:00
pbting
5e7be63343 Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface 2019-09-06 12:19:53 +08:00
pbting
46bcece7aa repair speel error and add debug log 2019-09-06 12:19:16 +08:00
universefeeler
663296f54e chore(cluster): delete no used note 2019-09-04 21:39:33 +08:00
universefeeler
473381b53d fixed(cluster): fixed raft cluster state 2019-09-04 17:52:06 +08:00
nkorange
4459dc73b9 Fix #1764 2019-08-30 10:15:38 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
ly
721c5a4a58 Compatible with older versions 2019-08-27 23:56:45 +08:00
ezlippi.ouyang
f6da60ee55 fix: fix #1665 2019-08-24 11:38:46 +08:00
zyy
3c910457ec Update service description error in Open API Guide 2019-08-23 19:50:59 +08:00
ly
11b1d5128e Merge remote-tracking branch 'upstream/develop' into issue_1671 2019-08-23 00:41:51 +08:00
ly
3b4767384d [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:02:00 +08:00
赵禹光
ea924e8b14 use API to create param 2019-08-22 11:03:47 +08:00
赵禹光
5b3690b823 use API to create param 2019-08-22 10:54:05 +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
pbting
ce66b46e8a resolve conflict 2019-08-16 09:58:57 +08:00
pbting
be7237e8ae merge upstream develop the latest code 2019-08-15 16:48:43 +08:00
pbting
7c5b00291b Normalize http response entity with ResponseEntity by spring 2019-08-09 12:33:13 +08:00
pbting
68f170c930 repair httpGetLarge#httpGetLarge will call entity.getContentType().getElements() the contentType is NPE 2019-08-09 12:15:05 +08:00
pbting
6496ae5cd6 support datum is null case 2019-08-09 10:55:38 +08:00
pbting
f09909cd1f 1. Optimize log printing 
2. Improve the robustness and readability of your code
 2019-08-09 10:25:42 +08:00
nkorange
48ff738511 Use dynamic server version 2019-08-08 11:44: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
pbting
19a5ac632c RunningConfig support get from spring.properties configuration file 2019-08-06 16:43:48 +08:00
pbting
da8e09ff4b if not set the context path with the WebServerInitializedEvent then real '/' is context path 2019-08-06 15:45:53 +08:00
pbting
25a87a8e22 Subject to the actual startup context path 2019-08-06 15:39:16 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
nkorange
d6c5a76dd1 Fix bug 2019-08-02 12:32:11 +08:00
赵禹光
6ecabd70e7 reverse Service Name and Group Name 2019-08-01 21:37:26 +08:00
赵禹光
3085bcf67e Unified constant use 2019-08-01 21:00:24 +08:00
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
赵禹光
408b36307d Delete the code that caused the list multi-element 2019-08-01 20:30:10 +08:00
赵禹光
d9d79dd21c Remove unnecessary code 2019-08-01 20:28:33 +08:00
赵禹光
8d2711ae60 revert error code 2019-08-01 20:26:23 +08:00
赵禹光
87850d46b8 Merge commit 'df82ed3c296b12c3731badc40b1f881e5f1c183b' into zen5 
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-08-01 19:55:10 +08:00
Fury Zhu
bf3e822d5b
Merge pull request #1576 from zhaoyuguang/fix-1535-1 
FIX close: 1535 Add a button to hide the empty service on console at service list page
 2019-08-01 15:52:25 +08:00
赵禹光
9745e87079 clear code 2019-08-01 15:38:05 +08:00
赵禹光
50fb50e6a1 no message 2019-08-01 12:33:29 +08:00
赵禹光
a5b67493e8 Merge commit '838ef83f9f19d25a9f29c808d77d7ea4a6854ee2' into fix-1535-1 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-08-01 11:16:43 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3 
format code
 2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization 
Fix #290
 2019-08-01 11:02:55 +08:00
赵禹光
cc27d67ef9 没有过滤条件直接返回原始Service列表 2019-08-01 09:33:49 +08:00
赵禹光
22b0ed7cc0 fix CI 2019-07-31 21:09:21 +08:00
赵禹光
ee0c469471 后端支持 2019-07-31 21:03:49 +08:00
pbting
3d1cf6e092 Merge branch 'upstream_develop' into feature_enhance_interface 2019-07-31 16:25:56 +08:00
Fury Zhu
e5df89fde1
Merge pull request #1623 from nkorange/feature_forbid_invalid_namespace 
Fix namespace vulnerability
 2019-07-30 16:36:36 +08:00
Fury Zhu
1c68568f4d
Merge pull request #1587 from rushsky518/develop 
distro use local time to record heartbeat
 2019-07-30 16:35:16 +08:00
赵禹光
de49db7ee6 Merge commit 'dea95fa11af55f3da8bc6d4cfe3e1ee8842cb9ee' into zen5 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-07-30 15:48:37 +08:00
nkorange
207e54631c Fix namespace vulnerability 2019-07-30 00:40:21 +08:00
nkorange
e5d0d66492 Fix #1591 2019-07-26 17:10:02 +08:00
nkorange
8d453e62a8 Fix #1591 2019-07-23 16:36:55 +08:00
rushsky518
e259dc34e8 #1529 
distro 使用本地时间记录心跳
 2019-07-22 19:24:46 +08:00
pbting
2e2f480c06 add method for ServiceManager with putServiceIfAbsent 2019-07-18 16:28:12 +08:00
pbting
13784d6217 support when instance heartbeat timeout will publish an event 2019-07-18 15:00:30 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
赵禹光
31e81e05f6 Merge commit '06304f583c27034337c16babfb99bbf004b78191' into zen5 2019-07-12 23:38:54 +08:00
赵禹光
7d0aebccbc fix 1541 2019-07-12 23:38:35 +08:00
pbting
d5bd6b4927 enhance serviceManager#removeInstance interface 2019-07-12 17:20:39 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
ff804eb340 ClientBeatCheckTask.java useless import 2019-07-11 20:14:04 +08:00
得少
14ac4ac1d1 support ServiceChangeEvent 2019-07-10 17:49:34 +08:00
nkorange
1915e9c087 Fix NPE 2019-07-09 18:59:52 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
得少
48918cbbc7 change the design for nacos address 2019-07-04 21:50:43 +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
defe701737
Merge pull request #1446 from Nicholas2015/hotfix_subscriber_array_494 
Collective data de-duplication
 2019-06-30 22:35:36 +08:00
Nicholas2015
71ee840111 Collective data de-duplication 2019-06-29 12:59:35 +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
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
caoyixiong
781273faa6
Merge pull request #5 from alibaba/develop 
merge
 2019-06-25 21:47:24 -05:00
caoyixiong
56be528ce4 format code and remove useless 2019-06-25 17:36:43 +08:00
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11 
【issue】#1278
 2019-06-24 14:21:22 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier 
optimize modifier access
 2019-06-24 10:17:39 +08:00
Fury Zhu
042b7a2268
Merge pull request #1353 from IanCao/master 
TTL and client beat interval should be customized at instance level.
 2019-06-24 10:16:12 +08:00
Fury Zhu
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
Nicholas2015
dbf6d45bf4 add page info 2019-06-22 13:31:00 +08:00
caoyixiong
1decd04008 #1278 2019-06-21 11:41:55 +08:00
IanCao
490f194b82 server update client interval 2019-06-20 17:53:28 +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
Fury Zhu
cca2ca9752
Merge pull request #1373 from IanCao/fix11 
Just return empty instance list if service not found #1367
 2019-06-19 15:34:17 +08:00
IanCao
e6631316b4 add ClientBeatCheckTaskTest junit test 2019-06-18 17:32:14 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
Fury Zhu
5fba6242ef
Merge pull request #1297 from Nicholas2015/feature_get_subscribers 
Feature get subscribers
 2019-06-17 17:24:47 +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
IanCao
838eb60cc5 add testcase 2019-06-14 17:46:42 +08:00
IanCao
581e732305 Just return empty instance list if service not found #1367 2019-06-14 17:40:33 +08:00
Nicholas2015
13331c50d1 add assert 2019-06-13 22:41:54 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
caoyixiong
dbbb456e87
Merge pull request #2 from alibaba/master 
merge
 2019-06-12 21:00:53 -05:00
IanCao
266f81a01e format code 2019-06-13 09:57:11 +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
ba7cbf1a7f FIX BUG 2019-06-11 16:34:34 +08:00
IanCao
63560370ae Different instance has different TTL. 2019-06-11 14:40:28 +08:00
Fury Zhu
4ad21f2dae
Merge branch 'develop' into master 2019-06-10 16:24:16 +08:00
Fury Zhu
555e323302
Merge pull request #1258 from universefeeler/master 
[ISSUE #876] feature(console):support console show cluster node state
 2019-06-10 16:16:36 +08:00
IanCao
574a47ca6d remove useless code 2019-06-10 16:05:52 +08:00
IanCao
eee5b34d39 format code 2019-06-10 15:38:58 +08:00
Nicholas2015
6be91e9b45 add assert 2019-06-09 21:33:56 +08:00
Nicholas2015
e1c1b32ae7 add assert 2019-06-09 20:27:16 +08:00
Nicholas2015
7d52d47f74 add test case 2019-06-08 20:52:10 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
Nicholas2015
dc61375c29 common params to constant 2019-06-05 21:48:25 +08:00
nkorange
6521aa3783 Fix #1334 2019-06-05 17:54:25 +08:00
universefeeler
4fe09db8ab fixed(naming): add licensed for ClusterStateView.java 2019-06-05 14:56:34 +08:00
universefeeler
ef8e1aac36 Merge remote-tracking branch 'upstream/develop' 2019-06-04 23:43:37 +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
Nicholas2015
bbb2108fd2 code format and some code detail 2019-06-04 17:10:27 +08:00
Fury Zhu
403e9b830a
Merge pull request #1303 from IanCao/master 
close stream safety & format code
 2019-06-04 16:12:03 +08:00
Fury Zhu
f2c061040c
Merge pull request #1309 from IanCao/fixbug2 
FIX #1308
 2019-06-04 16:09:30 +08:00
nkorange
fbc72f0def Close #1319 2019-06-04 15:03:05 +08:00
IanCao
dd8ee44d65 fix 2019-05-31 16:14:58 +08:00
IanCao
40188f5eda fix bug 2019-05-31 15:38:34 +08:00
IanCao
8acce1c5e2 format code 2019-05-31 15:28:34 +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
Nicholas2015
20af90b821 add license 2019-05-29 22:54:35 +08:00
Nicholas2015
f6d4ee1252 get subscriber list 2019-05-26 23:43:58 +08:00
universefeeler
c15276cfcb [ISSUE #876] feature(console):support console show cluster node state 2019-05-23 02:41:41 +08:00
Fury Zhu
dd029a913a
Merge pull request #1240 from nkorange/feature_enable_to_enabled 
Fix #1007
 2019-05-20 19:24:57 +08:00
nkorange
3148ba0e91 Fix #1007 2019-05-20 12:39:43 +08:00
Andy
22310d0f18 Correct some unit test cases 2019-05-18 21:14:20 +08:00
Andy
2bb33878b9 Quick fixing for the cluster deserialization issue 2019-05-16 21:41:09 +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
XCXCXCXCX
23454ffd84 fix something 2019-05-12 10:32:09 +08:00
XCXCXCXCX
6dc3882eef fix something 2019-05-10 13:47:22 +08:00
XCXCXCXCX
c137994384 fix pmd 2019-05-09 11:31:03 +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
dungu.zpf
33de06a55e Fix #1062 2019-05-09 10:18:12 +08:00
XCXCXCXCX
af8e0951ad expose endpoint for front 2019-05-09 09:57:44 +08:00
XCXCXCXCX
6695805c69 Let nacos-server.jar import external jar package 2019-05-08 09:14:54 +08:00
Fury Zhu
968a69c260
Merge pull request #1151 from jifengnan/develop 
[ISSUE #1150] Correct the Relationship between Services and Clusters
 2019-05-08 08:22:25 +08:00
Andy
8e29a348a9 Deleted the chinese comments 2019-05-07 21:24:57 +08:00
XCXCXCXCX
ef7e250675 do not allow to add same type 2019-05-05 14:55:31 +08:00
Andy
4fd773b534 Rollback to use NamingUtils to grab service name and group name 2019-05-04 21:06:31 +08:00