Commit Graph

2453 Commits

Author SHA1 Message Date
mai.jh
fa6bf9951d remove extra blank lines 2020-06-11 09:34:15 +08:00
mai.jh
a83241205c optimize response handler, remove AsyncRestOperations,RestOperations. 2020-06-01 23:51:53 +08:00
mai.jh
379aa15c85 Added syntax compatible with Java 6 2020-06-01 16:02:41 +08:00
mai.jh
8768de406c Merge code. 2020-06-01 15:49:28 +08:00
mai.jh
177b8aa61c
Merge branch 'develop' into develop 2020-06-01 15:45:25 +08:00
mai.jh
4fc79b012f code format. 2020-06-01 15:42:20 +08:00
TsingLiang
a8c5a8da26
Merge pull request #2924 from alibaba/feature_1.3.0_beta_grpc_perf
Feature 1.3.0 beta grpc perf
2020-06-01 14:09:12 +08:00
mai.jh
0c02111eb1 add class file license. 2020-05-31 18:19:06 +08:00
mai.jh
7e05f3e18e add class file license. 2020-05-31 18:18:41 +08:00
mai.jh
031c9ef521 perfect NacosRestTemplate and restResult 2020-05-31 17:24:01 +08:00
mai.jh
2b7ebbf5bc test change 2020-05-31 00:23:58 +08:00
mai.jh
6f3b3e3c9b test change 2020-05-31 00:10:14 +08:00
mai.jh
11cc8dad02 Resolve conflicts 2020-05-30 23:56:17 +08:00
mai.jh
066968e9ca
Merge branch 'develop' into develop 2020-05-30 23:47:51 +08:00
mai.jh
a3a64c5fa3 change annotate 2020-05-30 23:20:22 +08:00
mai.jh
ea03121e26 add NacosRestTemplate and NacosAsyncRestTemplate test example 2020-05-30 22:39:04 +08:00
chuntaojun
5fceafac3f refactor: optimize the error message prompt 2020-05-30 17:28:25 +08:00
chuntaojun
75c9a5e21b refactor: modift TimerContext logger level 2020-05-29 20:58:03 +08:00
chuntaojun
a1b4653d68 fix: fix unit tests that do not conform to PMD 2020-05-29 20:14:52 +08:00
chuntaojun
5dcee2f1c6 fix: fix pmd 2020-05-29 19:59:08 +08:00
chuntaojun
dc416377dc fix: fix startup failure 2020-05-29 19:32:39 +08:00
chuntaojun
a26f369d95 Merge remote-tracking branch 'origin' into feature_1.3.0_beta_grpc_perf 2020-05-29 18:42:16 +08:00
chuntaojun
a5661f033d feat: add the metircs 2020-05-29 18:42:14 +08:00
mai.jh
57ca56c07b add async http request client 2020-05-29 18:09:04 +08:00
TsingLiang
ea4a029ca4
Merge pull request #2918 from KomachiSion/develop-issue#2842
[ISSUE #2842] Fix serverStatus api jackson error
2020-05-29 17:41:17 +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
liaochuntao
d62390cee7
Merge pull request #2729 from showkawa/develop
最近在阅读贵公司源码时候,本地代码工具扫描出几处Performance defect: Iteration can be replaced…
2020-05-29 12:07:18 +08:00
KomachiSion
810827c91c Fix serverStatus api jackson error 2020-05-29 12:05:22 +08:00
mai.jh
92ca0e1d66 Remove extra lines 2020-05-28 22:25:28 +08:00
chuntaojun
5cd5ca35b8 refactor: merge develop 2020-05-28 20:14:47 +08:00
mai.jh
0d775ea665 change http client implementation, Unified apacheHttpClient 2020-05-28 18:24:58 +08:00
mai.jh
238b2386a7 change http client implementation, Unified apacheHttpClient 2020-05-28 18:23:29 +08:00
yanlinly
93f8533565
Merge pull request #2914 from KomachiSion/develop-issue#2842
[ISSUE #2842] Fix replaced error
2020-05-28 17:02:02 +08:00
mai.jh
52426d43b5 change http client implementation, Unified apacheHttpClient 2020-05-28 14:38:01 +08:00
KomachiSion
73a2ba634b Fix spelling error 2020-05-28 10:46:12 +08:00
mai.jh
377bbb88cf Add some callouts 2020-05-28 10:45:33 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
mai.jh
d08eac6882 change http client implementation, Unified apacheHttpClient 2020-05-28 10:36:19 +08:00
mai.jh
6086089314 fix #2858 Provide nacosRestTemplate implementation 2020-05-28 00:14:42 +08:00
chuntaojun
e8533155c7 fix: fix startup problem 2020-05-27 22:05:38 +08:00
yanlinly
cb1ef7ef90
Merge pull request #2904 from KomachiSion/develop-issue#2842
[ISSUE #2842] Replace Fastjson with Jackson except nacos-test module
2020-05-27 21:06:26 +08:00
chuntaojun
6525b5a6f8 fix: fix startup read failure 2020-05-27 18:37:36 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +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