Commit Graph

2470 Commits

Author SHA1 Message Date
zongtanghu
15fad5d98a [#1815]remove destroyService from Factory Class. 2020-06-03 19:19:29 +08:00
zongtanghu
860a2d02b1 resolve codes conflicts 2020-06-03 17:41:22 +08:00
zongtanghu
94c41e11d1 [#1815]fix unit test cases. 2020-06-03 17:35:49 +08:00
zongtanghu
09752e354d [#1815]adjust this keywords which just includes constructor and set method in the class and fix some unit test cases. 2020-06-03 17:35:06 +08:00
yanlinly
7ac0ff83b8
Merge pull request #2947 from KomachiSion/develop-issue#2842
[ISSUE #2842] Replace all fastjson with jackson
2020-06-03 17:27:13 +08:00
zongtanghu
c726dd0665 Merge branch 'feature_lifecycle' of https://github.com/zongtanghu/nacos into feature_lifecycle 2020-06-03 14:58:46 +08:00
zongtanghu
e86c158262 resolve codes conflicts 2020-06-03 14:57:46 +08:00
KomachiSion
74a2995709 Remove fastjson LICENSE 2020-06-03 14:43:12 +08:00
KomachiSion
56da41357e Remove fastjson dependency from pom 2020-06-03 14:42:25 +08:00
KomachiSion
e9adf975af Replace fastjson with jackson for nacos-test/naming 2020-06-03 14:39:28 +08:00
KomachiSion
4dbe81418b Replace fastjson with jackson for nacos-test/auth 2020-06-03 14:39:17 +08:00
KomachiSion
c0b4385287 Replace fastjson with jackson for nacos-test/config 2020-06-03 14:39:05 +08:00
KomachiSion
9e21a2cf46 Replace fastjson with jackson for nacos-test/common 2020-06-03 14:38:23 +08:00
zongtanghu
0320e5851c Merge remote-tracking branch 'upstream/master' into feature_lifecycle 2020-06-03 13:36:51 +08:00
zongtanghu
5e2840a6bd [#1815]adjust and optimize codes. 2020-06-03 10:46:41 +08:00
liaochuntao
5d9c0798d0
Merge pull request #2940 from Maijh97/fix_http_client_bug
[ISSUE #2939]
2020-06-02 21:18:38 +08:00
zongtanghu
2ab274216a [#1815]adjust and optimize codes, reput the lifecycle to ConfigService class level at the same time. 2020-06-02 19:55:30 +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
liaochuntao
3c23ed09b9
Merge pull request #2938 from alibaba/hotfix_naming_compatibility
[#2933] adjust where version information is inserted
2020-06-02 14:10:27 +08:00
chuntaojun
c196c8f52f fix: adjust where version information is inserted 2020-06-02 12:32:26 +08:00
yanlinly
dc9d1368fe
Merge pull request #2934 from alibaba/hotfix_naming_compatibility
[#2933] fixed compatibility issues with older versions
2020-06-02 10:55:01 +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
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
zongtanghu
8d6dd8f41b [#1815]adjust codes and reput the lifecycle to ConfigService class level. 2020-06-01 17:57:35 +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
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
zongtanghu
ab3b234987 [#1815]add class file license. 2020-05-31 13:26:27 +08:00
zongtanghu
2cb690a6a0 [#1815]add class file license. 2020-05-31 13:26:06 +08:00
zongtanghu
6d1baed235 [#1815]add the related lifecycle test cases codes. 2020-05-31 12:20:20 +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
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +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
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
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
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +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
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