zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,997 Commits 2 Branches 3 Tags 58 MiB
d1bd44625f
Commit Graph

338 Commits

Author SHA1 Message Date
杨翊 SionYang
ed64d1f055
Depend nacos logback adapter directly. (#12059) 2024-05-06 14:15:10 +08:00
shalk(xiao kun)
b2e506d7fe
[WIP] add junit jupiter (#12024) 
* add junit5 in compatible mode

* add junit5 jupiter and mockito jupiter
 2024-04-29 09:51:28 +08:00
shalk(xiao kun)
de10c07146
clean code remove unused dependency javatuple (#11976) 2024-04-24 15:51:58 +08:00
cxhello
17dea53d20
fix: CVE-2024-22262 Upgrade Spring to 5.3.34 (#11980) (#12003) 2024-04-24 15:44:30 +08:00
杨翊 SionYang
4d30b042ee
[ISSUE #11956] Move logback 12 and log4j2 adapter to single module. (#11996) 
* Move some basic logging classes into common module.

* Move logback 12 version adapter to single module.

* For checkstyle.

* Enhance logger adapter pom.

* Refactor the adapter initialization logic to avoid spi loader error.

* Move log4j2 logger adapter to single module.

* Fix the ut cover and create useless dir.
 2024-04-23 10:24:38 +08:00
cxhello
d179e47df4
fix: vulnerability (#11914) 
- CVE-2024-22257 Upgrade Spring Security to 5.7.12.
- Use spring-framework-bom as dependencyManagement.

Closes #11904
 2024-04-08 10:43:18 +08:00
cxhello
19a857b701
fix: CVE-2024-22243 & CVE-2024-22259 Upgrade Spring Web to 5.3.33 (#11833) 2024-04-01 16:48:33 +08:00
徐晓伟
08edb4fbd6
⬆️ upgrade mysql-connector-java from 8.0.28 to 8.0.33 (#11875) 
https://github.com/alibaba/nacos/issues/11874
 2024-03-26 16:22:06 +08:00
杨翊 SionYang
b7c3905976
Upgrade to 2.4.0-SNAPSHOT. (#11795) 2024-03-04 16:55:45 +08:00
杨翊 SionYang
92dda945a0
Upgrade to 2.3.1 (#11791) 2024-03-04 11:23:41 +08:00
dingjiefei
fdbc99dd99
Update the sofa-jraft version to resolve the issue of the server cannot connect to the client (#11721) 
* update sofa-jraft version

* fix JRaftServerTest.testRefreshRouteTable

* remove unnecessary Mockito stubbings
 2024-02-27 14:40:28 +08:00
lcmarvin
889a78a82b
[ISSUE #11706] Fix the Chinese description in announcement under English console. (#11729) 2024-02-27 10:28:58 +08:00
blake.qiu
7d085a8846
build(11749): upgrade spring boot version. (#11755) 2024-02-20 13:35:55 +08:00
杨翊 SionYang
9e48e8cb3b
Develop client ut (#11557) 
* Add UT for client module logging package.

* Add UT for client module utils package.

* Add UT for client module naming package.

* For checkstyle.

* For PMD.
 2023-12-26 11:53:26 +08:00
dependabot[bot]
cd2d4149b5
Bump ch.qos.logback:logback-core from 1.2.9 to 1.2.13 (#11472) 
Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.2.9 to 1.2.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.2.9...v_1.2.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-06 13:11:14 +08:00
杨翊 SionYang
319ec8c257
Upgrade to 2.3.1-SNAPSHOT (#11469) 2023-12-06 13:09:46 +08:00
杨翊 SionYang
7b51777eec
Upgrade to 2.3.0 (#11444) 2023-11-28 18:42:29 +08:00
杨翊 SionYang
03987330a4
Upgrade dependency to reduce conflicts and add leak UT coverage files. (#11396) 
* Remove custom jackson version and jackson-core-asl.

* Upgrade protobuf relative version to reduce conflict with grpc.

* 补充提交遗漏单测覆盖率的模块。
 2023-11-17 17:56:50 +08:00
杨翊 SionYang
3a2fee5655
Upgrade to 2.3.0-BETA. (#11262) 2023-10-19 09:21:38 +08:00
杨翊 SionYang
c4aac2b82f
Fill ut for common module (#11247) 
* Do some refactor and add UT for common package.

* Do some refactor and add UT for common package.

* Do some refactor and add UT for common package.

* Fix UT.
 2023-10-13 14:46:04 +08:00
杨翊 SionYang
7f44132b30
Upgrade grpc version to 1.57.2 (#11199) 2023-09-27 17:23:56 +08:00
Guangdong Liu
35bc0373a5
fix CVE-2023-34034 (#11041) 2023-09-06 17:08:03 +08:00
杨翊 SionYang
876af46864
[ISSUE#10971] Add state to disable console ui and add api to get guide information. (#10982) 
* state api return console_ui_enabled state.

* Add guide api to make console generate guide page.

* console-guide.conf 不需要校验rat.
 2023-08-17 11:34:25 +08:00
Darren Luo
f40e5937ec
提交 native-image 的 Reachability Metadata (#10634) 2023-06-19 10:45:09 +08:00
ZhangShenao
44115d8a89
[bot pr#10648] Optimize Guava Dependency (#10651) 2023-06-19 10:41:48 +08:00
The-Gamer-01
9e7ba8cf4b
[ISSUE #10388] Fix third-party component bugs (#10504) 2023-05-17 17:10:12 +08:00
KomachiSion
131dc643b3 Merge remote-tracking branch 'upstream/develop' into asoc2022_issue#8460-2 
# Conflicts:
#	persistence/src/test/java/com/alibaba/nacos/persistence/configuration/condition/ConfigChangeConfigsTest.java
 2023-05-11 15:41:17 +08:00
KomachiSion
f83061f47d Move some datasource and relative classes into persistence module. 2023-04-23 16:00:42 +08:00
杨翊 SionYang
0e0a73e025
Revert "[issue #10148]Replace sync forward request with async request (#10158)" (#10358) 
This reverts commit a273705b8d.
 2023-04-20 20:12:33 +08:00
Zhaohui Yu
a273705b8d
[issue #10148]Replace sync forward request with async request (#10158) 
* Replace sync forward request with async request in DistroFilter. issue #10148

* extract method for config default headers

* add env switch for async distro forward.

* Fixed code review problems:
1. Move async forward switch from sys module to naming module.
2. use nacos code style to format code.

* Fixed nacos code checkstyle:
1. one import per Class
2. add javadoc

* In order to avoid additional overhead, move switch from GlobalConfig to ClientConfig and cache the env switch.

* Move switch from ClientConfig to DistroConfig.

* Removed unused import.

* Add test for async forward for DistroFilter

* Add license

* rename test method name

* Should enable async forward

* fixed test

* set async forward request switch to true in test

* fixed test: create and set property with MockEnvironment

* fixed check style

* move MockEnvironment init to BeforeClass

* add setter for asyncForwardRequest switch
 2023-04-20 20:10:26 +08:00
杨翊 SionYang
b3b5236cd4
Develop synced from 2.2.2 (#10307) 
* Fix dynamic change token to illegal value will use old token.

* Add description in pom for release.

* Upgrade to 2.2.2

* Upgrade to 2.3.0-SNAPSHOT
 2023-04-11 17:34:06 +08:00
杨翊 SionYang
e26dc2fb23
Merge pull request #10277 from alibaba/develop#10153 
Develop#10153
 2023-04-06 17:25:18 +08:00
kanlon
2bca057137
[ISSUE #7698] refactor: remove httpasyncclient version dependency management, avoid version conflicts (#10170) 
* refactor: remove httpasyncclient version dependency management, Avoid version conflicts

* refactor: remove httpasyncclient.version
 2023-03-31 14:53:21 +08:00
杨翊 SionYang
5fffde5bde
[ISSUE#10153] Add auth state into /state api and add announcement api. (#10203) 
* Add ModuleState and use ModuleState replace ServerStateController.

* Add AuthModuleStateBuilder

* state接口使用ModuleState.

* Add announcement api.

* skip rat scan for announcement.conf

* default plugin open login page when auth.enabled=true.
 2023-03-27 19:00:22 +08:00
杨翊 SionYang
8ab205832d
Upgrade to 2.2.1 (#10121) 2023-03-17 17:32:32 +08:00
杨翊 SionYang
81dda26709
Upgrade snakeYaml to 2.0 (#10092) 
* Upgrade snakeYaml to 2.0

* Fix unit.
 2023-03-14 13:15:51 +08:00
WangLiang/王良
6ba05fa7a8
Replace flatten-maven-plugin with easyj-maven-plugin (#9985) 
* 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
 2023-03-02 10:43:08 +08:00
WangLiang/王良
a397c10a54
Optimize the nacos-client/pom.xml for exclude google/**/*.proto (#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
 2023-03-01 09:42:15 +08:00
杨翊 SionYang
428e0bc668
Develop add unit test api (#9910) 
* Add some unit test for api.

* Add Unit test for api.naming.utils.

* Add Unit test for api.naming.ability.

* Add Unit test for some pojo.

* Add Unit test for naming.pojo.

* For checkstyle.
 2023-02-07 17:05:35 +08:00
杨翊 SionYang
4db3e8c28f
[ISSUE #9816] Add expected final state for redo data. (#9893) 
* Fix #9816, add expected final state to make redo task execute right finally.

* Upgrade version to 2.2.1-SNAPSHOT.
 2023-02-03 14:13:08 +08:00
xzxiaoshan
41f03fea0f
[ISSUE#9730] 对多数据源插件代码进行调整（向前兼容） (#9784) 
* 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>
 2023-01-16 16:14:29 +08:00
李云飞
d45ba449ca
[ISSUE #8460]add config change plugin (#9820) 2023-01-16 10:04:24 +08:00
gongzhongqiang
708387c277
fix:replace nacos website url to https. (#9797) 2023-01-10 09:47:52 +08:00
Weizhan Yun
1bc2e4185e
upgrade grpc-java version to 1.50.2, (#9799) 
protobuf-java  to 3.21.11, proto-google-common-protos to 2.7.1
 2023-01-05 17:27:56 +08:00
Weizhan Yun
34ba3818ce
upgrade jraft version to 1.3.12; (#9790) 
upgrade rpc-grpc-impl version to 1.3.12
 2023-01-04 09:39:23 +08:00
Karson
b347b46549
upgeade-spring-boot version to 2.6.14 (#9785) 2023-01-03 15:39:07 +08:00
KomachiSion
4573705584 Upgrade to 2.2.0. 2022-12-14 11:23:49 +08:00
nov.lzf
acc8ab46cf
Refactor connection limit module to plugin (#9653) 
* 限流插件提交

* 限流插件提交

* 限流插件提交

* 限流插件重构提交

* connection control test case submit

* tps control test case submit

* tps control test case submit

* tps control test case submit

* exact model has higher priority

* exact model has higher priority

* tpsreporter

* tpsreporter

* tpsreporter

* check style

* log optimize

* interceptor

* checkstyle

* tps check

* configController query http

* rename component

* 优化参数命名

* 优化参数命名

* 优化参数命名

* 优化参数命名

* optimize connection manager

* optimize connection manager

* optimize connection manager

* optimize connection manager

* interceptor to mse

* Monitor Model

* Monitor Model

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* revert opensource tps ability

* opensource submit

* opensource submit

* check style

* check style

* pmd ,rat

* update db params

* test case fix

* 简化开源反脆弱实现

* test case

* test  case fix

* 修复单测

* 修复单测

* 修复单测
 2022-12-06 16:15:51 +08:00
Karson
4bd5b7c85a
support prometheus sd (#9518) 2022-11-17 11:13:51 +08:00
dependabot[bot]
8292d2ccb1
Bump jackson-databind from 2.12.6.1 to 2.12.7.1 (#9582) 
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.12.6.1 to 2.12.7.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-17 10:59:04 +08:00