Merge from develop. #10126

KomachiSion · 2023-03-17T10:20:43Z

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.

* 限流插件优化 * 反脆弱插件移除nacos-sys依赖 * 移除nacos-sys依赖

update readme for Contact Ding Group

* 修改request response 类加载逻辑，有类扫描改成手动注册 * 优化注册方式，直接SPI注册payload

RequestMappingHandlerMapping conflict

* fix issue #9728 * reformat code style

* prevent double tigger event. * reformat code style

调整timeout位置

…emoveAggr method (#9646) (#9659)

upgrade rpc-grpc-impl version to 1.3.12

#9727) * enhancement: CloseableHttpAsyncClient does not clean up expired and invalid connections (#9708) * enhancement: CloseableHttpAsyncClient does not clean up expired and invalid connections (#9708) * style:satisfy style/NacosCheckStyle.xml * add unit test(#9708) * Revert "add unit test(#9708)" This reverts commit 939905c. * add unit test

protobuf-java to 3.21.11, proto-google-common-protos to 2.7.1

…9798)

…pc services to better optimize network performance. (#9806)

* fix issue #9783 * fix issue #9783 * add it test for v2 config. * fix ci problem. * fix ci problem. * fix ci problem. * fix history process NamespaceParameter * fix ci problem. * add some unit test * reformat code

* Upgrade to 2.2.1-RC (#9741) * 补充处理所有 tenantId * 补充处理 tenantId * 处理tenantid，内部类引用的变量不能被修改，换个变量名 * 新增支持：nacos 默认的 tenant/namespaceId 为空字符串，自 nacos 2.2.0 版本起开始支持多数据源插件，为空的 ID 会在 oracle 数据库适配中出现问题 ( where tenantid = '' )，本次修改对以往程序不产生影响。 * 固定填充的ID为public，完全自定义没有太大意义，目的是在保证默认id不为空，可选填充，不配置默认照旧 * fix bug * 将通用的SQL提取到Mapper接口中，这样能很大的降低不同数据库需要重写的SQL的量，同时避免了大量的重复代码问题。 * 将原来sql中固定写死的 tenant_id = '' 修改为 tenant_id = NamespaceUtil.getNamespaceDefaultId() 。暂时没深究为什么不用问号动参而是固定写死。 * 方法提取到 mapper 接口中，顺便解决了多余 paramList 定义的（虽然这个方法好像已经弃用） * 方法迁移到接口默认实现中 * 恢复 publci id 默认值为空值 ""，等以后决策好使用默认值为 "public" 时，再设置 NAMESPACE_PUBLIC_ID_DEFAULT="public" 即可。 * 回滚 Controller 层对 tenant_id 的处理，另起PR讨论和修改。 * code style * 变量名称和注释未通过 checkStyle 检查，按规范调整。 * nacos check style 修改，无代码变动 * fix code * fix checkstyle * fix checkstyle 去除多余的 return * fix pmd * fix test unit bug * 因为将sql提取到 mapper 接口中，一些不影响sql语句运行的sql，有空格等差异，出现了test用例差异问题，逐个处理。比如（where a =? 和 where a= ?） Co-authored-by: 杨翊 SionYang <xiweng.yy@alibaba-inc.com>

* 使用自定义jwt生成 * add unit test; fix log msg. * add license

* fix:CollectionUtils下for循环中的字符串拼接改用StringBuilder * fix:The LinkedHashSet in CollectionUtils.java lacks a generic * docs:a is used before a consonant; an is used before a vowel

* ✨ fix LDAP login failed ✨ fix LDAP AD login Ignore partial result exception * 🎨 checkstyle reformat

…oblem between different version (#9934) * logback update * update comment * ident update * comment update * judge version * remove logback-adapter

- add some font files to local path Close #9448

* Fix cluster node state error * Fix checkstyle

…9982) * Optimize the pom.xml of the nacos-client * optimize pom * exclude `google/**/*.proto` * tab * Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom` * revert indent * revert native-image

Close #10029

…n` in com.alibaba.nacos.core.auth.AuthConfig (#10021) * code optimization for `ConfigChangeHandler` * [ISSUE #9930] fix word spelling error in com.alibaba.nacos.common.http.AbstractHttpClientFactory#ASYNC_IO_REACTOR_NAME * [ISSUE #10020] Use Generic Type When Declaring `authFilterRegistration` in com.alibaba.nacos.core.auth.AuthConfig * fix code format * fix code format * Fix Code Format * Fix Code Format

* Replace `flatten-maven-plugin` with `easyj-maven-plugin` * revert indent * apache-rat-plugin exclude `.flattened-pom.xml` * fix style * optimize github action * optimize github action * fix dependencies * upgrade easyj-maven-plugin to 1.1.5 * optimize github action * optimize spring-boot-maven-plugin configuration

* fix issue 9943 * add some description * add some log for roll back transaction * add some log for roll back transaction * set default rollBackOnUpdateFail false. * format style * fix some bug

* Remove http way to report data change * Remove http controller method to receive data change

anyOne - anyone

* load failover file. * fix text unit error.

* [ISSUES #10014] clear confused logic about namespace properties - add getPropertyFrom method - optimize some code logic Close #10014 * fix ci error

startup.sh中对jdk9之前的gc log配置为十个gc文件，每个大小为100m，jdk9之后变为十个gc文件，每个大小为102400，实际上这里将每个gc文件大小设置为了100k

* Naming support aliyun STS auth. * Add UT for sts auth. * Fix UT stability.

* Revert "[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)" This reverts commit d16023c * Revert "[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)" This reverts commit 1ff7a3f

Optimize datasource name configuration reading

* Upgrade snakeYaml to 2.0 * Fix unit.

support tls encryption on grpc transport on client and server side --------- Co-authored-by: githubcheng2978 <yeliang.cheng@freemud.com>

shiyiyue1102 and others added 30 commits December 16, 2022 13:18

Develop optimize controplugin 20221214 (#9715)

1322486

* 限流插件优化 * 反脆弱插件移除nacos-sys依赖 * 移除nacos-sys依赖

增加检查服务端健康状态的功能。 (#9639)

c7bdc6a

update readme for Contact Ding Group (#9739)

b472d70

update readme for Contact Ding Group

修改长连接request response 类注册逻辑，由类扫描改成手动注册 (#9738)

6904707

* 修改request response 类加载逻辑，有类扫描改成手动注册 * 优化注册方式，直接SPI注册payload

Fix namespace v2 api auth not work problem. (#9754)

f093002

[ISSUE #9734] fix http login url ,add default port. (#9735)

42d9282

polish:change log level warn to info when succeed (#9749)

fbe7d95

RequestMappingHandlerMapping conflict (#9720)

7c4f614

RequestMappingHandlerMapping conflict

[ISSUE #9728] Prometheus http sd 返回空数组[] (#9762)

20c1830

* fix issue #9728 * reformat code style

[Enhance] Prevent double triiger ContextRefreshedEvent (#9757)

7e24ab9

* prevent double tigger event. * reformat code style

代码优化 (#9752)

ef212cc

调整timeout位置

fix: replace the concatenated string with a placeholder in the batchR…

60528cd

…emoveAggr method (#9646) (#9659)

remove unused local variables (#9781)

d51ad45

upgeade-spring-boot version to 2.6.14 (#9785)

b347b46

upgrade jraft version to 1.3.12; (#9790)

34ba381

upgrade rpc-grpc-impl version to 1.3.12

upgrade grpc-java version to 1.50.2, (#9799)

1bc2e41

protobuf-java to 3.21.11, proto-google-common-protos to 2.7.1

fix config auth failed. (#9807)

aa6ce2e

[#ISSUE 9733] return origin key if value is null in StringPool.get() (#…

5ac5688

…9798)

fix:replace nacos website url to https. (#9797)

708387c

Provide more configuration items to allow users to customize their gr…

732e701

…pc services to better optimize network performance. (#9806)

fix issue #9795 (#9844)

ba15e23

快照首次加载失败问题 (#9838)

01faa47

Modify the return value comment of the isBasicInfoChanged method (#9849)

4fa126f

fix #9819 (#9850)

332dc1d

Fix #9861, auth check before distro filter. (#9871)

fee349b

Fix Unit test problem. (#9884)

986c024

[ISSUE #9859]使用自定义的JWT生成/验证方法,而不依赖于jjwt. (#9873)

ade3f82

* 使用自定义jwt生成 * add unit test; fix log msg. * add license

4yDX3906 and others added 29 commits February 22, 2023 11:17

Fixed some minor bugs in CollectionUtils.java (#9989)

90bfe0a

* fix:CollectionUtils下for循环中的字符串拼接改用StringBuilder * fix:The LinkedHashSet in CollectionUtils.java lacks a generic * docs:a is used before a consonant; an is used before a vowel

✨ fix LDAP login failed (#9932)

4242fc6

* ✨ fix LDAP login failed ✨ fix LDAP AD login Ignore partial result exception * 🎨 checkstyle reformat

[ISSUE #9860] abstract the nacos logback configurator to solve the pr…

579571c

…oblem between different version (#9934) * logback update * update comment * ident update * comment update * judge version * remove logback-adapter

[ISSUE #9448] use local font files (#9995)

7ca8c59

- add some font files to local path Close #9448

fix #9954 -- timeunit. (#10004)

aebe583

Fix cluster node state error (#10011)

5a8f6f5

* Fix cluster node state error * Fix checkstyle

Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#…

a397c10

…9982) * Optimize the pom.xml of the nacos-client * optimize pom * exclude `google/**/*.proto` * tab * Remove dependency `io.grpc:protoc-gen-grpc-java:${version}:pom` * revert indent * revert native-image

[ISSUES #10029] optimize SearchableProperties building code (#10030)

ec9e281

Close #10029

编辑配置时代码支持折叠 (#10022)

acc8cbe

[ISSUE #9943] Resolve issue Config cas update not work (#9952)

e58c444

* fix issue 9943 * add some description * add some log for roll back transaction * add some log for roll back transaction * set default rollBackOnUpdateFail false. * format style * fix some bug

fix:Utility classes should not have public constructors (#10019)

74b81be

Remove http data change (#10043)

920fd4c

* Remove http way to report data change * Remove http controller method to receive data change

syntax error (#10041)

000f943

anyOne - anyone

[ISSUE #10038]load failover file. (#10048)

62ef024

* load failover file. * fix text unit error.

[ISSUES #10014] clear confused logic about namespace properties (#10023)

f969595

* [ISSUES #10014] clear confused logic about namespace properties - add getPropertyFrom method - optimize some code logic Close #10014 * fix ci error

[ISSUE #10052] ServerLoaderController Code optimization (#10058)

5aa272c

调整startup.sh关于gc log配置问题 (#10050)

22ff97d

startup.sh中对jdk9之前的gc log配置为十个gc文件，每个大小为100m，jdk9之后变为十个gc文件，每个大小为102400，实际上这里将每个gc文件大小设置为了100k

fix #10044 -- only update existed config. (#10045)

02a5e38

[ISSUE#10062] Naming support aliyun STS auth. (#10063)

383287c

* Naming support aliyun STS auth. * Add UT for sts auth. * Fix UT stability.

Update application.properties (#10078)

a2f17da

Optimize datasource name configuration reading

Re build console ui. (#10083)

bff133f

Use async appender to print log for nacos-client. (#10085)

34a29e7

Upgrade snakeYaml to 2.0 (#10092)

81dda26

* Upgrade snakeYaml to 2.0 * Fix unit.

nacos grpc connection supports TLS Encryption (#9980)

214e0c9

support tls encryption on grpc transport on client and server side --------- Co-authored-by: githubcheng2978 <yeliang.cheng@freemud.com>

Remove identity default value. (#10108)

cdd2be6

Upgrade to 2.2.1 (#10121)

8ab2058

KomachiSion merged commit cb0422e into master Mar 17, 2023
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge from develop. #10126

Merge from develop. #10126

KomachiSion commented Mar 17, 2023

Merge from develop. #10126

Merge from develop. #10126

Conversation

KomachiSion commented Mar 17, 2023

What is the purpose of the change

Brief changelog

Verifying this change