Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master upgrade 1.4.0 #4119

Merged
merged 174 commits into from
Nov 2, 2020
Merged

Master upgrade 1.4.0 #4119

merged 174 commits into from
Nov 2, 2020

Conversation

KomachiSion
Copy link
Collaborator

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.

chuntaojun and others added 30 commits June 17, 2020 15:20
[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
* [email protected]

更新jjwt-api版本为0.11.2,更新Deprecated Method

* [email protected]

nacos-all  pom.xml更改版本

* [email protected]

格式检查
…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
chuntaojun and others added 28 commits October 15, 2020 23:51
This reverts commit 29ba11e to fix #3992
* Refactor nacos task execute engine

* Refactor nacos task execute engine

* For checkstyle

* For checkstyle

* Use ThreadUtils to reduce duplicate codes

* Set custom logger for TaskExecuteWorker

* Set custom logger for TaskExecuteWorker
…onfigDetails page (#3988)

* add detail previous config history api

* modify the previous config history url

* modify log description

* 详情页面添加“历史对比”按钮,点击可打开对比面板

* 点击“历史对比”按钮,获取上一版本数据

* 在查看历史对比的时候 不显示revert按钮

* append doc info

* Add unit tests for ISSUE#3855

* Add the previous updates to main.js and main.css

Co-authored-by: 赵延 <[email protected]>
* feature. add update and delete operation on instance's metadata 90%

* 1.add unit test
2.fix-locateInstance error

* format code style

* add @link on class

* move metadata operate to InstanceController.

* format code 50%

* complete bacth operation of metadata

* remove unnecessary test unit

* modify the variable name

* perfect log info

* modify consumer's dto to match it's description

* 1.rename class OperationContext -> InstanceOperationContext
2.move Map operation from NamingUtils to MapUtils

* check datum is null

* code refactor.

* 1. code refactor
2. modify the batch operate http param. just support (1 services : n instance)

* 1.set default clusterName if instance not set
2.fix client params not set instances bug

* npe fix

* 1.remove consistencyType *, just support ephemeral or persist.
2.remove moditfy property method in InstanceOperationContext and InstanceOperationInfo, it just defined by constructor.

* add instance controller test

* fix code too length

* update the param name

* add feature's version of start
Naming module Raft protocol migration
Revert "Naming module Raft protocol migration"
# Conflicts:
#	console/src/main/resources/static/js/main.js
* Fix old raft sync null datum problem

* Fix TimerContext NPE problem
* ignore load data from remote when standalone mode

* refactor. move standalone mode check from DistroLoadDataTask to DistroProtocol

* rename variable loadCompleted to isInitialized
修改错误拼写

Co-authored-by: yanlinly <[email protected]>
Co-authored-by: 杨翊 SionYang <[email protected]>
@KomachiSion KomachiSion added this to the 1.4.0 milestone Nov 2, 2020
@KomachiSion KomachiSion merged commit c0ffb1d into master Nov 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.