wuyoushan
|
e589b29351
|
fix JwtAuthenticationTokenFilter NPE bug
|
2019-01-17 20:39:20 +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 |
|
mingyixu
|
a689f0f694
|
Merge branch 'develop' into master
|
2019-01-15 17:00:43 +08:00 |
|
Fury Zhu
|
663ed1a2f7
|
Merge pull request #627 from alibaba/feature_multi_tenant
Feature multi tenant
|
2019-01-15 16:26:28 +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 |
|
nkorange
|
705a47e5d2
|
#498 fix bug
|
2019-01-15 14:53:30 +08:00 |
|
xiaochun.xxc
|
94eb697e45
|
service list testcases
|
2019-01-15 14:40:03 +08:00 |
|
yanlinly
|
420141fc42
|
Merge pull request #624 from alibaba/login
Login merge to develop
|
2019-01-15 13:37:01 +08:00 |
|
yanlinly
|
8db0420764
|
Merge pull request #623 from wfnuser/login
Login
|
2019-01-15 13:06:51 +08:00 |
|
wfnuser
|
973c522834
|
fix conflict
|
2019-01-15 12:48:28 +08:00 |
|
water.lyl
|
917ab72ca1
|
Fix #381 fix build problem
|
2019-01-15 11:47:14 +08:00 |
|
yanlinly
|
328fb09288
|
Merge pull request #622 from wfnuser/feature/login
Feature/login
|
2019-01-15 10:32:05 +08:00 |
|
water.lyl
|
c9d32ed260
|
Fix #381 fix findbugs
|
2019-01-14 23:21:32 +08:00 |
|
xxc
|
6815902d85
|
Merge pull request #620 from paderlol/develop
The version of the Nacos banner automatically references the maven version
|
2019-01-14 22:42:23 +08:00 |
|
zhanglong
|
bf305eaa0e
|
Fix #619
|
2019-01-14 22:07:49 +08:00 |
|
wfnuser
|
65f2ab2d2c
|
add username and password validator
|
2019-01-14 21:33:57 +08:00 |
|
wfnuser
|
90c4159d06
|
fix conlict
|
2019-01-14 21:08:34 +08:00 |
|
wfnuser
|
062cc07be1
|
the problem of locale
|
2019-01-14 20:48:18 +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 |
|
Fury Zhu
|
15aec2aa61
|
Merge branch 'develop' into feature_subscription_by_query_optional
|
2019-01-14 14:28:53 +08:00 |
|
pader
|
3683c32c66
|
Merge pull request #1 from alibaba/develop
Pull the latest code
|
2019-01-14 11:34:28 +08:00 |
|
water.lyl
|
78f3e44839
|
Fix #381 update mysql user table and security ignore url
|
2019-01-13 20:39:35 +08:00 |
|
water.lyl
|
a25e5eb650
|
Fix #381 disable auth config
|
2019-01-13 13:19:12 +08:00 |
|
nkorange
|
104a7c55aa
|
#498 Fix test case bug
|
2019-01-12 22:46:44 +08:00 |
|
nkorange
|
55e1269ee1
|
#498 Merge develop
|
2019-01-12 22:43:24 +08:00 |
|
Fury Zhu
|
f82e080a64
|
Merge pull request #612 from alibaba/feature_metrics
surpport metrics
|
2019-01-11 19:32:14 +08:00 |
|
Fury Zhu
|
84a64d3846
|
Merge pull request #606 from nanamikon/develop
issue #579 update health in none health check mode through api
|
2019-01-11 19:31:25 +08:00 |
|
qingliang.ql
|
5891ae0a75
|
separate log and metrics
|
2019-01-11 18:03:27 +08:00 |
|
qingliang.ql
|
93d2bd253d
|
fix invoke method error
|
2019-01-11 15:47:42 +08:00 |
|
TsingLiang
|
687fb500ec
|
Merge pull request #593 from alibaba/feature_metrics
Feature metrics
|
2019-01-11 15:13:57 +08:00 |
|
qingliang.ql
|
55c8f038e3
|
merge develop
|
2019-01-11 14:27:19 +08:00 |
|
Keep
|
21b7f96809
|
Merge pull request #446 from lostcharlie/develop
[ISSUE #442] Fix typos in class names and variables.
|
2019-01-11 14:19:43 +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 |
|
nkorange
|
e707c043ad
|
fix #609
|
2019-01-11 10:38:03 +08:00 |
|
nkorange
|
31c95a81c5
|
Merge remote-tracking branch 'origin/feature_multi_tenant' into feature_multi_tenant
|
2019-01-10 18:53:41 +08:00 |
|
nkorange
|
791b7c3739
|
#603 Other files formatted
|
2019-01-10 18:53:18 +08:00 |
|
zhichen
|
1c9290c309
|
Merge pull request #607 from jameslcj/hotfix_499
fix #499
|
2019-01-10 16:58:49 +08:00 |
|
xiaochun.xxc
|
c0ccbe9e53
|
update testcases
|
2019-01-10 16:25:12 +08:00 |
|
nkorange
|
7307108ca7
|
#498 Fix bug
|
2019-01-10 15:51:20 +08:00 |
|
nkorange
|
0b7649880a
|
#603 RaftCore log format
|
2019-01-10 15:50:06 +08:00 |
|
zhichen
|
9789e13bf6
|
fix #499
|
2019-01-10 15:14:51 +08:00 |
|
zhichen
|
b464ce193e
|
fix #499
|
2019-01-10 15:13:37 +08:00 |
|
zhichen
|
3e02d0d595
|
fix #499
|
2019-01-10 15:02:58 +08:00 |
|