sync #2

binbin0325 · 2020-09-09T00:58:11Z

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

… database (#3442) * Reset nacos roles, permissions during reloading role info from database * Add volatile to guarantee visibility in threads

* Update issue templates * Delete duplicate bug report

…est callback interface (#3452) * Enhanced callback interface for asynchronous requests * change class name * add license * change class name * comment change * delete AbstractCallback

)

Fix checkstyle error (#3467)

…auth manager. (#3456) * Fix #3091 by empty auth manager. * Fix #3091 by empty auth manager. * Use conditional to solve bean conflict

* Fix browser Uncaught TypeError when create a Properties type configuration * Change Properties content verification method * Update front end resources

* 配置pageSize列表 #3439 * Service List Page Increase the number of pages switching function is the same as the configuration management page #3500

[ISSUE #3397]Fix shell syntax error when running in ubuntu

#3511) * 配置pageSize列表 #3439 * Service List Page Increase the number of pages switching function is the same as the configuration management page #3500 * issues#3500 编译之后的代码

…ties (#3516) * Fix address server mode cannot be obtained application.properties And synchronize the properties value(#3509) * format code. * update mysql default value nacos:nacos

…UE3432) * update clientWorker * Upgrade 1.3.1 (#3294) update clientWorker * add ClientWorkerTest * add remove taskFlagMap * update clientworker * update taskIdSet ConcurrentHashSet

* nacos-config module replace http client * replace http client * Remove redundant package import * add license * Delete JOSNUtils and use JacksonUtils instead; modify NacosAsyncRestTemplate exception handling.

…on mode （在绑定角色的时候用户列表改成下拉选中的模式) #3518 (#3522) * 配置pageSize列表 #3439 * Service List Page Increase the number of pages switching function is the same as the configuration management page #3500 * issues#3500 编译之后的代码 * 在绑定角色的时候用户列表改成下拉选中的模式 #3518 * change code style * delete unused import * delete changed indent please. * Javadoc add an ending period * fix bad sql and change return type * change js get value * delete whitespace * check code style * add permissions, associated role, change to fuzzy matching drop-down(java code) * add permissions, associated role, change to fuzzy matching drop-down(js code) * delete "/"

* core module replace http client * replace http client

…will mismatch sometimes (#3487) * fix #3486 * modify code suit checkstyle * add apache licenses * change the publish version of new class * set the char "-->" in interface * set the char "-->" in interface * code format * add unit case of com.alibaba.nacos.core.code.ControllerMethodsCache.getMethod * code format follow nacos-code-style * code format follow nacos-code-style

…ved to the request in login (#3543) * Fix #3269 NacosAuthManager request.setAttribute(user) and ConfigController getSrcUserName(req) * Fix #3269 format code * Fix #3269 format code

* 15096346912@163.com 更新jjwt-api版本为0.11.2，更新Deprecated Method * 15096346912@163.com nacos-all pom.xml更改版本 * 1509346912@163.com 格式检查

…espace 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

)

#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

* 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

…ASE, tomcat-embed-jasper version to 9.0.37 (#3563) Change-Id: I021396ae0b75fc889f087c4a4c253549ad46b46f

…ore module. (#3590)

…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

…space (#3603) * Fix incorrect prompt when accessing the restricted namespace * Modify variable name

* replace the deprecated api of jwt * transfer secretKey to byte array just using String encode with utf-8

…onfig 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`

) * 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

* improvement: merge upstream/develop * feat: merge upstream develop * fix: fix issue #3661

) * 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

* [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

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

… serialization results to fail (#3695) (#3721)

* refactor: Add apache http client Factory. * refactor: Add apache http client Factory. * add license * refactor: class name change

…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

…hecksum 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.

…quest. (#3744) * Add load data task in DistroProtocol * Use new distro implmentation to handle init all datum request. * Fix unit test

* fix #3617 * 调整代码格式 * 修改抛出的Exception类型 * 调整逻辑 * 移除没用到的方法 * 修改注释

* Move distro sync code to nacos-core module * Update unit test

…Node#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)

[ISSUE #3770] replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)

…e. (#ISSUE3432)" (#3778) This reverts commit 95c8bf2.

* Some enhance refactor for naming distro * Remove null code

ljhrot and others added 30 commits July 25, 2020 23:07

Fix bad SQL grammar (#3445)

c3818ff

Fix #3428, Fix token valid go login bug (#3449)

d19b441

[#3388]Reset nacos roles, permissions during reloading role info from…

377f778

… database (#3442) * Reset nacos roles, permissions during reloading role info from database * Add volatile to guarantee visibility in threads

Update issue templates (#3427)

bc3d13f

* Update issue templates * Delete duplicate bug report

[ISSUE #2858] Unified http client implementation, enhanced async requ…

5b76fd0

…est callback interface (#3452) * Enhanced callback interface for asynchronous requests * change class name * add license * change class name * comment change * delete AbstractCallback

fix get HttpRequestBase thread safe issues through BaseHttpMethod (#3469

e9152a9

)

[#1839]add ContentType return while getConfig

e4a478a

Fix checkstyle error (#3467)

1a22ae4

Fix checkstyle error (#3467)

[ISSUE#3091] Fix address server can't start up by implement an empty …

f377c19

…auth manager. (#3456) * Fix #3091 by empty auth manager. * Fix #3091 by empty auth manager. * Use conditional to solve bean conflict

[#1839]add ContentType return while getConfig (#3470)

43f6065

[ISSUE #3103] Fix can't create properties config (#3483)

4310b3e

* Fix browser Uncaught TypeError when create a Properties type configuration * Change Properties content verification method * Update front end resources

Fix the UnknownHostException is swallowed (#3495)

b79f048

Fix shell syntax error when running in ubuntu

e3eafda

[ISSUE #3439] Increment console config page size (#3507)

e4fdc38

* 配置pageSize列表 #3439 * Service List Page Increase the number of pages switching function is the same as the configuration management page #3500

Upgrade version to 1.3.2 (#3512)

df4b006

Fix shell syntax error when running in ubuntu

dd24f56

Merge pull request #3505 from ljhrot/develop-issue#3397

aa91f3d

[ISSUE #3397]Fix shell syntax error when running in ubuntu

[ISSUE #3500] Make page list of service manager same as config manager (

816113a

#3511) * 配置pageSize列表 #3439 * Service List Page Increase the number of pages switching function is the same as the configuration management page #3500 * issues#3500 编译之后的代码

[#3509] Fix address server mode cannot be obtained application.proper…

0ae6669

…ties (#3516) * Fix address server mode cannot be obtained application.properties And synchronize the properties value(#3509) * format code. * update mysql default value nacos:nacos

[#3368]Cancel empty Long polling thread to improve performance. (#ISS…

95c8bf2

…UE3432) * update clientWorker * Upgrade 1.3.1 (#3294) update clientWorker * add ClientWorkerTest * add remove taskFlagMap * update clientworker * update taskIdSet ConcurrentHashSet

[ISSUE #3192] replace nacos-config module http client (#3523)

a64a356

* nacos-config module replace http client * replace http client * Remove redundant package import * add license * Delete JOSNUtils and use JacksonUtils instead; modify NacosAsyncRestTemplate exception handling.

[ISSUE #3192] replace nacos-core module http client (#3535)

b1db2be

* core module replace http client * replace http client

Fix #3269 When nacos.core.auth.enabled = true, user information is sa…

fae3748

…ved to the request in login (#3543) * Fix #3269 NacosAuthManager request.setAttribute(user) and ConfigController getSrcUserName(req) * Fix #3269 format code * Fix #3269 format code

[ISSUE #3536] upgrade Jjwt to 0.11.2 (#3547)

ac8ced1

* 15096346912@163.com 更新jjwt-api版本为0.11.2，更新Deprecated Method * 15096346912@163.com nacos-all pom.xml更改版本 * 1509346912@163.com 格式检查

[ISSUE #2835] Fix an uncaught exception when accessing restricted nam…

c45542c

…espace 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

fix-#3550. write cache file and delete the old version cache file (#3551

c9b64e0

)

ISSUE #2792historyDetail page and historyRollback page add field 'srU… (

f1382d6

#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

ISSUE #3530 add button for user role page (#3553)

2726591

* 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

corey89757 and others added 29 commits August 12, 2020 16:44

[ISSUE #3515] upgrade spring-boot-dependencies version to 2.1.16.RELE…

6607a1e

…ASE, tomcat-embed-jasper version to 9.0.37 (#3563) Change-Id: I021396ae0b75fc889f087c4a4c253549ad46b46f

create a nacos-auth module, And add nacos-auth dependency for nacos-c…

df9ae66

…ore module. (#3590)

fix-#3595, delete the unnecessary code (#3596)

1b991a0

[ISSUE #3592] Fix incorrect prompt when accessing the restricted name…

c7251a1

…space (#3603) * Fix incorrect prompt when accessing the restricted namespace * Modify variable name

[ISSUE #3600] Replace the deprecated api of jwt (#3616)

a041c8e

* replace the deprecated api of jwt * transfer secretKey to byte array just using String encode with utf-8

move jwt dependency from console,core to auth. (#3624)

e7c269a

refactor: unified implementation of http client api adjustment. (#3639)

136b456

Fix issue 3661 (#3662)

bfc9436

* improvement: merge upstream/develop * feat: merge upstream develop * fix: fix issue #3661

[ISSUE#3658] refactor TaskManager and move to nacos-common module (#3663

a0c8353

) * 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

[ISSUE #3671] move some tools class into common package (#3672)

3428d88

for #3621 (#3668)

29ba11e

fix typo and doc format of README file (#3688)

e65c0f3

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

Try to fix nacos server CLOSE_WAIT (#3703)

2d790a0

Fix revert chunk isn't work in Content Comparison page (#3686)

879bfaf

Fix Logging in with the wrong username or password will cause jackson…

c2367d6

… serialization results to fail (#3695) (#3721)

[ISSUE#3712] add apache http client factory (#3716)

06877ea

* refactor: Add apache http client Factory. * refactor: Add apache http client Factory. * add license * refactor: class name change

[ISSUE#3692] Use new distro implmentation to handle init all datum re…

0c194e3

…quest. (#3744) * Add load data task in DistroProtocol * Use new distro implmentation to handle init all datum request. * Fix unit test

fix: #3617 (#3678)

043a504

* fix #3617 * 调整代码格式 * 修改抛出的Exception类型 * 调整逻辑 * 移除没用到的方法 * 修改注释

[ISSUE#3658] Move distro sync code to nacos-core module (#3750)

37bb909

* Move distro sync code to nacos-core module * Update unit test

replace the deprecated api com.fasterxml.jackson.databind.node.Object…

1f8a64b

…Node#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)

Merge pull request #3772 from horizonzy/fix-3770

d84d1a8

[ISSUE #3770] replace the deprecated api com.fasterxml.jackson.databind.node.ObjectNode#put(java.lang.String, com.fasterxml.jackson.databind.JsonNode)

Revert "[#3368]Cancel empty Long polling thread to improve performanc…

f423d39

…e. (#ISSUE3432)" (#3778) This reverts commit 95c8bf2.

[ISSUE #3658] Some enhance refactor for naming distro (#3765)

f42cb47

* Some enhance refactor for naming distro * Remove null code

binbin0325 merged commit b519af0 into binbin0325:develop Sep 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sync #2

sync #2

binbin0325 commented Sep 9, 2020

sync #2

sync #2

Conversation

binbin0325 commented Sep 9, 2020

What is the purpose of the change

Brief changelog

Verifying this change