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

717 Commits

Author SHA1 Message Date
nov.lzf
b1a587dc72
Add gprc support-> add server push ack (#3478) 2020-07-30 16:00:22 +08:00
杨翊 SionYang
1a22ae4c47
Fix checkstyle error (#3467) 
Fix checkstyle error (#3467)
 2020-07-29 16:09:35 +08:00
杨翊 SionYang
8dfdc81481
[ISSUE #1097]grpc support all namingService api (#3425) 
* grpc support query service name list api

* grpc support query server healthy api
 2020-07-23 15:22:07 +08:00
nov.lzf
50a298c9af
switch server optimize and loader balance base on max client count (#3420) 
* Add gprc support-> authentication on client

* Add gprc support-> optimize switch server and submit loader balance base on up limit clients count.
 2020-07-23 10:26:25 +08:00
nov.lzf
b28636c6de
notify connect listeners on start up (#3405) 
* Add gprc support-> try to connect the server synchronous on start up , start a thread to connect to server until successfully connected when fail.

* Add gprc support-> notify connect listeners.

* Add gprc support-> update client reconnect  strategy.

* Add gprc support-> optimize push config request param model and meta request.

* Add gprc support-> notify on new connected
 2020-07-21 20:08:38 +08:00
杨翊 SionYang
115c992c98
[ISSUE #3386] Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService (#3402) 
* Refactor HostReactor.java to ServiceInfoHolder and ServiceInfoUpdateService

* Use http client as default implement of some uncompleted api
 2020-07-21 15:02:44 +08:00
mai.jh
75a06834f5
unified implementation of http client package division (#3400) 2020-07-21 14:53:03 +08:00
nov.lzf
53031ba08b
strengthen exception handle both on server and client ; status transfer bug fix on client (#3401) 
* Add gprc support->test submit

* Add gprc support-> Strengthen exception handling of server push handler process both at client and server

* Add gprc support-> starting status bugfix and  base push model submit
 2020-07-21 14:44:01 +08:00
杨翊 SionYang
571ae62de1
Move BeatReactor into HttpClientProxy (#3394) 2020-07-20 20:48:21 +08:00
杨翊 SionYang
2e4d50c4f2
Extract server list maintain logic to ServerListManager (#3389) 2020-07-20 17:52:58 +08:00
杨翊 SionYang
39986a867a
[ISSUE #3386] Extract NamingClientProxy Interface (#3387) 
* Move and rename NamingProxy.java

* rename package naming.net --> naming.remote

* Create Naming client proxy interface
 2020-07-20 16:32:07 +08:00
nov.lzf
85a0398978
1.server side client connection listener optimize 2. listen context and notifier updated . (#3385) 
* Add gprc support-> client reconnection optimize

* Add gprc support-> 1.client connection listener optimize  2.listen context an notifier updated .

* Add gprc support->merge problem fix

* Add gprc support->check style fixed.

* Add gprc support->check style fixed and remove  gRpc classes in source package.
 2020-07-20 16:27:58 +08:00
杨翊 SionYang
e5f0c368c9
Hotfix client sdk depend jdk7 charset. (#3376) 2020-07-18 23:01:32 +08:00
杨翊 SionYang
cda3f14230
Hotfix client sdk depend jdk7 charset. (#3374) 2020-07-18 16:36:10 +08:00
KomachiSion
79c8521bde Merge branch 'upstream-develop' into feature_support_grpc_core 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
#	client/src/main/java/com/alibaba/nacos/client/config/http/HttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java
#	client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/LongPollingService.java
 2020-07-18 16:28:00 +08:00
杨翊 SionYang
3bde28294d
[ISSUE #1097] Naming support un/subscribe service by grpc. (#3373) 
* For #1097, server support subscribe service.

* For #1097, client support subscribe service.

* For #1097, server and client support unsubscribe service.
 2020-07-18 16:07:21 +08:00
mai.jh
63a4e30ae6
[ISSUE #3224]nacos-client module http client replace (#3348) 
* nacos-client module http client replace

* fix code style problem

* add HashMap initialCapacity

* fix code style problem

* Modify the header object, keep the original response header to avoid modifying the original logic code

* fix code style problem

* naming http client request exception messages output change

* Merge code
 2020-07-18 14:42:02 +08:00
nov.lzf
4a702f8954
Add gprc support-> client reconnection optimize (#3367) 2020-07-17 20:57:52 +08:00
nov.lzf
688013bbb6
Add gprc support-> client reconnection optimize (#3365) 2020-07-17 17:42:46 +08:00
Hu Zongtang
9f12f76d6c
[ISSUE#2859]fix no throw exception when publish event but no subsciber. (#3364) 2020-07-17 16:12:32 +08:00
nov.lzf
b10a24885e
add server side connection listener ,and add client version (#3350) 
* Add gprc support-> 1.add server side client connection event listener ，base on heart beat expire time check  2.add client version  info after grpc connection build

* Add gprc support-> add publish config and remove config in rpc channel ;and rename server push response handler
 2020-07-16 19:21:38 +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
nov.lzf
0aad8f55eb
support config query in rpc channel ,add switch http/rpc at client side (#3344) 
* Add gprc support-> 1.support config query  in rpc channel ,add switch in client side

* Add gprc support-> 1.log optimize，split grpc core and digest

* Add gprc support-> 1.optimize log and client proxy.

* Add gprc support-> remove  proto buff plugin
 2020-07-15 20:54:16 +08:00
杨翊 SionYang
d00c133c3e
Add naming support gRPC for register and deregister instance (#3343) 2020-07-15 20:22:07 +08:00
mai.jh
0163d2d0c7
fix: #3324, Move http client close method to NamingProxy.shutdown() (#3333) 2020-07-15 14:12:44 +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
nov.lzf
bbbeabe1e8
nacos support grpc ,base functions submit. (#3328) 
* gprc

* Add gprc support
 2020-07-14 19:15:22 +08:00
mai.jh
511ef88ccc
fix:#3311 Add specified Logger when constructing nacos resttemplate (#3312) 2020-07-13 18:54:06 +08:00
Joe
eca82bff6f
Update BeatReactor.java (#3299) 
update `asInt()` to `asLong()`
 2020-07-13 10:39:59 +08:00
杨翊 SionYang
7ddba00865
Upgrade 1.3.1 (#3294) 2020-07-10 18:05:07 +08:00
杨翊 SionYang
95f3bfb587
[ISSUE #2992]Recheck all checkstyle and open checkstyle during building (#3293) 
* Re-check code style for nacos-config module.

* Re-check code style for other module.

* Open checkstyle plugin check during build
 2020-07-10 17:18:53 +08:00
杨翊 SionYang
66e6d24822
Hotfix send beat info error (#3287) 2020-07-09 21:20:07 +08:00
Hu Zongtang
2342952b63
[ISSUE#3275]Fix the problem that 1.3.1-BETA SDK LifeCycle can't be shutdown for some thread executors. (#3280) 
* [#3275]resolve the issue that lifecycle can't be shutdown for some thread executors.

* [ISSUE#3275]do close for upsocket in shutdown method.

* [ISSUE#3249]fix typo.
 2020-07-08 16:54:40 +08:00
杨翊 SionYang
220b6c4f8d
Hotfix double register null service and beat info invalid problem (#3260) 
* Hotfix, double register null service and beat info invalid problem

* Revert nacos-client JDK back to 6

* Revert nacos-client JDK back to 6
 2020-07-06 19:41:18 +08:00
杨翊 SionYang
1a0df78d8a
[ISSUE #2992] Use new code style for nacos-client module. (#3219) 
* Use new code style for nacos-client module.

* For checkstyle
 2020-07-03 17:30:05 +08:00
yangy
aa020e0b81
upgrade log4j version (#3229) 2020-07-03 09:22:44 +08:00
杨翊 SionYang
88480f7c0f
Update to 1.3.1-BETA (#3194) 2020-06-29 13:56:16 +08:00
liaochuntao
2c733d57ff
[#2979] Inline storage support importing data from external data sources (#3138) 
* feat: data import Derby, Derby export complete

* feat: external data source import is complete

* feat: import data to derby and derby backup finished

* fix: fixed bug where external storage mode could not find beans

* style: fix code style

* style: remove unuse code

* refactor: fixed configuration file information

* improvement: merge upstream/develop

* style: fix code style

* fix: a way to fix the missing

* fix: fix derby data import in standalone mode

* style: fix code style

* refactor: merge upstream develop and fix code style

* test: modify ut

* style: fix code style
 2020-06-28 10:25:06 +08:00
mai.jh
6ce8d8ca79
[ISSUE #3140]nacos-client module replace http client (#3142) 
* nacos-client http client replace

* Remove some explain

* Remove some explain

* Adjust some code styles and fix some misspelled method names

* Fix code style issues

* fix some misspelled method names

* Fix code style issues
 2020-06-22 20:42:46 +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
mai.jh
e528ea82e9
[ISSUE #3094]abstract create nacos restTemplate factory (#3095) 
* abstract create nacos restTemplate factory, allowing users to customize the commonly used http client config

* add class file license.

* change class file name

* Adjust some code
 2020-06-17 17:53:37 +08:00
Hu Zongtang
3f0023a3a9
Remove dependency of apache-common-lang3 in the client. (#3031) 
* [#3026]remove dependency of apache-common-lang3 in the client.

* [#1815]adjust, optimize codes and merge some class.

* [#3031]adjust some codes.

* [#3031]adjust codes and fix typo.

* [#3031]fix typo.
 2020-06-15 13:41:53 +08:00
chuntaojun
abae5e106b refactor: remove unuse code 2020-06-15 11:08:10 +08:00
chuntaojun
77186f9a6c refactor: remove server-addr validator 2020-06-15 11:04:47 +08:00
chuntaojun
7641b45df4 fix: fixed parameter validation boundary problem 2020-06-15 10:11:34 +08:00
KomachiSion
079009b5a5 For #2873, unified copyrights for nacos-client. 2020-06-12 15:33:41 +08:00
horizonzy
315a6c36c5 1.update beatinfo when received instance modify info 
2.add the unit test of this case
 2020-06-11 21:44:33 +08:00
zongtanghu
e7796b3935 [#1815]adjust codes for instance class attribute init. 2020-06-11 12:42:47 +08:00
zongtanghu
d2b980677f [#1815]remove code comments. 2020-06-11 11:33:38 +08:00
zongtanghu
e6e3161c0e resolve the codes conflicts 2020-06-11 09:45:00 +08:00
zongtanghu
eb39830b6c [#1815]remove lifeCycle, lifeCycleManager, and adjust some related codes. 2020-06-11 09:42:44 +08:00
huqingfeng
d21bbf4688 a power of two size for hashmap 2020-06-10 17:42:17 +08:00
zongtanghu
8f7fb0f65a [#1815]remove no used package name from Factory Class and adjust test cases. 2020-06-09 14:10:47 +08:00
chuntaojun
364745e000 refactor: add config publish log 2020-06-05 10:50:29 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +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
zongtanghu
e86c158262 resolve codes conflicts 2020-06-03 14:57:46 +08:00
zongtanghu
5e2840a6bd [#1815]adjust and optimize codes. 2020-06-03 10:46:41 +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
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
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +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
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
chuntaojun
5cd5ca35b8 refactor: merge develop 2020-05-28 20:14:47 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
chuntaojun
e8533155c7 fix: fix startup problem 2020-05-27 22:05:38 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +08:00
yanlinly
a07b0c530f
Merge pull request #2893 from KomachiSion/develop-issue#2842 
[ISSUE #2842]Replace Fastjson with Jackson for nacos-api and nacos-client
 2020-05-26 22:41:02 +08:00
KomachiSion
5b9780e2fc Replace fastjson with jackson for nacos-client 2020-05-26 14:59:23 +08:00
chuntaojun
6fe1d0d0da improvement: adjust part of the code 2020-05-26 11:57:27 +08:00
yfh0918
1484a59499 #2855 2020-05-25 17:59:30 +08:00
fenghua.yu
2da06cf05b #2855 2020-05-25 17:44:03 +08:00
fenghua.yu
34e50e73fd #2855 
needs to close GZIPInputStream manually
 2020-05-25 15:42:19 +08:00
chuntaojun
be75c582c2 Merge remote-tracking branch 'origin' into feature_1.3.0_beta_grpc 2020-05-21 22:09:10 +08:00
liaochuntao
d4efcf4df3
Merge pull request #2548 from wolfdriver/develop_20200329_remove 
remove useless code
 2020-05-21 21:58:19 +08:00
liaochuntao
fea2c674bd
Merge pull request #2687 from Maijh97/develop 
Modify log output
 2020-05-21 21:44:04 +08:00
chuntaojun
87a32a926b refactor: merge develop 2020-05-21 18:08:29 +08:00
chuntaojun
c6ff9031c5 refactor: remove extraneous code 2020-05-20 22:47:54 +08:00
chuntaojun
c4a93d1c37 refactor: code refactor 2020-05-20 15:45:15 +08:00
chuntaojun
07dd129dd0 refactor: fixed instance information update heartbeat information not updating 2020-05-17 16:22:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +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
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
mai.jh
3c195377d6 Modify log output 2020-04-26 11:22:47 +08:00
chuntaojun
ef405e09e2 refactor: remove complex listening logic and bug fixes 2020-04-22 17:28:53 +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
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
wolfgang.zhu
445377d49c fix #2577: Naming client http read timeout and connect timeout controlled by the same property 2020-04-04 12:56:57 +08:00
chuntaojun
42626c029b docs: 2020-04-03 19:06:55 +08:00
Peter Zhu
2e1b5a0303
Merge pull request #2569 from Maijh97/develop 
Change NamingProxy#reqAPI method throw exception log describe
 2020-04-02 09:56:30 +08:00
mai.jh
237edb07b5 fix throw exception log describe 2020-04-01 17:45:59 +08:00
chuntaojun
2e7549a0e2 refactor: Roll back the code 2020-04-01 16:51:03 +08:00
chuntaojun
b3fdacf035 refactor: 2020-04-01 16:37:29 +08:00
chuntaojun
d8714843a0 fix: hotfix issue 2560 2020-04-01 14:37:26 +08:00
wolfdriver
8055985df4 去除无用代码 2020-03-29 22:54:33 +08:00
chuntaojun
586838e0a0 Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-29 13:26:19 +08:00
maijh97
e9d7310b58 fix #1674 'delayTime' move method local variable 2020-03-29 12:21:43 +08:00
maijh97
60a518b944 fix #1674 field name change 2020-03-28 22:03:00 +08:00
maijh97
4226a49813 fix #1674 2020-03-28 20:43:09 +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
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
e0dd6cc652 fix: 2020-03-27 13:54:52 +08:00
chuntaojun
36b99c74ac test: fix BeatReactorTest 2020-03-27 13:15:31 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
theonefx
bebea333f5 spelling mistake 2020-03-26 10:55:44 +08:00
theonefx
fa1421b5f1 fix: https://github.com/alibaba/nacos/issues/2527 2020-03-26 00:07:15 +08:00
zhenxianyimeng
6785491f15 replace deprecated methods in ParamUtil 2020-03-11 18:16:14 +08:00
chuntaojun
f65e4fcbc0 refactor(naming): Optimize the empty service removal logic 2020-03-06 16:32:59 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
7bbd867c2c #1105 Fix test case error 2020-01-16 22:39:09 +08:00
nkorange
bc5e3e1cce #1105 Finish auth IT cases 2020-01-15 17:57:01 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop 
receive config change event
 2020-01-10 15:41:24 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
080ca1e73d #1105 Access control finish 81% 2019-12-18 20:30:06 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +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
nkorange
d150d97d0a Fix close connection exception. 2019-12-04 14:35:01 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
1a4c8f8af1 #1550 加测试用例 2019-11-28 15:56:29 +08:00
rushsky518
3c1d6d00c3 #1550 添加单元测试；部分类移动到 api 模块 2019-11-28 11:56:04 +08:00
rushsky518
ee660f335d #1550 correct while 2019-11-27 20:58:55 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
Cosmos
6bb0e4b6e0 add client context path config 2019-11-25 16:52:50 +08:00
rushsky518
f535ab9846 #1550 普通 listener 时，不保存 lastContent 2019-11-24 16:53:06 +08:00
rushsky518
64b6dbe9cb #1550 把 lastContent 放入 listener 中 2019-11-22 14:43:30 +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
chuntaojun
89b2d000f0 refactor(client/config): update timeout compute 2019-11-12 09:41:05 +08:00
liaochuntao
23ddb69cba refactor(client/config): increase the client's read timeout 
In order to prevent the server from handling the delay of the client's long task, increase the
client's read timeout to avoid this problem.
 2019-11-12 09:10:15 +08:00
nkorange
d034412fdd fix #1858 2019-11-11 09:38:57 +08:00
Fury Zhu
8c104bc432
Merge pull request #2009 from Albert-Hugo/hotfix_2006 
[#2006] Change to throw NacosException
 2019-11-07 16:23:56 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
rushsky518
98d35d2420 correct word spell 2019-11-05 13:41:05 +08:00
rushsky518
5a583f1997 #1550 clean code 2019-11-05 11:44:30 +08:00
huangyonghui
7956acbf64 [#2006] change to throw NacosException to make client handle the right Exception case 2019-11-04 15:38:25 +08:00
Fury Zhu
4424af2a77
Merge branch 'develop' into master 2019-10-30 16:06:32 +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
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
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +08:00
nkorange
f2021a5eda Fix #1906 2019-10-15 20:02:08 +08:00
rushsky518
a815d7b7de Merge branch 'develop' of https://github.com/rushsky518/nacos into develop 
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
 2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317 #1550 nacos server return config type 2019-10-11 19:58:42 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
Fury Zhu
0f82e0d577
Merge pull request #1594 from Diffblue-benchmarks/add-diffblue-tests-2 
Add unit tests for common.GroupKey and utils.MD5
 2019-09-19 17:24:49 +08:00
Fury Zhu
72ea64ec4d
Merge branch 'develop' into develop 2019-09-19 17:23:50 +08:00
Fury Zhu
5bc80b948d
Merge branch 'master' into add-diffblue-tests-2 2019-09-19 17:10:48 +08:00
wangchenjun
4ed7aa350b Avoiding conflicted for creating directory. 2019-09-17 16:34:06 +08:00
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9 feat: 2019-09-11 22:43:57 +08:00
xianlaioy
08e69a0b21 refactor: 局部变量是线程安全的； 
urlPattern改成static final；
          GroupKey重构
 2019-09-09 20:15:19 +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
ly
3b4767384d [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:02:00 +08:00
ezlippi.ouyang
210f77ee6c fix: fix #1733 2019-08-21 13:10:13 +08:00
rushsky518
d6baf1dfcf #1550 去除多余 import 2019-08-19 14:53:50 +08:00
rushsky518
01199aac69 #1550 correct 'yaml' literal 2019-08-19 14:08:00 +08:00
rushsky518
5174eac8d2 #1550 pmd check 2019-08-16 17:29:55 +08:00
rushsky518
b29e8c089c #1550 yaml 展平 2019-08-16 17:11:24 +08:00
rushsky518
1877e7d307 #1550 流程调通 2019-08-15 17:37: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
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +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
Eric Hettiaratchi
425f4c019a Add unit tests for common.GroupKey and utils.MD5 
Fully-qualified classname
com.alibaba.nacos.client.config.common.GroupKey
com.alibaba.nacos.client.config.utils.MD5

These tests were written using Diffblue Cover.
 2019-07-23 11:51:13 +01:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
赵禹光
4d771b340e fmt AppTest 2019-07-11 20:19:24 +08:00
赵禹光
a265196a89 NacosNamingService.java useless import 2019-07-11 20:18:50 +08:00
ly
a87f0bd2bb Fix #1519 The subscriber list is not displayed correctly 2019-07-11 01:48:11 +08:00
ly
a7e61dff8b Fix #1519 The subscriber list is not displayed correctly 2019-07-10 20:33:39 +08:00
nkorange
65c2f55617 Fix standalone use derby failed bug 2019-07-09 11:04:00 +08:00
nkorange
fbf006dc99 Fix JDK 1.6 compile failed bug 2019-07-05 22:09:40 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
Fury Zhu
1119e9e332
Merge pull request #1487 from zhaoyuguang/zen2 
fix unuseless import
 2019-07-05 16:43:11 +08:00
nkorange
4c055f38b9 Fix #1491 2019-07-05 16:33:52 +08:00
赵禹光
56f43fdcf4 fix a typo 2019-07-05 14:56:20 +08:00
nkorange
7c0e12d6fe Fix beat info null bug 2019-07-05 12:48:13 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
Fury Zhu
c031a275f7
Merge pull request #1457 from chuntaojun/fix_issue_1455 
Fix issue 1455
 2019-07-03 18:33:48 +08:00
xianlaioy
4fc07d4852
构建rDigits改成google的guava 
new HashMap<Character, Integer>(16); 负载因子是0.75,digits实际大小是16会扩容一次。
 2019-07-02 15:27:28 +08:00
chuntaojun
e6b09cb647 fix(client): fix Correction parameter name 2019-07-02 13:07:02 +08:00
Fury Zhu
b599a9eb9e
Merge pull request #1452 from zhaoyuguang/zen0 
useless import
 2019-07-02 11:45:47 +08:00
chuntaojun
a7d128923e fix(client): fix issue #1455 2019-07-01 17:49:30 +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
赵禹光
d7ce18233a useless import 2019-07-01 10:08:38 +08:00
Fury Zhu
fe950dccc2
Merge pull request #1401 from slievrly/develop 
optimize array and negated codestyle
 2019-06-30 22:47:46 +08:00
Fury Zhu
268d1d4ea9
Merge pull request #1443 from iHelin/develop 
[ISSUE #1442] Fix JSONUtils#deserializeObject method.
 2019-06-30 22:41:13 +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
iHelin
368b355fca Modify JSONUtils's deserializeObject method. 2019-06-28 15:23:06 +08:00
Fury Zhu
7ec7f525fd
Merge branch 'develop' into develop 2019-06-28 12:53:19 +08:00
Fury Zhu
6312a32c1d
Merge pull request #1434 from IanCao/develop 
Format Code and remove useless code
 2019-06-28 12:41:29 +08:00
caoyixiong
f7566331c8 format 2019-06-28 11:55:28 +08:00
caoyixiong
5852ddc973
Revert "merge (#6)" (#7) 
This reverts commit 928c07d690.
 2019-06-27 22:54:40 -05:00
caoyixiong
928c07d690
merge (#6) 
* #1344 server-addr 支持 http 字符串

* 【issue】 #1425

* #1344 客户端本地缓存目录，剔除特殊字符串

* #1344 移动常量位置

* 格式

* feat: component subscribers
 2019-06-27 21:46:41 -05:00
caoyixiong
aa18efa21b add ip pattern 2019-06-27 20:13:20 +08:00
caoyixiong
771263eef6 fix 2019-06-27 19:50:19 +08:00
Fury Zhu
00f989f51e
Merge pull request #1426 from IanCao/master 
【issue】 #1425
 2019-06-27 18:51:38 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
Fury Zhu
bd49e062d1
Merge pull request #1432 from rushsky518/master 
HTTPS支持 #1344
 2019-06-27 18:49:40 +08:00
caoyixiong
34025a5132 format code 2019-06-26 12:07:33 +08:00
slievrly
f17f40e0af fix review 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-25 21:42:13 +08:00
rushsky518
83a2ea673e 格式 2019-06-25 16:18:26 +08:00
rushsky518
f0553afa7b #1344 移动常量位置 2019-06-25 16:10:47 +08:00
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11 
【issue】#1278
 2019-06-24 14:21:22 +08:00
rushsky518
88c3ad0c53 #1344 客户端本地缓存目录，剔除特殊字符串 2019-06-24 14:10:48 +08:00
caoyixiong
502fa0dcdc 【issue】 #1425 2019-06-24 10:54:15 +08:00
rushsky518
6d5191f11a #1344 server-addr 支持 http 字符串 2019-06-24 10:41:37 +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
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
caoyixiong
5c108ea0c4 fix 2019-06-22 10:40:53 +08:00
caoyixiong
1decd04008 #1278 2019-06-21 11:41:55 +08:00
caoyixiong
887d3b6c63
Update BeatReactorTest.java 2019-06-20 20:17:06 +08:00
caoyixiong
5ad978b663 add BeatReactorTest 2019-06-20 19:53:17 +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
slievrly
8d74ac90aa optimize array and negated codestyle 2019-06-19 22:35:52 +08:00
IanCao
7b839d0f83 fix bug 2019-06-19 19:46:40 +08:00
IanCao
16f8a16cb3 fix bug 2019-06-19 17:13:35 +08:00
IanCao
5757881c0e update 2019-06-19 16:59:28 +08:00
IanCao
f2d22f181a fix 2019-06-19 16:58:27 +08:00
chuntaojun
c91f99b82e fix(nacos-client:config): Fix code conflicts 2019-06-18 23:27:28 +08:00
IanCao
d7908c651d change into 2 threadpool(mainloop & taskThreadpool) 2019-06-18 17:49:44 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
Fury Zhu
b29e4c8e3f
Merge pull request #1380 from chuntaojun/fix_issue_1317 
Fix issue 1317
 2019-06-18 10:12:32 +08:00
chuntaojun
2a67382a7a refactor(nacos-client:config): Modify exception handling 2019-06-17 21:11:25 +08:00
IanCao
d0bf21a756 fix bug 2019-06-17 18:28:03 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
chuntaojun
21ff07563d refactor(nacos-client:config): rmove un use construct of CacheData 2019-06-16 08:24:17 +08:00
chuntaojun
ade510f31d feat(nacos-client:config): fix issue #1317 2019-06-15 23:37:12 +08:00
chuntaojun
240ee50aa2 fix(nacos-client:config): fix issue 1317 2019-06-15 19:12:54 +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