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

V3.0 develop sync develop #12933

Merged

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.

DaniellaHubble and others added 15 commits November 22, 2024 14:14
…edirected to the login page without pop-ups. (related issue alibaba#11153) (alibaba#12907)

* Remove excess code.(related issue alibaba#12871 )

* Log in to the console through a browser http://ip:8848/nacos and be redirected to the login page without pop-ups. (related issue alibaba#11153)
…12892)

 config query chain of responsibility model refactor
alibaba#12805)

* The error message is not user-friendly when adding duplicate permissions. (alibaba#12273)

* The error message is not user-friendly when adding duplicate permissions. (alibaba#12773)

* add some unit test.

* fix ci fail.
alibaba#12803)

* The error message is not user-friendly when adding duplicate permissions. (alibaba#12773)

* The error message is not user-friendly when adding duplicate permissions.(alibaba#12773)
…cilitate the extension and implementation of databases like Oracle. (alibaba#12343)

* Improve the retrieval of ConfigInfoState to facilitate the extension and implementation of databases like Oracle.

* Add unit tests for the SQL construction part of the `ExternalConfigInfoPersistServiceImpl#findConfigInfoState` method.

* Enhance the construction of the delete statement in AbstractMapper by using a unified appendWhereClause method to construct the WHERE clause. Modify appendWhereClause to be protected, allowing for customization based on different database types, such as adjustments according to column names.
…ibe exception (alibaba#12929)

* when get cached all instance with `subscribe` exception, will return cached instance not throw exception.

* For checkstyle
…rmissions or binding relationship. (alibaba#12926)

* Fix unfriendly message when adding duplicate roles.

* unit test.

* correct code style.

* correct code style.

* correct code style.
…libaba#12914)

* feat(优化抽象类AbstractMapper) 将for循环拼接的SQL语句改为Lambda表达式拼接,使得代码简洁清晰,并添加相关测试用例

* [ISSUE alibaba#12914] 优化抽象类AbstractMapper,将for循环拼接的SQL语句改为Lambda表达式拼接,使得代码简洁清晰,并添加相关测试用例

* [ISSUE alibaba#12911] resolve code conflict
…0-develop-sync-develop

# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandler.java
#	config/src/test/java/com/alibaba/nacos/config/server/controller/v2/ConfigControllerV2Test.java
#	config/src/test/java/com/alibaba/nacos/config/server/remote/ConfigQueryRequestHandlerTest.java
#	console-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console/src/main/resources/static/console-ui/public/js/main.js
#	console/src/main/resources/static/index.html
#	console/src/main/resources/static/js/main.js
Copy link

github-actions bot commented Dec 9, 2024

Thanks for your this PR. 🙏
Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration.
If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io


感谢您提交的PR。 🙏
请再次查看您的PR内容,确认是否包含任何使用方式/API/配置参数的变更,如:新增API新增配置参数修改默认配置等操作。
如果是,请确保在提交之前,在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档(markdown格式)。

@KomachiSion KomachiSion merged commit c3010a1 into alibaba:v3.0-develop Dec 9, 2024
1 check passed
@KomachiSion KomachiSion deleted the v3.0-develop-sync-develop branch December 9, 2024 07:47
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.

10 participants