Commit Graph

772 Commits

Author SHA1 Message Date
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