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

52 Commits

Author SHA1 Message Date
liu-xg
65da789215
fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录 (#9828) 
* fix(修复配置历史分页异常): 配置历史分页异常，所有页都是全部记录

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

* fix(修复配置历史分页异常): 修复代码格式不满足nacos要求
 2023-02-03 15:41:13 +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
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
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
李晓双 Li Xiao Shuang
00dea25de0
[ISSUE #9506] Sql extraction of group_capacity table (#9507) 
* sql extraction of group_capacity table

* sql extraction of group_capacity table

* sql extraction of group_capacity table

* sql extraction of group_capacity table
 2022-11-09 09:24:23 +08:00
李晓双 Li Xiao Shuang
0348014c17
[ISSUE #9490] Optimize datasource name configuration reading (#9491) 
* Optimize data source name configuration reading

* Optimize data source name configuration reading

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* Compatible with old and new datasource platform read

* fix unit test

* fix unit test
 2022-11-08 09:22:33 +08:00
The-Gamer-01
3750f73bd4
[ISSUE #9486]Optimizing paging parameters. (#9488) 2022-11-06 17:25:04 +08:00
李晓双 Li Xiao Shuang
6849af1547
Optimizing paging parameters (#9487) 2022-11-06 16:59:27 +08:00
李晓双 Li Xiao Shuang
40519a22d5
[ISSUE #9475] Abstract common count method (#9481) 
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
 2022-11-06 15:53:05 +08:00
The-Gamer-01
ff2497d999
[ISSUE #9449]Add Tenant Capacity mapper. (#9456) 2022-11-05 00:44:21 +08:00
李晓双 Li Xiao Shuang
d5fb300dd2
[ISSUE #9475] Abstract common count method (#9476) 
* Abstract common count method

* Abstract common count method

* Abstract common count method

* Abstract common count method
 2022-11-04 22:52:30 +08:00
李晓双 Li Xiao Shuang
9ea8333373
[ISSUE #9466] Modify the findMapper method of MapperManager to be a generic method (#9467) 
* Modify the findMapper method of MapperManager to be a generic method

* Modify the findMapper method of MapperManager to be a generic method
 2022-11-04 16:52:27 +08:00
The-Gamer-01
0aeb2bd2cc
[ISSUE #9449]Add Tenant Information mapper. (#9454) 2022-11-03 13:58:21 +08:00
KomachiSion
68d7f042d1 Fix update config info cas error. 2022-10-27 14:08:11 +08:00
李晓双 Li Xiao Shuang
97ca821cee
fix sql (#9386) 2022-10-25 00:58:34 +08:00
The-Gamer-01
7a4897830b
[ISSUE #8312]Merge sql. (#9385) 
* [ISSUE #8312]Merge sql.

* [ISSUE #8312]Fix bugs.
 2022-10-24 23:07:05 +08:00
KomachiSion
3cf00c7ccb Fix some derby datasource plugin sql problem. 2022-10-24 19:53:44 +08:00
The-Gamer-01
398959d931 [ISSUE #8312]Finish the datasource plugin. (#9226) 
* [ISSUE #8312]Finish the datasource plugin.

* [ISSUE #8312]Update derby PersistService impl.
 2022-10-24 15:34:40 +08:00
The-Gamer-01
a8d63609f2 [ISSUE #8312]Finish all mappers. (#9199) 
* [ISSUE #8312]Finish all mappers.

* [ISSUE #8312]Fix some bugs about mapper.
 2022-10-24 15:34:39 +08:00
The-Gamer-01
6a871b316f [ISSUE #8312]Update the mappers. (#9190) 
* [ISSUE #8312]Update the mappers.

* [ISSUE #8312]Update derby mappers.
 2022-10-24 15:34:38 +08:00
The-Gamer-01
6416e217a8 [ISSUE #8312]Update the ConfigInfoMapperByMySql and some derby mappers. (#9181) 2022-10-24 15:34:37 +08:00
The-Gamer-01
56c2a5954c [ISSUE #8312]Update the mappers. (#9171) 2022-10-24 15:34:35 +08:00
The-Gamer-01
30a9431bfc [ISSUE #8312]Update the mysql implementation of ConfigInfoAggrMapper and ConfigInfoBetaMapper. (#9159) 2022-10-24 15:34:35 +08:00
The-Gamer-01
77eb1915c9 [ISSUE #8312]Update all mapper. (#9145) 2022-10-24 15:34:33 +08:00
The-Gamer-01
0432b95c12 [ISSUE #8312] Add more mapper. (#9119) 
* [ISSUE #8312] Create ConfigInfoTagMapper, HisConfigInfoMapper and TenantInfoMapper.

* [ISSUE #8312] Add more mapper.

* [ISSUE #8312]Let mappers extend Mapper.
 2022-10-24 15:34:32 +08:00
The-Gamer-01
f44b28461a [ISSUE #8312] Create ConfigInfoBetaMapper.(#8312) (#9118) 2022-10-24 15:34:30 +08:00
The-Gamer-01
3ebd3b74ff [ISSUE#8312] Update ConfigInfoMapper and create ConfigInfoAggrMapper. (#9112) 
* Commit ConfigInfoMapper.

* Update ConfigInfoMapper and create ConfigInfoAggrMapper.
 2022-10-24 15:34:29 +08:00