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

97 Commits

Author SHA1 Message Date
Darren Luo
069c6f920c
[ISSUE #10593]修改 nacos-contrl-plugin 的数据落地位置 (#10638) 
* 修改nacos-contrl-plugin插件中落地数据的 defaultBaseDir() 方法，使其不产生特殊的文件夹而落到运行目录的data文件夹下

* remove unused import
 2023-06-15 10:29:20 +08:00
suncong
ee30e354d1
Update MapperProxy.java (#10487) 
* Update MapperProxy.java

fix:代理类打印日志错误

* Update MapperProxy.java

fix:代理类打印日志错误

* 规范格式

* Update MapperProxy.java

reformat code

* Update MapperProxy.java

reformat code
 2023-05-17 16:57:56 +08:00
KomachiSion
5897a61e8e Fix start error. 2023-05-11 20:09:33 +08:00
KomachiSion
f0336b86e8 Remove useless method and field. 2023-05-11 17:19:27 +08:00
KomachiSion
23780d9b15 ConfigChangeAspect 去除对插件实现的感知。 2023-05-11 16:44:29 +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
a972e02b13 Move NACOS_PLUGIN_DATASOURCE_LOG to datasource plugin module. 2023-05-08 20:34:07 +08:00
vivid
5c4bbe85f7 补充完整剩余dataSource的MapperContext改造 (#10140) 2023-04-14 15:28:47 +08:00
KomachiSion
08f7c9ff2a Re-commit #9851 #9967. 2023-04-14 15:28:47 +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
varyuan
2dde125a51
clean code (#10180) 
* clean code

* clean code

* clean code

* clean code
 2023-03-29 14:25:22 +08:00
zhanghong
953fa9e74b
修改mapperProxy单例 (#10162) 2023-03-28 09:41:46 +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
1968b3fc98
Develop revert#9851 #9967 (#10069) 
* Revert "[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967)"

This reverts commit d16023c1

* Revert "[ISSUE #9821] Update data-source-plugin input and output parameters (#9851)"

This reverts commit 1ff7a3f6
 2023-03-10 10:25:25 +08:00
zhanghong
a6332b250d
[ISSUE #9276] 新增根据配置信息检索内容的功能 (#9925) 
* 新增根据配置信息检索内容的功能

* use offer replace add

* use offer replace add

* use offer replace add

* update exception type and  limit some config as configurable

* update

* update params

* update params

* update params
 2023-02-21 10:25:19 +08:00
The-Gamer-01
d16023c156
[ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters (#9967) 
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.

* Added Map mapping refinement corresponding to UPDATE and WHERE.

* [ISSUE #9821] Fix API of return class of ConfigInfoAggrMapper.

* [ISSUE #9821] Update ConfigInfoBetaMapper data-source-plugin input and output parameters
 2023-02-20 10:04:10 +08:00
The-Gamer-01
1ff7a3f6bd
[ISSUE #9821] Update data-source-plugin input and output parameters (#9851) 
* Add MapperContext and MapperResult.

* Update ConfigInfoAggrMapper by MapperContext and MapperResult.

Update ConfigInfoAggrMapper by MapperContext and MapperResult.

* resolve git conflicts.
 2023-02-10 09:45:14 +08:00
liu-xg
65da789215
fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录 (#9828) 
* fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求
 2023-02-03 15:41:13 +08:00
云野
332dc1d348
fix #9819 (#9850) 2023-01-28 10:35:57 +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
wenxuan70
60528cd21b
fix: replace the concatenated string with a placeholder in the batchRemoveAggr method (#9646) (#9659) 2023-01-03 12:05:31 +08:00
nov.lzf
1322486849
Develop optimize controplugin 20221214 (#9715) 
* 限流插件优化

* 反脆弱插件移除nacos-sys依赖

* 移除nacos-sys依赖
 2022-12-16 13:18:44 +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
hth
0e346f0024
Code optimization, remove useless code. (#9620) 
* Code optimization, remove useless code.

* code optimization
 2022-11-25 14:50:44 +08:00
The-Gamer-01
b14cc257bf
[ISSUE #9510]Add sql log print function. (#9511) 
* [ISSUE #9510]Add sql log print function.

* [ISSUE #9510]Remove AspectJ and add sql proxy.

* [ISSUE #9510]Update data source plugin log.

* [ISSUE #9510]Update args log.

* [ISSUE #9510]Add unit test.
 2022-11-11 11:28:22 +08:00
李晓双 Li Xiao Shuang
d7e296d1fd
Add unit tests to GroupCapacityMapperByDerby class (#9546) 2022-11-11 11:22:39 +08:00
李晓双 Li Xiao Shuang
2bfca22412
Add unit tests to ConfigInfoTagRelationMapperByDerby class (#9545) 2022-11-11 11:22:16 +08:00
李晓双 Li Xiao Shuang
70cfa4c234
Add unit tests to ConfigInfoTagMapperByDerby class (#9544) 2022-11-11 11:21:56 +08:00
李晓双 Li Xiao Shuang
3dc72d827e
Add unit tests to ConfigInfoMapperByDerby class (#9543) 2022-11-11 11:21:31 +08:00
李晓双 Li Xiao Shuang
3aee80aa78
Add unit tests to ConfigInfoBetaMapperByDerby class (#9542) 2022-11-11 11:21:08 +08:00
李晓双 Li Xiao Shuang
c5a0a5b3b5
Add unit tests to ConfigInfoAggrMapperByDerby class (#9541) 2022-11-11 11:19:40 +08:00
李晓双 Li Xiao Shuang
28ac7a669f
Add unit tests to HistoryConfigInfoMapperByDerby class (#9547) 2022-11-11 10:25:22 +08:00
李晓双 Li Xiao Shuang
de7e3b9d3e
Add unit tests to TenantCapacityMapperByDerby class (#9548) 2022-11-11 10:23:35 +08:00
李晓双 Li Xiao Shuang
226d1bacd0
Add unit tests to TenantInfoMapperByDerby class (#9549) 2022-11-11 10:22:39 +08:00
李晓双 Li Xiao Shuang
8995de31f0
Add unit tests to ConfigInfoAggrMapperByMySql class (#9524) 2022-11-10 15:16:18 +08:00
李晓双 Li Xiao Shuang
7e2e5dd07e
[ISSUE #9524] Add unit tests to ConfigInfoBetaMapperByMySql class (#9525) 
* Add unit tests to ConfigInfoBetaMapperByMySql class

* Add unit tests to ConfigInfoBetaMapperByMySql class
 2022-11-10 15:15:45 +08:00
李晓双 Li Xiao Shuang
e2931f324c
[ISSUE #9523] Add unit tests to ConfigInfoMapperByMySql class (#9526) 
* Add unit tests to ConfigInfoMapperByMySql class

* Add unit tests to ConfigInfoMapperByMySql class
 2022-11-10 15:15:17 +08:00
李晓双 Li Xiao Shuang
3b40d41723
Add unit tests to ConfigInfoTagMapperByMySql class (#9527) 2022-11-10 15:14:07 +08:00
李晓双 Li Xiao Shuang
5f815e69b1
Add unit tests to ConfigTagsRelationMapperByMySql class (#9528) 2022-11-10 15:13:30 +08:00
李晓双 Li Xiao Shuang
ac8a24754e
Add unit tests to HistoryConfigInfoMapperByMySql class (#9530) 2022-11-10 15:12:59 +08:00
李晓双 Li Xiao Shuang
a6197af66f
Add unit tests to TeantCapacityMapperByMySql class (#9531) 2022-11-10 15:12:14 +08:00
李晓双 Li Xiao Shuang
ba57944063
Add unit tests to TeantInfoMapperByMySql class (#9532) 2022-11-10 15:11:42 +08:00
李晓双 Li Xiao Shuang
6465cd42c5
Add unit tests to AbstractMapper class (#9533) 2022-11-10 15:11:07 +08:00
李晓双 Li Xiao Shuang
a42e55e43f
Add unit tests to MapperManager class (#9534) 2022-11-10 15:10:16 +08:00
李晓双 Li Xiao Shuang
7c1e5483b6
Add unit tests to GroupCapacityMapperByMySql class (#9529) 2022-11-10 15:09:11 +08:00
无处不在
ec7ba18792
[impr]Update some method from RETURN_GENERATED_KEYS replace to String[]{"id"},Avoid database compatibility issues (#9515) 2022-11-10 09:42:38 +08:00
李晓双 Li Xiao Shuang
3f1b96b15a
[ISSUE #9516] Clean up PersistService invalid code logic (#9517) 
* Clean up PersistService invalid code logic

* Clean up PersistService invalid code logic

* Clean up PersistService invalid code logic
 2022-11-10 09:42:35 +08:00