Commit Graph

2762 Commits

Author SHA1 Message Date
mai.jh
4ce897e409
bug: fix the problem of incorrect judgment of http response code in SubscribeManager#getSubscribers() method (#3879) 2020-09-21 15:18:23 +08:00
liaochuntao
7fd4d9a5d1
feature issue #3804 (#3805)
* improvement: merge upstream/develop

* feat: merge upstream develop

* feat: manage the loading of configuration files uniformly

* fix: fix copyright style

* style: fix code style

* fix: fix code style
2020-09-18 16:05:36 +08:00
mai.jh
473090ba13
Fix http client contentType charset problem (#3848) 2020-09-17 17:49:11 +08:00
杨翊 SionYang
700c90d15f
Fix code style problem in DiskUtils (#3842) 2020-09-16 12:33:33 +08:00
杨翊 SionYang
2ded5a24fc
Set mediaType charset as utf8 (#3837) 2020-09-16 09:14:03 +08:00
杨翊 SionYang
565557c5c5
Fix NullPointerException when no subscriber for slow event (#3835) 2020-09-15 14:50:57 +08:00
mai.jh
5e4429f0e4
[ISSUE#3192] naming module replace http client (#3763)
* naming module replace http client

* refactor: naming module replace http client.

* refactor: naming module replace http client.

* refactor: Add apache http client Factory.

* refactor: naming module replace http client.

* fix code style

* refactor: Add http client config

* refactor: naming module HttpClientManager change

* refactor: naming module HttpClientManager change

* refactor: naming module replace http client.

* fix code style

* refactor: fix JDK http client Use error problem.

* refactor: Query And Header entity init Add non-empty judgment

* Enhance the asynchronous http delete request method to support body passing parameters.

* refactor: apache http client set MaxConnTotal and maxConnPerRoute.
2020-09-15 09:18:20 +08:00
杨翊 SionYang
dc5cba2e69
Merge pull request #3816 from mark4z/develop
[ISSUE#3787]  fix ConvertUtils can not handle FormatException.
2020-09-14 14:55:22 +08:00
Marcus
af2151e49c fix ConvertUtils can not handle FormatException. 2020-09-14 11:56:12 +08:00
Mark4z
0c8bdfd82f
Merge pull request #1 from alibaba/develop
T
2020-09-13 23:39:53 +08:00
S2W
a41d209d57
Update ConvertUtils.java (#3789) 2020-09-09 17:03:25 +08:00
mai.jh
baa699a3f1
[ISSUE#3790] Supplement http response Content-Encoding processing. (#3791)
* bug: fix issue #3790, Supplement http response Content-Encoding processing

* bug: fix issue #3790, Supplement http response Content-Encoding processing.

* bug: fix issue #3790, Supplement http response Content-Encoding processing.
2020-09-09 17:01:18 +08:00
赵延
3dc0f243f8
[ISSUE #3687] check serviceName's format(groupName@@serviceName) in server and client (#3767)
* 1.in server, check serviceName's format 'groupName@@serviceName', groupName and serviceName can't be blank
2.in client, check 'groupName@@serviceName', groupName and serviceName can't be blank

* ignore the check to groupName

* check split's length instead of exception to check argument

* 1.add some notes
2.remove unnecessary code

* modify the notes
2020-09-09 16:40:07 +08:00
杨翊 SionYang
f42cb4716d
[ISSUE #3658] Some enhance refactor for naming distro (#3765)
* Some enhance refactor for naming distro

* Remove null code
2020-09-08 11:30:19 +08:00
yanlinly
f423d39d10
Revert "[#3368]Cancel empty Long polling thread to improve performance. (#ISSUE3432)" (#3778)
This reverts commit 95c8bf242b.
2020-09-08 10:00:46 +08:00
杨翊 SionYang
d84d1a86cc
Merge pull request #3772 from horizonzy/fix-3770
[ISSUE #3770] replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)
2020-09-07 16:34:40 +08:00
horizonzy
1f8a64b11d replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode) 2020-09-07 15:15:47 +08:00
杨翊 SionYang
37bb909785
[ISSUE#3658] Move distro sync code to nacos-core module (#3750)
* Move distro sync code to nacos-core module

* Update unit test
2020-09-04 00:15:11 +08:00
邪影oO
043a504a33
fix: #3617 (#3678)
* fix #3617

* 调整代码格式

* 修改抛出的Exception类型

* 调整逻辑

* 移除没用到的方法

* 修改注释
2020-09-03 21:14:23 +08:00
杨翊 SionYang
0c194e37aa
[ISSUE#3692] Use new distro implmentation to handle init all datum request. (#3744)
* Add load data task in DistroProtocol

* Use new distro implmentation to handle init all datum request.

* Fix unit test
2020-09-03 11:15:47 +08:00
杨翊 SionYang
6ba23ba3c1
[Issue #3692] Use new distro implmentation to handle sync datum and checksum request (#3734)
* Add receive data and verify data distro protocol interface

* Use new distro implmentation to handle sync datum and checksum request

* Use new distro implmentation to handle get datum request.
2020-09-02 09:51:13 +08:00
杨翊 SionYang
525672272e
[Issue#3692] Use new distro task engine replace old task dispatcher. (#3715)
* Add ServiceManagerTest

* Add DistroConsistencyServiceImplTest

* Add new distro entities

* Add new distro sync data change

* add new VerifyTask to do checksum.

* Replace old sync task and checksum task

* Add retry sync change task.

* Fix high cpu load

* For checkstyle

* Combine naming sync task to reduce http cost

* Move some classes

* Refactor keys combined logic

* enhance package construct

* Fix unit test

* For pmd
2020-09-01 10:46:45 +08:00
mai.jh
06877ead41
[ISSUE#3712] add apache http client factory (#3716)
* refactor: Add apache http client Factory.

* refactor: Add apache http client Factory.

* add license

* refactor: class name change
2020-09-01 10:24:34 +08:00
Tboy
c2367d687c
Fix Logging in with the wrong username or password will cause jackson serialization results to fail (#3695) (#3721) 2020-09-01 10:01:12 +08:00
ljhrot
879bfaf7de
Fix revert chunk isn't work in Content Comparison page (#3686) 2020-08-28 10:31:34 +08:00
杨翊 SionYang
2d790a03a3
Try to fix nacos server CLOSE_WAIT (#3703) 2020-08-27 14:42:50 +08:00
S2W
e65c0f355d
fix typo and doc format of README file (#3688)
1. It’s a little weird to use Chinese comma in English
2. Fix typo:   change 'reposity' to  'repository', 'instance' to 'instances'
3. Format other details of the doc
2020-08-26 11:26:40 +08:00
Gagharv
da8fa57f99
[ISSUE#3315]Nacos client support https (#3654)
* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https
* common module add tls related classes
* JdkHttpClientRequest support https
* unified IpUtils

* [ISSUE #3315] nacos client support https

* format code
2020-08-24 18:35:38 +08:00
syapollo
29ba11eb88
for #3621 (#3668) 2020-08-24 13:25:29 +08:00
Gagharv
3428d8830e
[ISSUE #3671] move some tools class into common package (#3672) 2020-08-24 13:24:56 +08:00
杨翊 SionYang
a0c8353b70
[ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663)
* Add TaskManagerTest

* Move Abstract Task and Task processor to nacos-common

* Add Nacos execute engine interface and nacos task interface

* Refactor Task Manager to NacosDelayTaskExecuteEngine

* for code style
2020-08-23 16:39:58 +08:00
liaochuntao
bfc9436049
Fix issue 3661 (#3662)
* improvement: merge upstream/develop

* feat: merge upstream develop

* fix: fix issue #3661
2020-08-21 14:30:20 +08:00
赵延
6e4b0c9c86
[ISSUE #3628] set naming client updateTask interval more flexible (#3637)
* 1.use server cacheMillis event service deleted
2.naming client UpdateTask's interval will inc by failCount that connect with server

* 1.move failCount to updateTask
2.redefine the updateService method name. updateServiceNow -> updateService, wrap updateService in updateServiceNow when first getServiceInfo

* 1.create push client even service is not exist
2.serviceInfo's hosts is empty or can't connect to server both add the updateTsk interval

* format the indent
2020-08-20 14:35:30 +08:00
mai.jh
136b45610d
refactor: unified implementation of http client api adjustment. (#3639) 2020-08-20 09:09:21 +08:00
赵延
e7c269a2f5
move jwt dependency from console,core to auth. (#3624) 2020-08-18 13:38:07 +08:00
Xarrow
1e5a597654
[ISSUE #3613] Fix unit test method not be static & update publish config listener in ConfigTest.java (#3614)
* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`

* fix `unit test method not be static` & update publish config listener in `ConfigTest.java`
2020-08-18 09:24:34 +08:00
赵延
a041c8ef58
[ISSUE #3600] Replace the deprecated api of jwt (#3616)
* replace the deprecated api of jwt

* transfer secretKey to byte array just using String encode with utf-8
2020-08-18 09:23:04 +08:00
ljhrot
c7251a144a
[ISSUE #3592] Fix incorrect prompt when accessing the restricted namespace (#3603)
* Fix incorrect prompt when accessing the restricted namespace

* Modify variable name
2020-08-14 17:07:13 +08:00
mai.jh
526e2bc130
[ISSUE #3566] move the permission code of nacos-core module to nacos-auth module (#3593)
* move the permission code of nacos-core module to nacos-auth module.

* Fix some code style issues

* address server module auth package name change.

* test change

* Incorrect package name correction
2020-08-14 09:50:05 +08:00
赵延
1b991a0b8f
fix-#3595, delete the unnecessary code (#3596) 2020-08-13 15:11:12 +08:00
mai.jh
df9ae66fe0
create a nacos-auth module, And add nacos-auth dependency for nacos-core module. (#3590) 2020-08-12 19:15:58 +08:00
蚊子猫
6607a1efbf
[ISSUE #3515] upgrade spring-boot-dependencies version to 2.1.16.RELEASE, tomcat-embed-jasper version to 9.0.37 (#3563)
Change-Id: I021396ae0b75fc889f087c4a4c253549ad46b46f
2020-08-12 16:44:14 +08:00
ljhrot
8081acf662
[ISSUE #1654] Fix content hightlight does not work in config detail page (#3555)
* Fix content hightlight does not work in config detail page

* Solve conflict
2020-08-12 09:51:15 +08:00
杨翊 SionYang
0b73cfc769
Upgrade version to 1.4.0-SNAPSHOT (#3549) 2020-08-12 09:32:06 +08:00
ZZQ的
13bfc45242
On click nacos logo jump to index page (#3570)
* On Click Nacos Logo jump to index page

* On Click Nacos Logo jump to index page

* npm run-script build
2020-08-11 13:18:08 +08:00
ZZQ的
ad2951a116
change aliyun logo to nacos logo (#3569)
* change aliyun logo to nacos logo

* change aliyun logo to nacos logo

* reset file name
2020-08-11 11:37:30 +08:00
ZZQ的
2726591dae
ISSUE #3530 add button for user role page (#3553)
* ISSUE #3530 add button for user role page

* Merge branch 'upstream-develop' into develop-issues-#2792

# Conflicts:
#	console/src/main/resources/static/js/main.js
2020-08-11 09:47:39 +08:00
ZZQ的
f1382d690e
ISSUE #2792historyDetail page and historyRollback page add field 'srU… (#3552)
* ISSUE #2792historyDetail page and historyRollback page add field 'srUser'

* Merge branch 'upstream-develop' into develop-issues-#2792

# Conflicts:
#	console/src/main/resources/static/js/main.js
2020-08-10 18:59:38 +08:00
赵延
c9b64e0173
fix-#3550. write cache file and delete the old version cache file (#3551) 2020-08-10 09:09:13 +08:00
ljhrot
c45542c8ff
[ISSUE #2835] Fix an uncaught exception when accessing restricted namespace in authentication mode. (#3541)
* Fix an uncaught exception when accessing restricted namespace in authentication mode.

* Resolved merge conflict

* Withdraw changes that are not part of this pr
2020-08-10 09:07:17 +08:00