From a4647337203cb649955ecb5bd9a04fb63d0a98e0 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 07:47:55 +0800 Subject: [PATCH 001/159] =?UTF-8?q?*=20=E8=AE=BE=E8=AE=A1=20database=20plu?= =?UTF-8?q?gin=20=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos-plugin-datasource/pom.xml | 28 ++++ .../nacos/plugin/datasource/DialectNames.java | 11 ++ .../base/dialect/DatabaseDialect.java | 5 + .../base/mapper/BaseConfigInfoAggrMapper.java | 16 +++ .../base/mapper/BaseConfigInfoBetaMapper.java | 16 +++ .../base/mapper/BaseConfigInfoMapper.java | 77 ++++++++++ .../base/mapper/BaseConfigInfoTagMapper.java | 16 +++ .../mapper/BaseConfigTagRelationMapper.java | 21 +++ .../base/mapper/BaseGroupCapacityMapper.java | 16 +++ .../mapper/BaseHistoryConfigInfoMapper.java | 21 +++ .../datasource/base/mapper/BaseMapper.java | 33 +++++ .../base/mapper/BaseTenantCapacityMapper.java | 16 +++ .../base/mapper/BaseTenantInfoMapper.java | 9 ++ pom.xml | 132 ++++++++++++++++++ 14 files changed, 417 insertions(+) create mode 100644 nacos-plugin-datasource/pom.xml create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java create mode 100644 pom.xml diff --git a/nacos-plugin-datasource/pom.xml b/nacos-plugin-datasource/pom.xml new file mode 100644 index 0000000..49145e5 --- /dev/null +++ b/nacos-plugin-datasource/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + io.github.bes2008.solution.nacos.plugins + nacos-plugins + 1.0.0 + + + nacos-plugin-datasource + + + 8 + 8 + UTF-8 + + + + + + com.alibaba.nacos + nacos-datasource-plugin + + + + \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java new file mode 100644 index 0000000..0aeb2da --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java @@ -0,0 +1,11 @@ +package com.jn.nacos.plugin.datasource; + +import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; + +public class DialectNames extends DataSourceConstant { + public static final String OPENGAUSS = "opengauss"; + public static final String MAGICDATA = "magicdata"; + public static final String DAMENG = "dm"; + + +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java new file mode 100644 index 0000000..90fee5c --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -0,0 +1,5 @@ +package com.jn.nacos.plugin.datasource.base.dialect; + +public interface DatabaseDialect { + String getFunction(String functionName); +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java new file mode 100644 index 0000000..fea697d --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { + public BaseConfigInfoAggrMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult findConfigInfoAggrByPageFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java new file mode 100644 index 0000000..602cea3 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { + public BaseConfigInfoBetaMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult findAllConfigInfoBetaForDumpAllFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java new file mode 100644 index 0000000..234d07a --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java @@ -0,0 +1,77 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { + + public BaseConfigInfoMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult findConfigInfoByAppFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult getTenantIdList(MapperContext context) { + return null; + } + + @Override + public MapperResult getGroupIdList(MapperContext context) { + return null; + } + + @Override + public MapperResult findAllConfigKey(MapperContext context) { + return null; + } + + @Override + public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findAllConfigInfoFragment(MapperContext context) { + return null; + } + + @Override + public MapperResult findChangeConfigFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findConfigInfoBaseLikeFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findAllConfigInfoFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java new file mode 100644 index 0000000..611ad20 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { + public BaseConfigInfoTagMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java new file mode 100644 index 0000000..70488e9 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java @@ -0,0 +1,21 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { + public BaseConfigTagRelationMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { + return null; + } + + @Override + public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java new file mode 100644 index 0000000..dcea52f --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { + public BaseGroupCapacityMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult selectGroupInfoBySize(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java new file mode 100644 index 0000000..e0efb58 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java @@ -0,0 +1,21 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { + public BaseHistoryConfigInfoMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult removeConfigHistory(MapperContext context) { + return null; + } + + @Override + public MapperResult pageFindConfigHistoryFetchRows(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java new file mode 100644 index 0000000..2ccc0e5 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java @@ -0,0 +1,33 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; +import com.jn.langx.lifecycle.Initializable; +import com.jn.langx.lifecycle.InitializationException; +import com.jn.langx.util.Preconditions; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public abstract class BaseMapper extends AbstractMapper implements Initializable { + private String databaseId; + protected DatabaseDialect databaseDialect; + + public BaseMapper(String databaseId){ + Preconditions.checkNotEmpty(databaseId,"database id is empty"); + this.databaseId = databaseId; + this.init(); + } + + @Override + public void init() throws InitializationException { + databaseDialect = null; + } + + @Override + public String getDataSource() { + return databaseId; + } + + @Override + public String getFunction(String functionName) { + return this.databaseDialect.getFunction(functionName); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java new file mode 100644 index 0000000..e4788b4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; +import com.alibaba.nacos.plugin.datasource.model.MapperResult; + +public class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { + public BaseTenantCapacityMapper(String databaseId) { + super(databaseId); + } + + @Override + public MapperResult getCapacityList4CorrectUsage(MapperContext context) { + return null; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java new file mode 100644 index 0000000..a303e73 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java @@ -0,0 +1,9 @@ +package com.jn.nacos.plugin.datasource.base.mapper; + +import com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper; + +public class BaseTenantInfoMapper extends BaseMapper implements TenantInfoMapper { + public BaseTenantInfoMapper(String databaseId) { + super(databaseId); + } +} diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a5f7cac --- /dev/null +++ b/pom.xml @@ -0,0 +1,132 @@ + + + 4.0.0 + + io.github.bes2008.solution.nacos.plugins + nacos-plugins + 1.0.0 + pom + ${project.groupId}:${project.artifactId}:${project.version} + + + nacos plugins + + + nacos-plugin-datasource + + + + 1.8 + 1.8 + UTF-8 + + 1.23 + 5.4.3 + 1.17.0 + 2.4.1 + + + + + + org.openjdk.jmh + jmh-core + ${jmh.version} + test + + + org.openjdk.jmh + jmh-generator-annprocess + ${jmh.version} + test + + + io.github.bes2008.solution.langx + langx-java + ${langx-java.version} + + + com.alibaba.nacos + nacos-datasource-plugin + ${nacos.version} + + + com.alibaba.nacos + nacos-common + ${nacos.version} + + + commons-codec + commons-codec + ${commons-codec.version} + provided + + + + + + + org.openjdk.jmh + jmh-core + + + org.openjdk.jmh + jmh-generator-annprocess + + + io.github.bes2008.solution.langx + langx-java + + + com.alibaba.nacos + nacos-common + + + commons-codec + commons-codec + + + + + + + ${basedir}/src/main/java + ${project.build.outputDirectory} + + **/*.java + + + + ${basedir}/src/main/resources + false + + **/* + + + + + + ${basedir}/src/test/java + ${project.build.testOutputDirectory} + + **/*.java + + + **/*.json + **/*.txt + **/*.log + + + + ${basedir}/src/test/resources + ${project.build.testOutputDirectory} + false + + **/* + + + + + \ No newline at end of file -- Gitee From acee15f2143a254846c52c045c83315a456ad549 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 08:56:27 +0800 Subject: [PATCH 002/159] =?UTF-8?q?*=20=E8=AE=BE=E8=AE=A1=20database=20plu?= =?UTF-8?q?gin=20=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos-plugin-datasource/pom.xml | 5 +++ .../base/dialect/DatabaseDialect.java | 32 +++++++++++++++++-- .../base/mapper/BaseTenantCapacityMapper.java | 9 +++++- .../opengauss/OpenGaussDatabaseDialect.java | 24 ++++++++++++++ pom.xml | 7 ++++ 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java diff --git a/nacos-plugin-datasource/pom.xml b/nacos-plugin-datasource/pom.xml index 49145e5..ea1ffed 100644 --- a/nacos-plugin-datasource/pom.xml +++ b/nacos-plugin-datasource/pom.xml @@ -23,6 +23,11 @@ com.alibaba.nacos nacos-datasource-plugin + + io.github.bes2008.solution.sqlhelper + sqlhelper-dialect + + \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java index 90fee5c..02a7bab 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -1,5 +1,33 @@ package com.jn.nacos.plugin.datasource.base.dialect; -public interface DatabaseDialect { - String getFunction(String functionName); +import com.jn.sqlhelper.dialect.Dialect; +import com.jn.sqlhelper.dialect.SQLDialectException; +import com.jn.sqlhelper.dialect.pagination.PagedPreparedParameterSetter; +import com.jn.sqlhelper.dialect.pagination.QueryParameters; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; + +public abstract class DatabaseDialect { + + public abstract String getDatabase(); + public abstract String getFunction(String functionName); + + protected Dialect dialect; + + private int bindLimitParametersAtStartOfQuery(RowSelection paramRowSelection, List params, int paramInt){ + + } + + public int bindLimitParametersAtEndOfQuery(RowSelection paramRowSelection, List params, int paramInt){ + + } + + public String getLimitSql(String sql, RowSelection rowSelection){ + return this.dialect.getLimitSql(sql, rowSelection); + } + } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java index e4788b4..b14ba7f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java @@ -1,5 +1,7 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; @@ -11,6 +13,11 @@ public class BaseTenantCapacityMapper extends BaseMapper implements TenantCapaci @Override public MapperResult getCapacityList4CorrectUsage(MapperContext context) { - return null; + + String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>?"; + MapperResult result= new MapperResult(sql, CollectionUtils.list(context.getWhereParameter(FieldConstant.ID), + context.getWhereParameter(FieldConstant.LIMIT_SIZE))); + + return result; } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java new file mode 100644 index 0000000..4d559be --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java @@ -0,0 +1,24 @@ +package com.jn.nacos.plugin.datasource.impl.opengauss; + +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.sqlhelper.dialect.Dialect; +import com.jn.sqlhelper.dialect.DialectRegistry; + +public class OpenGaussDatabaseDialect implements DatabaseDialect { + + private Dialect dialect; + private String database; + public OpenGaussDatabaseDialect(String database){ + this.dialect = DialectRegistry.getInstance().getDialectByName(database); + } + + @Override + public String getDatabase() { + return this.database; + } + + @Override + public String getFunction(String functionName) { + return null; + } +} diff --git a/pom.xml b/pom.xml index a5f7cac..308215a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 5.4.3 1.17.0 2.4.1 + 5.0.1 @@ -63,6 +64,11 @@ ${commons-codec.version} provided + + io.github.bes2008.solution.sqlhelper + sqlhelper-dialect + ${sqlhelper.version} + @@ -87,6 +93,7 @@ commons-codec commons-codec + -- Gitee From 9c03e0c1b0876ddfc5751849ed7587274a8eb7b4 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 23:00:33 +0800 Subject: [PATCH 003/159] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9B=E5=A4=9A?= =?UTF-8?q?=E7=A7=8D=20dialect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/base/DatabaseTypes.java | 15 ++++++ .../base/dialect/DatabaseDialect.java | 48 ++++++++++++------- .../db/dm/dialect/DmDatabaseDialect.java | 10 ++++ .../dialect/KingbaseDatabaseDialect.java | 10 ++++ .../dailect/MagicDataDatabaseDialect.java | 10 ++++ .../dialect/OpenGaussDatabaseDialect.java | 10 ++++ .../opengauss/OpenGaussDatabaseDialect.java | 24 ---------- pom.xml | 2 +- 8 files changed, 88 insertions(+), 41 deletions(-) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java delete mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java new file mode 100644 index 0000000..8501e9f --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java @@ -0,0 +1,15 @@ +package com.jn.nacos.plugin.datasource.base; + +import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; + +public class DatabaseTypes extends DataSourceConstant { + public static final String OPENGAUSS = "opengauss"; + + public static final String KINGBASE = "kingbase"; + + public static final String MAGICDATA = "magicdata"; + + public static final String DAMENG = "dm"; + + public static final String POSTGRESQL = "postgresql"; +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java index 02a7bab..7e8880a 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -1,33 +1,49 @@ package com.jn.nacos.plugin.datasource.base.dialect; +import com.google.common.collect.Maps; +import com.jn.langx.text.StringTemplates; +import com.jn.langx.util.Objs; import com.jn.sqlhelper.dialect.Dialect; -import com.jn.sqlhelper.dialect.SQLDialectException; -import com.jn.sqlhelper.dialect.pagination.PagedPreparedParameterSetter; -import com.jn.sqlhelper.dialect.pagination.QueryParameters; +import com.jn.sqlhelper.dialect.DialectRegistry; +import com.jn.sqlhelper.dialect.instrument.Instrumentations; import com.jn.sqlhelper.dialect.pagination.RowSelection; -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.SQLException; import java.util.List; +import java.util.Map; public abstract class DatabaseDialect { - public abstract String getDatabase(); - public abstract String getFunction(String functionName); - - protected Dialect dialect; - - private int bindLimitParametersAtStartOfQuery(RowSelection paramRowSelection, List params, int paramInt){ - + private String name; + private Dialect delegate; + private Map functionMap; + public DatabaseDialect(String name){ + this.name = name; + this.delegate = DialectRegistry.getInstance().getDialectByName(name); + this.functionMap = initFunctionMap(); } - public int bindLimitParametersAtEndOfQuery(RowSelection paramRowSelection, List params, int paramInt){ - + protected Map initFunctionMap(){ + Map map = Maps.newHashMap(); + map.put("NOW()", "CURRENT_TIMESTAMP"); + return map; + } + public String getFunction(String functionName){ + String func =this.functionMap.get(functionName); + if(Objs.isEmpty(func)){ + throw new RuntimeException(StringTemplates.formatWithPlaceholder("function {} in {} database dialect is not supported", functionName, this.getName())); + } + return func; } public String getLimitSql(String sql, RowSelection rowSelection){ - return this.dialect.getLimitSql(sql, rowSelection); + return this.delegate.getLimitSql(sql, rowSelection); + } + + public List rebuildParameters(List queryParams, RowSelection selection){ + return Instrumentations.rebuildParameters(this.delegate, queryParams, selection); } + public String getName() { + return name; + } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java new file mode 100644 index 0000000..bbb7d5c --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.dialect; + +import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class DmDatabaseDialect extends DatabaseDialect { + public DmDatabaseDialect() { + super(DatabaseTypes.DAMENG); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java new file mode 100644 index 0000000..cc3b596 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.dialect; + +import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class KingbaseDatabaseDialect extends DatabaseDialect { + public KingbaseDatabaseDialect() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java new file mode 100644 index 0000000..a65c535 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.dailect; + +import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class MagicDataDatabaseDialect extends DatabaseDialect { + public MagicDataDatabaseDialect() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java new file mode 100644 index 0000000..07cdeab --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.dialect; + +import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class OpenGaussDatabaseDialect extends DatabaseDialect { + public OpenGaussDatabaseDialect(){ + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java deleted file mode 100644 index 4d559be..0000000 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/impl/opengauss/OpenGaussDatabaseDialect.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jn.nacos.plugin.datasource.impl.opengauss; - -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; -import com.jn.sqlhelper.dialect.Dialect; -import com.jn.sqlhelper.dialect.DialectRegistry; - -public class OpenGaussDatabaseDialect implements DatabaseDialect { - - private Dialect dialect; - private String database; - public OpenGaussDatabaseDialect(String database){ - this.dialect = DialectRegistry.getInstance().getDialectByName(database); - } - - @Override - public String getDatabase() { - return this.database; - } - - @Override - public String getFunction(String functionName) { - return null; - } -} diff --git a/pom.xml b/pom.xml index 308215a..c72c475 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 5.4.3 1.17.0 2.4.1 - 5.0.1 + 5.0.2 -- Gitee From 026feb3edb7d2d79f30896974054ce4123c3ba73 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 23:06:26 +0800 Subject: [PATCH 004/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20configInfoAggr?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseConfigInfoAggrMapper.java | 23 ++++++++++++++++++- .../datasource/base/mapper/BaseMapper.java | 18 +++++++-------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java index fea697d..49efc5e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java @@ -1,8 +1,13 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.List; public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { public BaseConfigInfoAggrMapper(String databaseId) { @@ -11,6 +16,22 @@ public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAg @Override public MapperResult findConfigInfoAggrByPageFetchRows(MapperContext context) { - return null; + final int startRow = context.getStartRow(); + final int pageSize = context.getPageSize(); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String groupId = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + RowSelection rowSelection = new RowSelection(startRow, pageSize); + String sql = + "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND " + + "group_id=? AND tenant_id=? ORDER BY datum_id OFFSET " + startRow + " ROWS FETCH NEXT " + + pageSize + " ROWS ONLY"; + List paramList = CollectionUtils.list(dataId, groupId, tenantId); + + sql = getDialect().getLimitSql(sql, rowSelection); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java index 2ccc0e5..6ba1a8a 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java @@ -1,33 +1,31 @@ package com.jn.nacos.plugin.datasource.base.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; -import com.jn.langx.lifecycle.Initializable; -import com.jn.langx.lifecycle.InitializationException; import com.jn.langx.util.Preconditions; import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; -public abstract class BaseMapper extends AbstractMapper implements Initializable { +public abstract class BaseMapper extends AbstractMapper{ private String databaseId; - protected DatabaseDialect databaseDialect; + protected DatabaseDialect dialect; public BaseMapper(String databaseId){ Preconditions.checkNotEmpty(databaseId,"database id is empty"); this.databaseId = databaseId; - this.init(); + this.dialect = null; } - @Override - public void init() throws InitializationException { - databaseDialect = null; - } @Override public String getDataSource() { return databaseId; } + public DatabaseDialect getDialect() { + return dialect; + } + @Override public String getFunction(String functionName) { - return this.databaseDialect.getFunction(functionName); + return this.dialect.getFunction(functionName); } } -- Gitee From 59c8dfe61605b3efc0097a2279a4d9a008500889 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 23:07:01 +0800 Subject: [PATCH 005/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20configInfoAggr?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/base/mapper/BaseConfigInfoAggrMapper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java index 49efc5e..5cb39d9 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java @@ -25,8 +25,7 @@ public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAg RowSelection rowSelection = new RowSelection(startRow, pageSize); String sql = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND " - + "group_id=? AND tenant_id=? ORDER BY datum_id OFFSET " + startRow + " ROWS FETCH NEXT " - + pageSize + " ROWS ONLY"; + + "group_id=? AND tenant_id=? ORDER BY datum_id "; List paramList = CollectionUtils.list(dataId, groupId, tenantId); sql = getDialect().getLimitSql(sql, rowSelection); -- Gitee From 99c9e30bc71c1ced115310781b4620728901bcf3 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 23 Aug 2024 23:07:26 +0800 Subject: [PATCH 006/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20configInfoAggr?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/base/mapper/BaseConfigInfoAggrMapper.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java index 5cb39d9..2184613 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java @@ -23,9 +23,7 @@ public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAg final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(startRow, pageSize); - String sql = - "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND " - + "group_id=? AND tenant_id=? ORDER BY datum_id "; + String sql = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? ORDER BY datum_id "; List paramList = CollectionUtils.list(dataId, groupId, tenantId); sql = getDialect().getLimitSql(sql, rowSelection); -- Gitee From c56dbd4a086efcd6b1d6a8426854c93d4d0575a1 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:02:29 +0800 Subject: [PATCH 007/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20ConfigInfoBeta?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseConfigInfoBetaMapper.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java index 602cea3..1d90cd6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java @@ -3,6 +3,10 @@ package com.jn.nacos.plugin.datasource.base.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.google.common.collect.Lists; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.List; public class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { public BaseConfigInfoBetaMapper(String databaseId) { @@ -11,6 +15,18 @@ public class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBe @Override public MapperResult findAllConfigInfoBetaForDumpAllFetchRows(MapperContext context) { - return null; + int startRow = context.getStartRow(); + int pageSize = context.getPageSize(); + + RowSelection rowSelection = new RowSelection(startRow, pageSize); + String subquery= "SELECT id FROM config_info_beta ORDER BY id "; + subquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + + " FROM ( "+subquery+" )" + " g, config_info_beta t WHERE g.id = t.id"; + + List paramList = Lists.newArrayList(); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + + return new MapperResult(sql, paramList); } } -- Gitee From 004844159cfcbbae78242de5b99d78b4edf54378 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:37:44 +0800 Subject: [PATCH 008/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseConfigInfoMapper.java | 250 +++++++++++++++++- 1 file changed, 237 insertions(+), 13 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java index 234d07a..2cec753 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java @@ -1,8 +1,20 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.common.utils.NamespaceUtil; +import com.alibaba.nacos.common.utils.StringUtils; +import com.alibaba.nacos.plugin.datasource.constants.ContextConstant; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Lists; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { @@ -12,66 +24,278 @@ public class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper @Override public MapperResult findConfigInfoByAppFetchRows(MapperContext context) { - return null; + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ?"; + + sql=getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(CollectionUtils.list(tenantId, appName), rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult getTenantIdList(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != '" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY tenant_id "; + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); + return new MapperResult(sql, pagedParams ); } @Override public MapperResult getGroupIdList(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String sql = "SELECT group_id FROM config_info WHERE tenant_id ='" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY group_id "; + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findAllConfigKey(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = " SELECT data_id,group_id,app_name FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; + + List queryParams = CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID)); + List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); + return new MapperResult(sql,pagedParams); } @Override public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String subquery = "SELECT id FROM config_info ORDER BY id "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; + List pagedParams = getDialect().rebuildParameters(Collections.emptyList(), rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findAllConfigInfoFragment(MapperContext context) { - return null; + String contextParameter = context.getContextParameter(ContextConstant.NEED_CONTENT); + boolean needContent = contextParameter != null && Boolean.parseBoolean(contextParameter); + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + String sql = "SELECT id,data_id,group_id,tenant_id,app_name," + (needContent ? "content," : "") + + "md5,gmt_modified,type FROM config_info WHERE id > ? " + "ORDER BY id ASC "; + sql = getDialect().getLimitSql(sql, rowSelection); + List queryParams = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findChangeConfigFetchRows(MapperContext context) { - return null; + final String tenant = (String) context.getWhereParameter(FieldConstant.TENANT); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + + final Timestamp startTime = (Timestamp) context.getWhereParameter(FieldConstant.START_TIME); + final Timestamp endTime = (Timestamp) context.getWhereParameter(FieldConstant.END_TIME); + + List paramList = new ArrayList<>(); + + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_modified FROM" + + " config_info WHERE "; + String where = " 1=1 "; + + if (!StringUtils.isBlank(dataId)) { + where += " AND data_id LIKE ? "; + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where += " AND group_id LIKE ? "; + paramList.add(group); + } + + if (!StringUtils.isBlank(tenant)) { + where += " AND tenant_id = ? "; + paramList.add(tenant); + } + + if (!StringUtils.isBlank(appName)) { + where += " AND app_name = ? "; + paramList.add(appName); + } + if (startTime != null) { + where += " AND gmt_modified >=? "; + paramList.add(startTime); + } + if (endTime != null) { + where += " AND gmt_modified <=? "; + paramList.add(endTime); + } + String sql = sqlFetchRows + where; + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String subquery = "SELECT id FROM config_info ORDER BY id "; + String pagedSubquery= getDialect().getLimitSql(subquery, rowSelection); + String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id"; + + List pagedParams = getDialect().rebuildParameters(Collections.emptyList(),rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findConfigInfoBaseLikeFetchRows(MapperContext context) { - return null; + final String tenant = (String) context.getWhereParameter(FieldConstant.TENANT); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + + List paramList = new ArrayList<>(); + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,content FROM config_info WHERE "; + String where = " tenant_id='" + NamespaceUtil.getNamespaceDefaultId() + "' "; + if (!StringUtils.isBlank(dataId)) { + where += " AND data_id LIKE ? "; + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where += " AND group_id LIKE ? "; + paramList.add(group); + } + if (!StringUtils.isBlank(tenant)) { + where += " AND content LIKE ? "; + paramList.add(tenant); + } + String sql=sqlFetchRows + where; + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { - return null; + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + + List paramList = new ArrayList<>(); + + String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); + where.append(" tenant_id=? "); + paramList.add(tenantId); + if (StringUtils.isNotBlank(dataId)) { + where.append(" AND data_id=? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND group_id=? "); + paramList.add(group); + } + + if (StringUtils.isNotBlank(appName)) { + where.append(" AND app_name=? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND content LIKE ? "); + paramList.add(content); + } + + sql = sql + where; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + sql = getDialect().getLimitSql(sql, rowSelection); + + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { - return null; + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=?"; + + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.GROUP_ID), + context.getWhereParameter(FieldConstant.TENANT_ID)); + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { - return null; + + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + + List paramList = new ArrayList<>(); + + final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,encrypted_data_key FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); + where.append(" tenant_id LIKE ? "); + paramList.add(tenantId); + if (!StringUtils.isBlank(dataId)) { + where.append(" AND data_id LIKE ? "); + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where.append(" AND group_id LIKE ? "); + paramList.add(group); + } + if (!StringUtils.isBlank(appName)) { + where.append(" AND app_name = ? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND content LIKE ? "); + paramList.add(content); + } + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String sql = sqlFetchRows + where; + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findAllConfigInfoFetchRows(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), + context.getPageSize()); + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); + } + + + @Override + public MapperResult findChangeConfig(MapperContext context) { + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " + + "gmt_modified >= ? and id > ? order by id "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID), + context.getWhereParameter(FieldConstant.PAGE_SIZE)); + + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + return new MapperResult(sql, pagedParams); } } -- Gitee From bc8f2de6f79e1c8fd7663e530ef8c03c41d0ce28 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:41:27 +0800 Subject: [PATCH 009/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20ConfigInfoTagM?= =?UTF-8?q?apper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseConfigInfoTagMapper.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java index 611ad20..1e49594 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java @@ -3,6 +3,10 @@ package com.jn.nacos.plugin.datasource.base.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.Collections; +import java.util.List; public class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { public BaseConfigInfoTagMapper(String databaseId) { @@ -11,6 +15,13 @@ public class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTag @Override public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String subquery= " SELECT id FROM config_info_tag ORDER BY id "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( "+pagedSubquery+" ) g, config_info_tag t WHERE g.id = t.id"; + List paramList = Collections.emptyList(); + List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + + return new MapperResult(sql, pagedParams); } } -- Gitee From 8d6961ab730252cbaf3796163bc44d74dfe6f573 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:44:30 +0800 Subject: [PATCH 010/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20ConfigTagsRela?= =?UTF-8?q?tionMapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BaseConfigTagRelationMapper.java | 104 +++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java index 70488e9..111cf50 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java @@ -1,8 +1,14 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.StringUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.ArrayList; +import java.util.List; public class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { public BaseConfigTagRelationMapper(String databaseId) { @@ -11,11 +17,105 @@ public class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTag @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { - return null; + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); + + List paramList = new ArrayList<>(); + StringBuilder where = new StringBuilder(" WHERE "); + final String baseSql = + "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id"; + + where.append(" a.tenant_id=? "); + paramList.add(tenantId); + + if (StringUtils.isNotBlank(dataId)) { + where.append(" AND a.data_id=? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND a.group_id=? "); + paramList.add(group); + } + if (StringUtils.isNotBlank(appName)) { + where.append(" AND a.app_name=? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND a.content LIKE ? "); + paramList.add(content); + } + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); + } + where.append(") "); + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String sql = baseSql + where; + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { - return null; + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); + + List paramList = new ArrayList<>(); + StringBuilder where = new StringBuilder(" WHERE "); + final String baseSql = + "SELECT a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id "; + + where.append(" a.tenant_id LIKE ? "); + paramList.add(tenantId); + + if (!StringUtils.isBlank(dataId)) { + where.append(" AND a.data_id LIKE ? "); + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where.append(" AND a.group_id LIKE ? "); + paramList.add(group); + } + if (!StringUtils.isBlank(appName)) { + where.append(" AND a.app_name = ? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND a.content LIKE ? "); + paramList.add(content); + } + + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); + } + where.append(") "); + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String sql = baseSql + where; + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } + } -- Gitee From 0d0f56a3582a1af06f500ad48e5ce7787ea6c5f1 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:47:39 +0800 Subject: [PATCH 011/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20GroupCapacityM?= =?UTF-8?q?apper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseGroupCapacityMapper.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java index dcea52f..5fbc73a 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java @@ -1,8 +1,13 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.List; public class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { public BaseGroupCapacityMapper(String databaseId) { @@ -11,6 +16,11 @@ public class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacity @Override public MapperResult selectGroupInfoBySize(MapperContext context) { - return null; + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, group_id FROM group_capacity WHERE id > ? "; + sql = getDialect().getLimitSql(sql, rowSelection); + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } } -- Gitee From 5f10c717970f08ad3c93a43ebd2e8574ae95d091 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 07:59:18 +0800 Subject: [PATCH 012/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20HistoryConfigI?= =?UTF-8?q?nfoMapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BaseHistoryConfigInfoMapper.java | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java index e0efb58..48662c6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java @@ -1,8 +1,13 @@ package com.jn.nacos.plugin.datasource.base.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.List; public class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { public BaseHistoryConfigInfoMapper(String databaseId) { @@ -11,11 +16,51 @@ public class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryCo @Override public MapperResult removeConfigHistory(MapperContext context) { - return null; + + int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); + RowSelection rowSelection = new RowSelection(0, pageSize); + + String subquery = "SELECT id FROM his_config_info WHERE gmt_modified < ? "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + + String sql = "DELETE FROM his_config_info WHERE id IN( "+ pagedSubquery+ ")"; + + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME)); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } @Override public MapperResult pageFindConfigHistoryFetchRows(MapperContext context) { - return null; + + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); + String sql = + "SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info " + + "WHERE data_id = ? AND group_id = ? AND tenant_id = ? ORDER BY nid DESC "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.DATA_ID), + context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); + } + + @Override + public MapperResult findDeletedConfig(MapperContext context) { + + int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.PAGE_SIZE).toString()); + RowSelection rowSelection = new RowSelection(0, pageSize); + + String sql = "SELECT data_id, group_id, tenant_id,gmt_modified,nid FROM his_config_info WHERE op_type = 'D' AND " + + "gmt_modified >= ? and nid > ? order by nid "; + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList =CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } } -- Gitee From 8e2b901eb56be6aa214213a908bfb1c430e3c7f5 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 08:02:06 +0800 Subject: [PATCH 013/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20TenantCapacity?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/mapper/BaseTenantCapacityMapper.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java index b14ba7f..e9b54bf 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java @@ -5,6 +5,9 @@ import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.sqlhelper.dialect.pagination.RowSelection; + +import java.util.List; public class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { public BaseTenantCapacityMapper(String databaseId) { @@ -13,11 +16,14 @@ public class BaseTenantCapacityMapper extends BaseMapper implements TenantCapaci @Override public MapperResult getCapacityList4CorrectUsage(MapperContext context) { + int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); + RowSelection rowSelection = new RowSelection(0, pageSize); - String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>?"; - MapperResult result= new MapperResult(sql, CollectionUtils.list(context.getWhereParameter(FieldConstant.ID), - context.getWhereParameter(FieldConstant.LIMIT_SIZE))); + String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>? "; + sql = getDialect().getLimitSql(sql, rowSelection); - return result; + List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); } } -- Gitee From f068fbcece9465db729c2bc4a407b2a54985ea2e Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 08:03:56 +0800 Subject: [PATCH 014/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/{base => }/DatabaseTypes.java | 2 +- .../com/jn/nacos/plugin/datasource/DialectNames.java | 11 ----------- .../datasource/db/dm/dialect/DmDatabaseDialect.java | 2 +- .../db/kingbase/dialect/KingbaseDatabaseDialect.java | 2 +- .../magicdata/dailect/MagicDataDatabaseDialect.java | 2 +- .../opengauss/dialect/OpenGaussDatabaseDialect.java | 2 +- 6 files changed, 5 insertions(+), 16 deletions(-) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/DatabaseTypes.java (90%) delete mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java similarity index 90% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index 8501e9f..99ef91b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/DatabaseTypes.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base; +package com.jn.nacos.plugin.datasource; import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java deleted file mode 100644 index 0aeb2da..0000000 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DialectNames.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jn.nacos.plugin.datasource; - -import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; - -public class DialectNames extends DataSourceConstant { - public static final String OPENGAUSS = "opengauss"; - public static final String MAGICDATA = "magicdata"; - public static final String DAMENG = "dm"; - - -} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java index bbb7d5c..a284462 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource.db.dm.dialect; -import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; public class DmDatabaseDialect extends DatabaseDialect { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java index cc3b596..3689816 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource.db.kingbase.dialect; -import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; public class KingbaseDatabaseDialect extends DatabaseDialect { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java index a65c535..90a84d3 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource.db.magicdata.dailect; -import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; public class MagicDataDatabaseDialect extends DatabaseDialect { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java index 07cdeab..f1a377b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource.db.opengauss.dialect; -import com.jn.nacos.plugin.datasource.base.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; public class OpenGaussDatabaseDialect extends DatabaseDialect { -- Gitee From faef93df6b989842ea75e6b262d97da2958421e0 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 08:29:33 +0800 Subject: [PATCH 015/159] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9B=20mapper,=20dial?= =?UTF-8?q?ect=20=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/base/dialect/DatabaseDialect.java | 2 +- .../datasource/db/dm/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/dm/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/dm/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../datasource/db/dm/mapper/TenantInfoMapper.java | 10 ++++++++++ .../db/kingbase/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/kingbase/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../db/kingbase/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/kingbase/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/kingbase/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/kingbase/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/kingbase/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/kingbase/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../db/kingbase/mapper/TenantInfoMapper.java | 10 ++++++++++ .../plugin/datasource/db/magicdata/DBConstants.java | 7 +++++++ .../db/magicdata/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/magicdata/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../db/magicdata/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/magicdata/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/magicdata/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/magicdata/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/magicdata/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/magicdata/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../db/magicdata/mapper/TenantInfoMapper.java | 10 ++++++++++ .../db/opengauss/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/opengauss/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../db/opengauss/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/opengauss/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/opengauss/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/opengauss/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/opengauss/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/opengauss/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../db/opengauss/mapper/TenantInfoMapper.java | 10 ++++++++++ .../postgresql/dialect/PostgresqlDatabaseDialect.java | 10 ++++++++++ .../db/postgresql/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/postgresql/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../db/postgresql/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/postgresql/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/postgresql/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/postgresql/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/postgresql/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/postgresql/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../db/postgresql/mapper/TenantInfoMapper.java | 10 ++++++++++ 48 files changed, 468 insertions(+), 1 deletion(-) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java index 7e8880a..47aca6e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -1,8 +1,8 @@ package com.jn.nacos.plugin.datasource.base.dialect; -import com.google.common.collect.Maps; import com.jn.langx.text.StringTemplates; import com.jn.langx.util.Objs; +import com.jn.langx.util.collection.Maps; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; import com.jn.sqlhelper.dialect.instrument.Instrumentations; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..c2c18f4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..b94595b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..a946847 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..c18f83e --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..a1a0a0b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..a2bfaa7 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..a2c4d2e --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..57cb362 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..8b5af01 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.dm.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..e5ff725 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..3b32b10 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..04860ce --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..444ce20 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..f75e9cd --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..964f374 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..479e21b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..70b3cca --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..676906f --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.kingbase.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.KINGBASE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java new file mode 100644 index 0000000..b753e30 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java @@ -0,0 +1,7 @@ +package com.jn.nacos.plugin.datasource.db.magicdata; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; + +public class DBConstants { + public static final String DB_ID = DatabaseTypes.MAGICDATA; +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..aab1dd4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..4ded4a9 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..684a228 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..fde61cf --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..a8b121a --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..3acc92b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..55d4902 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..7087921 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..a102935 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.magicdata.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.MAGICDATA); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..cd7c4af --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..7c4f8de --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..e58ee78 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..20572a5 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..482af4f --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..78c2e70 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..a350cec --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..e6e5e86 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..3ecde94 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.opengauss.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.OPENGAUSS); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java new file mode 100644 index 0000000..72530f4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.dialect; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class PostgresqlDatabaseDialect extends DatabaseDialect { + public PostgresqlDatabaseDialect(){ + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..e4c2d8c --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..e2c3656 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..bc7a8a1 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..a38b74b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..7ef2dab --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..05e1ae2 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..36e3e21 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..ef69ab3 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..2101821 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.postgresql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.POSTGRESQL); + } +} -- Gitee From 18571e2ab3fa699eb53efb75bc4e1916ca8c47db Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 08:31:14 +0800 Subject: [PATCH 016/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81dm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jn/nacos/plugin/datasource/DatabaseTypes.java | 5 +---- .../plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/ConfigInfoMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java | 2 +- .../datasource/db/dm/mapper/ConfigTagRelationMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/GroupCapacityMapper.java | 2 +- .../datasource/db/dm/mapper/HistoryConfigInfoMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/TenantCapacityMapper.java | 2 +- .../plugin/datasource/db/dm/mapper/TenantInfoMapper.java | 2 +- 10 files changed, 10 insertions(+), 13 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index 99ef91b..479d6f1 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -4,12 +4,9 @@ import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; public class DatabaseTypes extends DataSourceConstant { public static final String OPENGAUSS = "opengauss"; - public static final String KINGBASE = "kingbase"; - public static final String MAGICDATA = "magicdata"; - + public static final String ORACLE="oracle"; public static final String DAMENG = "dm"; - public static final String POSTGRESQL = "postgresql"; } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java index c2c18f4..09155af 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java index b94595b..943f4ac 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java index a946847..bb8c30d 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java index c18f83e..35861d3 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java index a1a0a0b..bd9ccb0 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java index a2bfaa7..4537225 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java index a2c4d2e..5cd9fd6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java index 57cb362..01ed409 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java index 8b5af01..b93d471 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java @@ -5,6 +5,6 @@ import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { - super(DatabaseTypes.OPENGAUSS); + super(DatabaseTypes.DAMENG); } } -- Gitee From 82705f5e418e7178f772820e466fe45e8fe41ca7 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 08:54:06 +0800 Subject: [PATCH 017/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20oracle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/oracle/dialect/OracleDatabaseDialect.java | 10 ++++++++++ .../db/oracle/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/oracle/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../datasource/db/oracle/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/oracle/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/oracle/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/oracle/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/oracle/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/oracle/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../datasource/db/oracle/mapper/TenantInfoMapper.java | 10 ++++++++++ 10 files changed, 100 insertions(+) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java new file mode 100644 index 0000000..20342bb --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.dialect; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class OracleDatabaseDialect extends DatabaseDialect { + public OracleDatabaseDialect() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..9c13b5b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..d2edeb4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..9b95e18 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..3f7f017 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..3bdf87b --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..dbc228d --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..23fd524 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..fea3b4a --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.ORACLE); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..5ee2231 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oracle.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.ORACLE); + } +} -- Gitee From 05d2f46b2a6237fabd5dc84b0237288af795124f Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 09:39:38 +0800 Subject: [PATCH 018/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=96=B9=E8=A8=80=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/DatabaseTypes.java | 1 + .../base/dialect/DatabaseDialect.java | 21 ++++++++++++++++++- .../db/mssql/driver/MssqlDatabaseDialect.java | 11 ++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index 479d6f1..4a09f8c 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -8,5 +8,6 @@ public class DatabaseTypes extends DataSourceConstant { public static final String MAGICDATA = "magicdata"; public static final String ORACLE="oracle"; public static final String DAMENG = "dm"; + public static final String MSSQL ="sqlserver"; public static final String POSTGRESQL = "postgresql"; } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java index 47aca6e..478bcef 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -2,7 +2,10 @@ package com.jn.nacos.plugin.datasource.base.dialect; import com.jn.langx.text.StringTemplates; import com.jn.langx.util.Objs; +import com.jn.langx.util.Preconditions; +import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Maps; +import com.jn.langx.util.reflect.Reflects; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; import com.jn.sqlhelper.dialect.instrument.Instrumentations; @@ -17,11 +20,27 @@ public abstract class DatabaseDialect { private Dialect delegate; private Map functionMap; public DatabaseDialect(String name){ + Preconditions.checkNotEmpty(name, "invalid dialect in class {}", Reflects.getFQNClassName(this.getClass())); this.name = name; - this.delegate = DialectRegistry.getInstance().getDialectByName(name); + String sqlhelperDialect = getCustomizedDialect(this.name); + this.delegate = DialectRegistry.getInstance().getDialectByName(sqlhelperDialect); this.functionMap = initFunctionMap(); } + private static String getCustomizedDialect(String dialect){ + String customizedDialectKey = "nacos.database.dialect."+dialect; + String customizedDialect = System.getProperty(customizedDialectKey); + if(Strings.isEmpty(customizedDialect)){ + String customizedDialectEnvKey = Strings.replaceChars(customizedDialectKey, '.', '_'); + customizedDialectEnvKey =Strings.upperCase(customizedDialectEnvKey); + customizedDialect = System.getenv(customizedDialectKey); + } + if(Strings.isEmpty(customizedDialect)){ + customizedDialect = dialect; + } + return customizedDialect; + } + protected Map initFunctionMap(){ Map map = Maps.newHashMap(); map.put("NOW()", "CURRENT_TIMESTAMP"); diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java new file mode 100644 index 0000000..def04c9 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java @@ -0,0 +1,11 @@ +package com.jn.nacos.plugin.datasource.db.mssql.driver; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; + +public class MssqlDatabaseDialect extends DatabaseDialect { + public MssqlDatabaseDialect() { + super(DatabaseTypes.MSSQL); + } + +} -- Gitee From 163c8a04b10a2a0cba2b246aec78bd45bb8438cf Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 09:41:07 +0800 Subject: [PATCH 019/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/base/dialect/DatabaseDialect.java | 4 ++-- .../nacos/plugin/datasource/db/magicdata/DBConstants.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java index 478bcef..aaab885 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java @@ -32,8 +32,8 @@ public abstract class DatabaseDialect { String customizedDialect = System.getProperty(customizedDialectKey); if(Strings.isEmpty(customizedDialect)){ String customizedDialectEnvKey = Strings.replaceChars(customizedDialectKey, '.', '_'); - customizedDialectEnvKey =Strings.upperCase(customizedDialectEnvKey); - customizedDialect = System.getenv(customizedDialectKey); + customizedDialectEnvKey = Strings.upperCase(customizedDialectEnvKey); + customizedDialect = System.getenv(customizedDialectEnvKey); } if(Strings.isEmpty(customizedDialect)){ customizedDialect = dialect; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java deleted file mode 100644 index b753e30..0000000 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/DBConstants.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; - -public class DBConstants { - public static final String DB_ID = DatabaseTypes.MAGICDATA; -} -- Gitee From 1f9f4ee6b9918a469390081573ffd6db91e2c352 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 09:41:23 +0800 Subject: [PATCH 020/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=20sqlserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/mssql/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/mssql/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../datasource/db/mssql/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/mssql/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/mssql/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/mssql/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/mssql/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/mssql/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../datasource/db/mssql/mapper/TenantInfoMapper.java | 10 ++++++++++ 9 files changed, 90 insertions(+) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..dd4cd5a --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..5df57db --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..3eb78a3 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..39e6a0e --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..d6c3b00 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..5833749 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..0aa8b41 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..63dac57 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.MSSQL); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..b99bf4e --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.mssql.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.MSSQL); + } +} -- Gitee From a78054c3808e74b166e7b77f692bbaab55ab3ccf Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 09:55:36 +0800 Subject: [PATCH 021/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/dm/dialect/DmDatabaseDialect.java | 2 +- .../db/dm/mapper/ConfigInfoAggrMapper.java | 2 +- .../db/dm/mapper/ConfigInfoBetaMapper.java | 2 +- .../db/dm/mapper/ConfigInfoMapper.java | 2 +- .../db/dm/mapper/ConfigInfoTagMapper.java | 2 +- .../db/dm/mapper/ConfigTagRelationMapper.java | 2 +- .../db/dm/mapper/GroupCapacityMapper.java | 2 +- .../db/dm/mapper/HistoryConfigInfoMapper.java | 2 +- .../db/dm/mapper/TenantCapacityMapper.java | 2 +- .../db/dm/mapper/TenantInfoMapper.java | 2 +- .../dialect/KingbaseDatabaseDialect.java | 2 +- .../kingbase/mapper/ConfigInfoAggrMapper.java | 2 +- .../kingbase/mapper/ConfigInfoBetaMapper.java | 2 +- .../db/kingbase/mapper/ConfigInfoMapper.java | 2 +- .../kingbase/mapper/ConfigInfoTagMapper.java | 2 +- .../mapper/ConfigTagRelationMapper.java | 2 +- .../kingbase/mapper/GroupCapacityMapper.java | 2 +- .../mapper/HistoryConfigInfoMapper.java | 2 +- .../kingbase/mapper/TenantCapacityMapper.java | 2 +- .../db/kingbase/mapper/TenantInfoMapper.java | 2 +- .../dailect/MagicDataDatabaseDialect.java | 2 +- .../mapper/ConfigInfoAggrMapper.java | 2 +- .../mapper/ConfigInfoBetaMapper.java | 2 +- .../db/magicdata/mapper/ConfigInfoMapper.java | 2 +- .../magicdata/mapper/ConfigInfoTagMapper.java | 2 +- .../mapper/ConfigTagRelationMapper.java | 2 +- .../magicdata/mapper/GroupCapacityMapper.java | 2 +- .../mapper/HistoryConfigInfoMapper.java | 2 +- .../mapper/TenantCapacityMapper.java | 2 +- .../db/magicdata/mapper/TenantInfoMapper.java | 2 +- .../db/mssql/driver/MssqlDatabaseDialect.java | 2 +- .../db/mssql/mapper/ConfigInfoAggrMapper.java | 2 +- .../db/mssql/mapper/ConfigInfoBetaMapper.java | 2 +- .../db/mssql/mapper/ConfigInfoMapper.java | 2 +- .../db/mssql/mapper/ConfigInfoTagMapper.java | 2 +- .../mssql/mapper/ConfigTagRelationMapper.java | 2 +- .../db/mssql/mapper/GroupCapacityMapper.java | 2 +- .../mssql/mapper/HistoryConfigInfoMapper.java | 2 +- .../db/mssql/mapper/TenantCapacityMapper.java | 2 +- .../db/mssql/mapper/TenantInfoMapper.java | 2 +- .../dialect/OpenGaussDatabaseDialect.java | 2 +- .../mapper/ConfigInfoAggrMapper.java | 2 +- .../mapper/ConfigInfoBetaMapper.java | 2 +- .../db/opengauss/mapper/ConfigInfoMapper.java | 2 +- .../opengauss/mapper/ConfigInfoTagMapper.java | 2 +- .../mapper/ConfigTagRelationMapper.java | 2 +- .../opengauss/mapper/GroupCapacityMapper.java | 2 +- .../mapper/HistoryConfigInfoMapper.java | 2 +- .../mapper/TenantCapacityMapper.java | 2 +- .../db/opengauss/mapper/TenantInfoMapper.java | 2 +- .../oracle/dialect/OracleDatabaseDialect.java | 2 +- .../oracle/mapper/ConfigInfoAggrMapper.java | 2 +- .../oracle/mapper/ConfigInfoBetaMapper.java | 2 +- .../db/oracle/mapper/ConfigInfoMapper.java | 2 +- .../db/oracle/mapper/ConfigInfoTagMapper.java | 2 +- .../mapper/ConfigTagRelationMapper.java | 2 +- .../db/oracle/mapper/GroupCapacityMapper.java | 2 +- .../mapper/HistoryConfigInfoMapper.java | 2 +- .../oracle/mapper/TenantCapacityMapper.java | 2 +- .../db/oracle/mapper/TenantInfoMapper.java | 2 +- .../dialect/PostgresqlDatabaseDialect.java | 2 +- .../mapper/ConfigInfoAggrMapper.java | 2 +- .../mapper/ConfigInfoBetaMapper.java | 2 +- .../postgresql/mapper/ConfigInfoMapper.java | 2 +- .../mapper/ConfigInfoTagMapper.java | 2 +- .../mapper/ConfigTagRelationMapper.java | 2 +- .../mapper/GroupCapacityMapper.java | 2 +- .../mapper/HistoryConfigInfoMapper.java | 2 +- .../mapper/TenantCapacityMapper.java | 2 +- .../postgresql/mapper/TenantInfoMapper.java | 2 +- .../{base => }/dialect/DatabaseDialect.java | 2 +- .../dialect/DatabaseDialectManager.java | 38 +++++++++++++++++++ .../mapper/BaseConfigInfoAggrMapper.java | 2 +- .../mapper/BaseConfigInfoBetaMapper.java | 2 +- .../mapper/BaseConfigInfoMapper.java | 2 +- .../mapper/BaseConfigInfoTagMapper.java | 2 +- .../mapper/BaseConfigTagRelationMapper.java | 2 +- .../mapper/BaseGroupCapacityMapper.java | 2 +- .../mapper/BaseHistoryConfigInfoMapper.java | 2 +- .../{base => }/mapper/BaseMapper.java | 4 +- .../mapper/BaseTenantCapacityMapper.java | 2 +- .../mapper/BaseTenantInfoMapper.java | 2 +- 82 files changed, 120 insertions(+), 82 deletions(-) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/dialect/DatabaseDialect.java (97%) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseConfigInfoAggrMapper.java (96%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseConfigInfoBetaMapper.java (96%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseConfigInfoMapper.java (99%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseConfigInfoTagMapper.java (95%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseConfigTagRelationMapper.java (98%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseGroupCapacityMapper.java (95%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseHistoryConfigInfoMapper.java (98%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseMapper.java (85%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseTenantCapacityMapper.java (95%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{base => }/mapper/BaseTenantInfoMapper.java (82%) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java index a284462..28ad0c0 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class DmDatabaseDialect extends DatabaseDialect { public DmDatabaseDialect() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java index 09155af..8ec3855 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java index 943f4ac..dfe07ff 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java index bb8c30d..a9cd0aa 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java index 35861d3..86aada5 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java index bd9ccb0..b3ee2b1 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java index 4537225..353ac1f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java index 5cd9fd6..e54fcaa 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java index 01ed409..5db4922 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java index b93d471..a8784ac 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.dm.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java index 3689816..dd94b06 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class KingbaseDatabaseDialect extends DatabaseDialect { public KingbaseDatabaseDialect() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java index e5ff725..4ef0b9e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java index 3b32b10..1a87e5f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java index 04860ce..27a937a 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java index 444ce20..d4f9929 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java index f75e9cd..1d742b6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java index 964f374..202fa30 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java index 479e21b..9a4db34 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java index 70b3cca..8bccd7f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java index 676906f..0d2a6eb 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.kingbase.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java index 90a84d3..88841f3 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.dailect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class MagicDataDatabaseDialect extends DatabaseDialect { public MagicDataDatabaseDialect() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java index aab1dd4..68118ea 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java index 4ded4a9..8b64672 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java index 684a228..8b071fc 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java index fde61cf..1865438 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java index a8b121a..4b23944 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java index 3acc92b..d97a7c8 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java index 55d4902..fa022d5 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java index 7087921..5ec1f0d 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java index a102935..3c6eccb 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.magicdata.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java index def04c9..bd35d04 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.driver; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class MssqlDatabaseDialect extends DatabaseDialect { public MssqlDatabaseDialect() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java index dd4cd5a..5c2c18f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java index 5df57db..024b099 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java index 3eb78a3..b60a3f7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java index 39e6a0e..ad6014c 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java index d6c3b00..087f4db 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java index 5833749..108478c 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java index 0aa8b41..13c7965 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java index 63dac57..ccbf1a3 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java index b99bf4e..e763989 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.mssql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java index f1a377b..6334ced 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class OpenGaussDatabaseDialect extends DatabaseDialect { public OpenGaussDatabaseDialect(){ diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java index cd7c4af..ca0155f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java index 7c4f8de..15b10a7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java index e58ee78..aaa76c7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java index 20572a5..6c15315 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java index 482af4f..4eb4e70 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java index 78c2e70..c99fb90 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java index a350cec..7cda7fe 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java index e6e5e86..6172815 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java index 3ecde94..fb4bdc7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.opengauss.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java index 20342bb..5468207 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class OracleDatabaseDialect extends DatabaseDialect { public OracleDatabaseDialect() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java index 9c13b5b..087511b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java index d2edeb4..49e6ee7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java index 9b95e18..5dd1ac3 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java index 3f7f017..0656f99 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java index 3bdf87b..9d2a021 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java index dbc228d..deae608 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java index 23fd524..3e2edb9 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java index fea3b4a..f441945 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java index 5ee2231..148c1e6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.oracle.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java index 72530f4..fec5aed 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public class PostgresqlDatabaseDialect extends DatabaseDialect { public PostgresqlDatabaseDialect(){ diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java index e4c2d8c..02bf79e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoAggrMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { public ConfigInfoAggrMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java index e2c3656..cf737fb 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoBetaMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { public ConfigInfoBetaMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java index bc7a8a1..af29901 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; public class ConfigInfoMapper extends BaseConfigInfoMapper { public ConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java index a38b74b..c8dc004 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigInfoTagMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { public ConfigInfoTagMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java index 7ef2dab..60ceaae 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseConfigTagRelationMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { public ConfigTagRelationMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java index 05e1ae2..61b7015 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseGroupCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; public class GroupCapacityMapper extends BaseGroupCapacityMapper { public GroupCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java index 36e3e21..086d1ff 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseHistoryConfigInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { public HistoryConfigInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java index ef69ab3..ff3354a 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantCapacityMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; public class TenantCapacityMapper extends BaseTenantCapacityMapper { public TenantCapacityMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java index 2101821..19095b1 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource.db.postgresql.mapper; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.base.mapper.BaseTenantInfoMapper; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; public class TenantInfoMapper extends BaseTenantInfoMapper { public TenantInfoMapper() { diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java similarity index 97% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java index aaab885..ecd00c4 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.dialect; +package com.jn.nacos.plugin.datasource.dialect; import com.jn.langx.text.StringTemplates; import com.jn.langx.util.Objs; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java new file mode 100644 index 0000000..466fba3 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java @@ -0,0 +1,38 @@ +package com.jn.nacos.plugin.datasource.dialect; + +import com.alibaba.nacos.common.spi.NacosServiceLoader; +import com.jn.langx.util.collection.Maps; +import com.jn.langx.util.logging.Loggers; +import org.slf4j.Logger; + +import java.util.Collection; +import java.util.Map; + +public class DatabaseDialectManager { + private static final Logger logger = Loggers.getLogger(DatabaseDialectManager.class); + + private Map dialectMap; + + private void init(){ + Collection dialects = NacosServiceLoader.load(DatabaseDialect.class); + Map map = Maps.newHashMap(); + for (DatabaseDialect dialect : dialects){ + map.put(dialect.getName(), dialect); + } + this.dialectMap = map; + } + + public DatabaseDialect getDialect(String databaseType){ + DatabaseDialect dialect = this.dialectMap.get(databaseType); + if(dialect==null){ + throw new RuntimeException("unsupported database dialect: " + databaseType); + } + return dialect; + } + + private static final DatabaseDialectManager INSTANCE = new DatabaseDialectManager(); + + public static DatabaseDialectManager getInstance(){ + return INSTANCE; + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java similarity index 96% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java index 2184613..0ed27ae 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java similarity index 96% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java index 1d90cd6..b53feae 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java similarity index 99% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java index 2cec753..73f8600 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.NamespaceUtil; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java similarity index 95% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java index 1e49594..d0e619e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java similarity index 98% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java index 111cf50..da84e86 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java similarity index 95% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index 5fbc73a..0262d26 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseGroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java similarity index 98% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java index 48662c6..ca0f793 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java similarity index 85% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 6ba1a8a..8145fe6 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -1,8 +1,8 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.jn.langx.util.Preconditions; -import com.jn.nacos.plugin.datasource.base.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; public abstract class BaseMapper extends AbstractMapper{ private String databaseId; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java similarity index 95% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java index e9b54bf..8b55830 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java similarity index 82% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java index a303e73..6d4c440 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/base/mapper/BaseTenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.base.mapper; +package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper; -- Gitee From 136335f17cc66b68b4ddbfd4309a0d394947b29f Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:05:10 +0800 Subject: [PATCH 022/159] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81oscar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/DatabaseTypes.java | 1 + .../db/oscar/dialect/OscarDatabaseDialect.java | 10 ++++++++++ .../db/oscar/mapper/ConfigInfoAggrMapper.java | 10 ++++++++++ .../db/oscar/mapper/ConfigInfoBetaMapper.java | 10 ++++++++++ .../datasource/db/oscar/mapper/ConfigInfoMapper.java | 10 ++++++++++ .../db/oscar/mapper/ConfigInfoTagMapper.java | 10 ++++++++++ .../db/oscar/mapper/ConfigTagRelationMapper.java | 10 ++++++++++ .../db/oscar/mapper/GroupCapacityMapper.java | 10 ++++++++++ .../db/oscar/mapper/HistoryConfigInfoMapper.java | 10 ++++++++++ .../db/oscar/mapper/TenantCapacityMapper.java | 10 ++++++++++ .../datasource/db/oscar/mapper/TenantInfoMapper.java | 10 ++++++++++ 11 files changed, 101 insertions(+) create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java create mode 100644 nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index 4a09f8c..b36976f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -10,4 +10,5 @@ public class DatabaseTypes extends DataSourceConstant { public static final String DAMENG = "dm"; public static final String MSSQL ="sqlserver"; public static final String POSTGRESQL = "postgresql"; + public static final String OSCAR ="oscar"; } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java new file mode 100644 index 0000000..eebb89a --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.dialect; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; + +public class OscarDatabaseDialect extends DatabaseDialect { + public OscarDatabaseDialect(){ + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java new file mode 100644 index 0000000..5a1baab --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; + +public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { + public ConfigInfoAggrMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java new file mode 100644 index 0000000..da13a75 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; + +public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { + public ConfigInfoBetaMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java new file mode 100644 index 0000000..8fa5992 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; + +public class ConfigInfoMapper extends BaseConfigInfoMapper { + public ConfigInfoMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java new file mode 100644 index 0000000..44724eb --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; + +public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { + public ConfigInfoTagMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java new file mode 100644 index 0000000..96e1e81 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; + +public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { + public ConfigTagRelationMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java new file mode 100644 index 0000000..f25d4b4 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; + +public class GroupCapacityMapper extends BaseGroupCapacityMapper { + public GroupCapacityMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java new file mode 100644 index 0000000..07bcc4d --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; + +public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { + public HistoryConfigInfoMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java new file mode 100644 index 0000000..ff1fb87 --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; + +public class TenantCapacityMapper extends BaseTenantCapacityMapper { + public TenantCapacityMapper() { + super(DatabaseTypes.OSCAR); + } +} diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java new file mode 100644 index 0000000..7fd306e --- /dev/null +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java @@ -0,0 +1,10 @@ +package com.jn.nacos.plugin.datasource.db.oscar.mapper; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; + +public class TenantInfoMapper extends BaseTenantInfoMapper { + public TenantInfoMapper() { + super(DatabaseTypes.OSCAR); + } +} -- Gitee From b2e79ea65f982d578c384ee112c7582f44c6fbdb Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:06:05 +0800 Subject: [PATCH 023/159] =?UTF-8?q?*=20=E8=87=AA=E5=8A=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96dialect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 8145fe6..a8309c2 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -3,6 +3,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.jn.langx.util.Preconditions; import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.DatabaseDialectManager; public abstract class BaseMapper extends AbstractMapper{ private String databaseId; @@ -11,7 +12,7 @@ public abstract class BaseMapper extends AbstractMapper{ public BaseMapper(String databaseId){ Preconditions.checkNotEmpty(databaseId,"database id is empty"); this.databaseId = databaseId; - this.dialect = null; + this.dialect = DatabaseDialectManager.getInstance().getDialect(this.databaseId); } -- Gitee From 0a1335f3f64b96ebf237d787497f54f9c567aa19 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:09:03 +0800 Subject: [PATCH 024/159] =?UTF-8?q?*=20=E6=B3=A8=E5=86=8C=E6=96=B9?= =?UTF-8?q?=E8=A8=80=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...com.jn.nacos.plugin.datasource.dialect.DatabaseDialect | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect new file mode 100644 index 0000000..aa3bbca --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.dialect.DmDatabaseDialect +com.jn.nacos.plugin.datasource.db.kingbase.dialect.KingbaseDatabaseDialect +com.jn.nacos.plugin.datasource.db.magicdata.dailect.MagicDataDatabaseDialect +com.jn.nacos.plugin.datasource.db.mssql.driver.MssqlDatabaseDialect +com.jn.nacos.plugin.datasource.db.opengauss.dialect.OpenGaussDatabaseDialect +com.jn.nacos.plugin.datasource.db.oracle.dialect.OracleDatabaseDialect +com.jn.nacos.plugin.datasource.db.oscar.dialect.OscarDatabaseDialect +com.jn.nacos.plugin.datasource.db.postgresql.dialect.PostgresqlDatabaseDialect \ No newline at end of file -- Gitee From aeddfef4ddcffc91084e930e20ea6140bb4bf67d Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:11:15 +0800 Subject: [PATCH 025/159] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E6=8A=BD=E5=83=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/BaseConfigInfoAggrMapper.java | 2 +- .../plugin/datasource/mapper/BaseConfigInfoBetaMapper.java | 2 +- .../jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java | 2 +- .../nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java | 2 +- .../plugin/datasource/mapper/BaseConfigTagRelationMapper.java | 2 +- .../nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java | 2 +- .../plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java | 2 +- .../plugin/datasource/mapper/BaseTenantCapacityMapper.java | 2 +- .../jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java index 0ed27ae..2f71628 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { +public abstract class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { public BaseConfigInfoAggrMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java index b53feae..ec44c61 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java @@ -8,7 +8,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { +public abstract class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { public BaseConfigInfoBetaMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java index 73f8600..6f364e7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { +public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { public BaseConfigInfoMapper(String databaseId) { super(databaseId); diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java index d0e619e..18d5c98 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java @@ -8,7 +8,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.Collections; import java.util.List; -public class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { +public abstract class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { public BaseConfigInfoTagMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java index da84e86..7695042 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java @@ -10,7 +10,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.ArrayList; import java.util.List; -public class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { +public abstract class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { public BaseConfigTagRelationMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index 0262d26..092a3d7 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { +public abstract class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { public BaseGroupCapacityMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java index ca0f793..a35397b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { +public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { public BaseHistoryConfigInfoMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java index 8b55830..b4976aa 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { +public abstract class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { public BaseTenantCapacityMapper(String databaseId) { super(databaseId); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java index 6d4c440..0786c1b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java @@ -2,7 +2,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper; -public class BaseTenantInfoMapper extends BaseMapper implements TenantInfoMapper { +public abstract class BaseTenantInfoMapper extends BaseMapper implements TenantInfoMapper { public BaseTenantInfoMapper(String databaseId) { super(databaseId); } -- Gitee From 5ddb4792501ecf2f51daeff03ee99c57cb94d19e Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:15:37 +0800 Subject: [PATCH 026/159] =?UTF-8?q?+=20=E6=B3=A8=E5=86=8Cmapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper | 8 ++++++++ ...ba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper | 8 ++++++++ ...libaba.nacos.plugin.datasource.mapper.ConfigInfoMapper | 8 ++++++++ ...aba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper | 8 ++++++++ ...acos.plugin.datasource.mapper.ConfigTagsRelationMapper | 8 ++++++++ ...aba.nacos.plugin.datasource.mapper.GroupCapacityMapper | 8 ++++++++ ...nacos.plugin.datasource.mapper.HistoryConfigInfoMapper | 8 ++++++++ ...ba.nacos.plugin.datasource.mapper.TenantCapacityMapper | 8 ++++++++ ...libaba.nacos.plugin.datasource.mapper.TenantInfoMapper | 8 ++++++++ 9 files changed, 72 insertions(+) create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper new file mode 100644 index 0000000..0506c3a --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoAggrMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper new file mode 100644 index 0000000..123a8be --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoBetaMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper new file mode 100644 index 0000000..3de1f11 --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper new file mode 100644 index 0000000..47ec23e --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoTagMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper new file mode 100644 index 0000000..89a85e2 --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigTagRelationMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper new file mode 100644 index 0000000..2128bf6 --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.GroupCapacityMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper new file mode 100644 index 0000000..b0cc789 --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.HistoryConfigInfoMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper new file mode 100644 index 0000000..196c53f --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantCapacityMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper new file mode 100644 index 0000000..c62621b --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantInfoMapper \ No newline at end of file -- Gitee From 4210633e7c958822bffb557bb5c405936d40d8e4 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:17:21 +0800 Subject: [PATCH 027/159] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=20pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index c72c475..fcc5bd7 100644 --- a/pom.xml +++ b/pom.xml @@ -52,11 +52,13 @@ com.alibaba.nacos nacos-datasource-plugin ${nacos.version} + provided com.alibaba.nacos nacos-common ${nacos.version} + provided commons-codec -- Gitee From ac0c3c719ff0ef6807589e640a526aa88e653db6 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:43:59 +0800 Subject: [PATCH 028/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- build.bat | 4 ++++ nacos-plugin-datasource/pom.xml | 2 +- .../plugin/datasource/mapper/BaseGroupCapacityMapper.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 build.bat diff --git a/.gitignore b/.gitignore index afc643b..555a9f7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ hs_err_pid* .idea/ .gitee/ -.git/ \ No newline at end of file +.git/ +target/ \ No newline at end of file diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..ac49d33 --- /dev/null +++ b/build.bat @@ -0,0 +1,4 @@ +set JAVA_HOME=%JAVA_8_201_HOME% +set Path=%JAVA_HOME%/bin;%Path% +REM mvn -v +mvn clean package -DskipTests \ No newline at end of file diff --git a/nacos-plugin-datasource/pom.xml b/nacos-plugin-datasource/pom.xml index ea1ffed..af3457b 100644 --- a/nacos-plugin-datasource/pom.xml +++ b/nacos-plugin-datasource/pom.xml @@ -10,7 +10,7 @@ nacos-plugin-datasource - + ${project.groupId}:${project.artifactId}:${project.version} 8 8 diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index 092a3d7..fd12d42 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -8,7 +8,7 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; - +@SuppressWarnings("all") public abstract class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { public BaseGroupCapacityMapper(String databaseId) { super(databaseId); -- Gitee From 5fc347c6c701038647eccd05325bacac21b463bf Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:55:39 +0800 Subject: [PATCH 029/159] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9Bsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos-plugin-datasource-sqlscript/pom.xml | 22 +++++++++++++++++++ .../resources/sql/dm/create-schema.sql | 0 .../resources/sql/dm/create-tables.sql | 0 .../resources/sql/kingbase/create-schema.sql | 0 .../resources/sql/kingbase/create-tables.sql | 0 .../resources/sql/magicdata/README.MD | 1 + .../resources/sql/mssql/create-schema.sql | 0 .../resources/sql/mssql/create-tables.sql | 0 .../resources/sql/opengauss/create-schema.sql | 0 .../resources/sql/opengauss/create-tables.sql | 0 .../resources/sql/oracle/create-schema.sql | 0 .../resources/sql/oracle/create-tables.sql | 0 .../resources/sql/oscar/create-schema.sql | 0 .../resources/sql/oscar/create-tables.sql | 0 .../sql/postgresql/create-schema.sql | 0 .../sql/postgresql/create-tables.sql | 0 pom.xml | 1 + 17 files changed, 24 insertions(+) create mode 100644 nacos-plugin-datasource-sqlscript/pom.xml create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/dm/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/dm/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/pom.xml b/nacos-plugin-datasource-sqlscript/pom.xml new file mode 100644 index 0000000..84022c3 --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + io.github.bes2008.solution.nacos.plugins + nacos-plugins + 1.0.0 + + + nacos-plugin-datasource-sqlscript + + + 8 + 8 + UTF-8 + + true + + + \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD new file mode 100644 index 0000000..d319e3c --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD @@ -0,0 +1 @@ +Not Supplied \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml index fcc5bd7..391d478 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ nacos-plugin-datasource + nacos-plugin-datasource-sqlscript -- Gitee From 2409e0eb3081c9fa9688a8fda7b9d48f43a59b7f Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 10:57:45 +0800 Subject: [PATCH 030/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0pom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacos-plugin-datasource-sqlscript/pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nacos-plugin-datasource-sqlscript/pom.xml b/nacos-plugin-datasource-sqlscript/pom.xml index 84022c3..85bc006 100644 --- a/nacos-plugin-datasource-sqlscript/pom.xml +++ b/nacos-plugin-datasource-sqlscript/pom.xml @@ -10,12 +10,8 @@ nacos-plugin-datasource-sqlscript - + ${project.groupId}:${project.artifactId}:${project.version} - 8 - 8 - UTF-8 - true -- Gitee From 1c0f54a48235a2c98508c49cce2a2f2e291ed26c Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 24 Aug 2024 11:06:11 +0800 Subject: [PATCH 031/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0ReadMe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 36 ------------------------------------ README.md | 30 ++++++++++-------------------- 2 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 README.en.md diff --git a/README.en.md b/README.en.md deleted file mode 100644 index b73edd8..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# nacos-plugins - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md index 6d74523..e7080d9 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ # nacos-plugins #### 介绍 -{**以下是 Gitee 平台说明，您可以替换此简介** -Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用 Gitee 实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} +针对Nacos提供多种插件支持： ++ nacos-plugin-datasource： 支持多种数据库 + + DM (达梦) + + Kingbase （金仓） + + MSSQL (SQLServer) + + OpenGauss （高斯） + + Oracle(8, 9, 10, 11, 12 ... ) + + oscar （神通） #### 软件架构 -软件架构说明 +作为nacos的插件使用 #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. 将插件及其依赖，放到 nacos plugins目录即可 #### 使用说明 -1. xxxx -2. xxxx -3. xxxx #### 参与贡献 @@ -27,13 +27,3 @@ Gitee 是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN 2. 新建 Feat_xxx 分支 3. 提交代码 4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From 9ac6e7b60cecd672dc955e47a31474e3de00b204 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sun, 25 Aug 2024 19:30:51 +0800 Subject: [PATCH 032/159] =?UTF-8?q?+=20=E6=B7=BB=E5=8A=A0=20sql=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/kingbase/create-schema.sql | 2 + .../resources/sql/kingbase/create-tables.sql | 464 ++++++++++++++++ .../resources/sql/magicdata/README.MD | 1 - .../resources/sql/magicdata/create-schema.sql | 1 + .../resources/sql/magicdata/create-tables.sql | 515 ++++++++++++++++++ .../resources/sql/mysql/create-schema.sql | 1 + .../resources/sql/mysql/create-tables.sql | 198 +++++++ 7 files changed, 1181 insertions(+), 1 deletion(-) delete mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql create mode 100644 nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql index e69de29..15640f5 100644 --- a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql +++ b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql @@ -0,0 +1,2 @@ +DROP schema if EXISTS nacos CASCADE; +CREATE SCHEMA nacos; \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql index e69de29..af313bf 100644 --- a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql +++ b/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql @@ -0,0 +1,464 @@ +SET search_path TO nacos; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" text , + "encrypted_data_key" text +) +; + +COMMENT ON COLUMN "config_info"."id" IS 'id'; +COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info"."content" IS 'content'; +COMMENT ON COLUMN "config_info"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info"."effect" IS '配置生效描述'; +COMMENT ON COLUMN "config_info"."type" IS '配置的类型'; +COMMENT ON COLUMN "config_info"."c_schema" IS '配置的模式'; +COMMENT ON COLUMN "config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info" IS 'config_info'; + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" text NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +) +; +COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; +COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_aggr"."datum_id" IS 'datum_id'; +COMMENT ON COLUMN "config_info_aggr"."content" IS '内容'; +COMMENT ON COLUMN "config_info_aggr"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_aggr"."tenant_id" IS '租户字段'; +COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "config_info_beta"."id" IS 'id'; +COMMENT ON COLUMN "config_info_beta"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_beta"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_beta"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_beta"."content" IS 'content'; +COMMENT ON COLUMN "config_info_beta"."beta_ips" IS 'betaIps'; +COMMENT ON COLUMN "config_info_beta"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_beta"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_beta"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_beta"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_beta"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info_beta"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info_beta"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) +) +; +COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; +COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_tag"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "config_info_tag"."tag_id" IS 'tag_id'; +COMMENT ON COLUMN "config_info_tag"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_tag"."content" IS 'content'; +COMMENT ON COLUMN "config_info_tag"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_tag"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_tag"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_tag"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_tag"."src_ip" IS 'source ip'; +COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" bigserial NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" bigserial NOT NULL +) +; +COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; +COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; +COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; +COMMENT ON COLUMN "config_tags_relation"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_tags_relation"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_tags_relation"."tenant_id" IS 'tenant_id'; +COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" bigserial NOT NULL, + "group_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "group_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_count" IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "group_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "group_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" int8 NOT NULL, + "nid" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +) +; +COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "his_config_info" IS '多租户改造'; + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" USING btree ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" bigserial NOT NULL, + "tenant_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; +COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "tenant_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_count" IS '聚合子配置最大个数'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "tenant_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" bigserial NOT NULL, + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" int8 NOT NULL, + "gmt_modified" int8 NOT NULL +) +; +COMMENT ON COLUMN "tenant_info"."id" IS 'id'; +COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; +COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "tenant_info"."tenant_name" IS 'tenant_name'; +COMMENT ON COLUMN "tenant_info"."tenant_desc" IS 'tenant_desc'; +COMMENT ON COLUMN "tenant_info"."create_source" IS 'create_source'; +COMMENT ON COLUMN "tenant_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_info"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_info" IS 'tenant_info'; + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( + "kp", + "tenant_id" + ); + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" boolean NOT NULL +) +; + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( + "username", + "role" + ); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + + +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); + + +COMMIT; \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD deleted file mode 100644 index d319e3c..0000000 --- a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/README.MD +++ /dev/null @@ -1 +0,0 @@ -Not Supplied \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql new file mode 100644 index 0000000..3d934f2 --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql @@ -0,0 +1 @@ +CREATE SCHEMA nacos; \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql new file mode 100644 index 0000000..bea5d52 --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql @@ -0,0 +1,515 @@ +SET search_path TO nacos; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(6) NOT NULL, + "gmt_modified" timestamp(6) NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" text , + "encrypted_data_key" text +) +; + +COMMENT ON COLUMN "config_info"."id" IS 'id'; +COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info"."content" IS 'content'; +COMMENT ON COLUMN "config_info"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info"."effect" IS '配置生效描述'; +COMMENT ON COLUMN "config_info"."type" IS '配置的类型'; +COMMENT ON COLUMN "config_info"."c_schema" IS '配置的模式'; +COMMENT ON COLUMN "config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info" IS 'config_info'; + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" text NOT NULL, + "gmt_modified" timestamp(6) NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +) +; +COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; +COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_aggr"."datum_id" IS 'datum_id'; +COMMENT ON COLUMN "config_info_aggr"."content" IS '内容'; +COMMENT ON COLUMN "config_info_aggr"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_aggr"."tenant_id" IS '租户字段'; +COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Records of config_info_aggr +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" timestamp(6) NOT NULL, + "gmt_modified" timestamp(6) NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "config_info_beta"."id" IS 'id'; +COMMENT ON COLUMN "config_info_beta"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_beta"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_beta"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_beta"."content" IS 'content'; +COMMENT ON COLUMN "config_info_beta"."beta_ips" IS 'betaIps'; +COMMENT ON COLUMN "config_info_beta"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_beta"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_beta"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_beta"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_beta"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info_beta"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info_beta"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Records of config_info_beta +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(6) NOT NULL, + "gmt_modified" timestamp(6) NOT NULL, + "src_user" text , + "src_ip" varchar(20) +) +; +COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; +COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_tag"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "config_info_tag"."tag_id" IS 'tag_id'; +COMMENT ON COLUMN "config_info_tag"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_tag"."content" IS 'content'; +COMMENT ON COLUMN "config_info_tag"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_tag"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_tag"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_tag"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_tag"."src_ip" IS 'source ip'; +COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Records of config_info_tag +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" bigserial NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" bigserial NOT NULL +) +; +COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; +COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; +COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; +COMMENT ON COLUMN "config_tags_relation"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_tags_relation"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_tags_relation"."tenant_id" IS 'tenant_id'; +COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + +-- ---------------------------- +-- Records of config_tags_relation +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" bigserial NOT NULL, + "group_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(6) NOT NULL, + "gmt_modified" timestamp(6) NOT NULL +) +; +COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "group_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_count" IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "group_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "group_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Records of group_capacity +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" int8 NOT NULL, + "nid" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(6) NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" timestamp(6) NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +) +; +COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "his_config_info" IS '多租户改造'; + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" USING btree ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" bigserial NOT NULL, + "tenant_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(6) NOT NULL, + "gmt_modified" timestamp(6) NOT NULL +) +; +COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; +COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "tenant_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_count" IS '聚合子配置最大个数'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "tenant_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Records of tenant_capacity +-- ---------------------------- +BEGIN; +COMMIT; + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" bigserial NOT NULL, + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" int8 NOT NULL, + "gmt_modified" int8 NOT NULL +) +; +COMMENT ON COLUMN "tenant_info"."id" IS 'id'; +COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; +COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "tenant_info"."tenant_name" IS 'tenant_name'; +COMMENT ON COLUMN "tenant_info"."tenant_desc" IS 'tenant_desc'; +COMMENT ON COLUMN "tenant_info"."create_source" IS 'create_source'; +COMMENT ON COLUMN "tenant_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_info"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_info" IS 'tenant_info'; + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( + "kp", + "tenant_id" + ); + +-- ---------------------------- +-- Records of tenant_info +-- ---------------------------- +BEGIN; +COMMIT; + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" boolean NOT NULL +) +; + +-- ---------------------------- +-- Records of users +-- ---------------------------- +BEGIN; +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); +COMMIT; + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( + "username", + "role" + ); + +-- ---------------------------- +-- Records of roles +-- ---------------------------- +BEGIN; +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); +COMMIT; + + + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of permissions +-- ---------------------------- +BEGIN; +COMMIT; + + + + + + diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql b/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql new file mode 100644 index 0000000..993873b --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql @@ -0,0 +1 @@ +CREATE SCHEMA IF NOT EXISTS nacos; \ No newline at end of file diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql b/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql new file mode 100644 index 0000000..301519f --- /dev/null +++ b/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql @@ -0,0 +1,198 @@ +use nacos; +/******************************************/ +/* 表名称 = config_info */ +/******************************************/ +CREATE TABLE `config_info` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) DEFAULT NULL COMMENT 'group_id', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) DEFAULT NULL COMMENT 'configuration description', + `c_use` varchar(64) DEFAULT NULL COMMENT 'configuration usage', + `effect` varchar(64) DEFAULT NULL COMMENT '配置生效的描述', + `type` varchar(64) DEFAULT NULL COMMENT '配置的类型', + `c_schema` text COMMENT '配置的模式', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; + +/******************************************/ +/* 表名称 = config_info_aggr */ +/******************************************/ +CREATE TABLE `config_info_aggr` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', + `content` longtext NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; + + +/******************************************/ +/* 表名称 = config_info_beta */ +/******************************************/ +CREATE TABLE `config_info_beta` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; + +/******************************************/ +/* 表名称 = config_info_tag */ +/******************************************/ +CREATE TABLE `config_info_tag` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; + +/******************************************/ +/* 表名称 = config_tags_relation */ +/******************************************/ +CREATE TABLE `config_tags_relation` ( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增长标识', + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; + +/******************************************/ +/* 表名称 = group_capacity */ +/******************************************/ +CREATE TABLE `group_capacity` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; + +/******************************************/ +/* 表名称 = his_config_info */ +/******************************************/ +CREATE TABLE `his_config_info` ( + `id` bigint(20) unsigned NOT NULL COMMENT 'id', + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', + `data_id` varchar(255) NOT NULL COMMENT 'data_id', + `group_id` varchar(128) NOT NULL COMMENT 'group_id', + `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', + `content` longtext NOT NULL COMMENT 'content', + `md5` varchar(32) DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COMMENT 'source user', + `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', + `op_type` char(10) DEFAULT NULL COMMENT 'operation type', + `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text NOT NULL COMMENT '密钥', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; + + +/******************************************/ +/* 表名称 = tenant_capacity */ +/******************************************/ +CREATE TABLE `tenant_capacity` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; + + +CREATE TABLE `tenant_info` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) default '' COMMENT 'tenant_id', + `tenant_name` varchar(128) default '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE `users` ( + `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', + `password` varchar(500) NOT NULL COMMENT 'password', + `enabled` boolean NOT NULL COMMENT 'enabled' +); + +CREATE TABLE `roles` ( + `username` varchar(50) NOT NULL COMMENT 'username', + `role` varchar(50) NOT NULL COMMENT 'role', + UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE +); + +CREATE TABLE `permissions` ( + `role` varchar(50) NOT NULL COMMENT 'role', + `resource` varchar(128) NOT NULL COMMENT 'resource', + `action` varchar(8) NOT NULL COMMENT 'action', + UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE +); + +INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); -- Gitee From 5e42ec85b12a7dcd49c60d57675b0e31156f8a12 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sun, 25 Aug 2024 22:49:52 +0800 Subject: [PATCH 033/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0spi=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gin.datasource.mapper.ConfigInfoAggrMapper | 8 -- ...gin.datasource.mapper.ConfigInfoBetaMapper | 8 -- ....plugin.datasource.mapper.ConfigInfoMapper | 8 -- ...ugin.datasource.mapper.ConfigInfoTagMapper | 8 -- ...datasource.mapper.ConfigTagsRelationMapper | 8 -- ...ugin.datasource.mapper.GroupCapacityMapper | 8 -- ....datasource.mapper.HistoryConfigInfoMapper | 8 -- ...baba.nacos.plugin.datasource.mapper.Mapper | 80 +++++++++++++++++++ ...gin.datasource.mapper.TenantCapacityMapper | 8 -- ....plugin.datasource.mapper.TenantInfoMapper | 8 -- 10 files changed, 80 insertions(+), 72 deletions(-) delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper create mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper delete mode 100644 nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper deleted file mode 100644 index 0506c3a..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoAggrMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper deleted file mode 100644 index 123a8be..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoBetaMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper deleted file mode 100644 index 3de1f11..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper deleted file mode 100644 index 47ec23e..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoTagMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper deleted file mode 100644 index 89a85e2..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigTagRelationMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper deleted file mode 100644 index 2128bf6..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.GroupCapacityMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper deleted file mode 100644 index b0cc789..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.HistoryConfigInfoMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper new file mode 100644 index 0000000..1a3878e --- /dev/null +++ b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper @@ -0,0 +1,80 @@ +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoAggrMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoBetaMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoTagMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoTagMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigTagRelationMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigTagRelationMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.GroupCapacityMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.GroupCapacityMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.HistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.HistoryConfigInfoMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantCapacityMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantCapacityMapper + +com.jn.nacos.plugin.datasource.db.dm.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantInfoMapper diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper deleted file mode 100644 index 196c53f..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantCapacityMapper \ No newline at end of file diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper deleted file mode 100644 index c62621b..0000000 --- a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantInfoMapper \ No newline at end of file -- Gitee From 079104910f1db0ba0692c9118cade167f49e0bc1 Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 07:17:36 +0800 Subject: [PATCH 034/159] =?UTF-8?q?*=20=E5=88=9D=E5=A7=8B=E5=8C=96=20Diale?= =?UTF-8?q?ctManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/dialect/DatabaseDialectManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java index 466fba3..766fa7b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java @@ -13,6 +13,9 @@ public class DatabaseDialectManager { private Map dialectMap; + private DatabaseDialectManager(){ + init(); + } private void init(){ Collection dialects = NacosServiceLoader.load(DatabaseDialect.class); Map map = Maps.newHashMap(); -- Gitee From 213368bdf9d0ae967e86c3b3d234b3df6b39256c Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 07:18:58 +0800 Subject: [PATCH 035/159] * rename it --- .../db/dm/dialect/DmDatabaseDialect.java | 4 ++-- .../dialect/KingbaseDatabaseDialect.java | 4 ++-- .../dailect/MagicDataDatabaseDialect.java | 4 ++-- .../db/mssql/driver/MssqlDatabaseDialect.java | 4 ++-- .../dialect/OpenGaussDatabaseDialect.java | 4 ++-- .../oracle/dialect/OracleDatabaseDialect.java | 4 ++-- .../oscar/dialect/OscarDatabaseDialect.java | 4 ++-- .../dialect/PostgresqlDatabaseDialect.java | 4 ++-- ...Dialect.java => NacosDatabaseDialect.java} | 4 ++-- ....java => NacosDatabaseDialectManager.java} | 22 +++++++++---------- .../plugin/datasource/mapper/BaseMapper.java | 10 ++++----- ...n.datasource.dialect.NacosDatabaseDialect} | 0 12 files changed, 34 insertions(+), 34 deletions(-) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/{DatabaseDialect.java => NacosDatabaseDialect.java} (96%) rename nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/{DatabaseDialectManager.java => NacosDatabaseDialectManager.java} (44%) rename nacos-plugin-datasource/src/main/resources/META-INF/services/{com.jn.nacos.plugin.datasource.dialect.DatabaseDialect => com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect} (100%) diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java index 28ad0c0..9272404 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.dm.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class DmDatabaseDialect extends DatabaseDialect { +public class DmDatabaseDialect extends NacosDatabaseDialect { public DmDatabaseDialect() { super(DatabaseTypes.DAMENG); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java index dd94b06..0dbdc3f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.kingbase.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class KingbaseDatabaseDialect extends DatabaseDialect { +public class KingbaseDatabaseDialect extends NacosDatabaseDialect { public KingbaseDatabaseDialect() { super(DatabaseTypes.KINGBASE); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java index 88841f3..7877d6d 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.magicdata.dailect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class MagicDataDatabaseDialect extends DatabaseDialect { +public class MagicDataDatabaseDialect extends NacosDatabaseDialect { public MagicDataDatabaseDialect() { super(DatabaseTypes.MAGICDATA); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java index bd35d04..25918a9 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.mssql.driver; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class MssqlDatabaseDialect extends DatabaseDialect { +public class MssqlDatabaseDialect extends NacosDatabaseDialect { public MssqlDatabaseDialect() { super(DatabaseTypes.MSSQL); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java index 6334ced..9f8924e 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.opengauss.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class OpenGaussDatabaseDialect extends DatabaseDialect { +public class OpenGaussDatabaseDialect extends NacosDatabaseDialect { public OpenGaussDatabaseDialect(){ super(DatabaseTypes.OPENGAUSS); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java index 5468207..65ed95f 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.oracle.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class OracleDatabaseDialect extends DatabaseDialect { +public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect() { super(DatabaseTypes.ORACLE); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java index eebb89a..72b4529 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.oscar.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class OscarDatabaseDialect extends DatabaseDialect { +public class OscarDatabaseDialect extends NacosDatabaseDialect { public OscarDatabaseDialect(){ super(DatabaseTypes.OSCAR); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java index fec5aed..3aa7b8b 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java @@ -1,9 +1,9 @@ package com.jn.nacos.plugin.datasource.db.postgresql.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -public class PostgresqlDatabaseDialect extends DatabaseDialect { +public class PostgresqlDatabaseDialect extends NacosDatabaseDialect { public PostgresqlDatabaseDialect(){ super(DatabaseTypes.POSTGRESQL); } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java similarity index 96% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java index ecd00c4..b9f3517 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialect.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java @@ -14,12 +14,12 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; import java.util.Map; -public abstract class DatabaseDialect { +public abstract class NacosDatabaseDialect { private String name; private Dialect delegate; private Map functionMap; - public DatabaseDialect(String name){ + public NacosDatabaseDialect(String name){ Preconditions.checkNotEmpty(name, "invalid dialect in class {}", Reflects.getFQNClassName(this.getClass())); this.name = name; String sqlhelperDialect = getCustomizedDialect(this.name); diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java similarity index 44% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java rename to nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java index 766fa7b..c13dc01 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/DatabaseDialectManager.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java @@ -8,34 +8,34 @@ import org.slf4j.Logger; import java.util.Collection; import java.util.Map; -public class DatabaseDialectManager { - private static final Logger logger = Loggers.getLogger(DatabaseDialectManager.class); +public class NacosDatabaseDialectManager { + private static final Logger logger = Loggers.getLogger(NacosDatabaseDialectManager.class); - private Map dialectMap; + private Map dialectMap; - private DatabaseDialectManager(){ + private NacosDatabaseDialectManager(){ init(); } private void init(){ - Collection dialects = NacosServiceLoader.load(DatabaseDialect.class); - Map map = Maps.newHashMap(); - for (DatabaseDialect dialect : dialects){ + Collection dialects = NacosServiceLoader.load(NacosDatabaseDialect.class); + Map map = Maps.newHashMap(); + for (NacosDatabaseDialect dialect : dialects){ map.put(dialect.getName(), dialect); } this.dialectMap = map; } - public DatabaseDialect getDialect(String databaseType){ - DatabaseDialect dialect = this.dialectMap.get(databaseType); + public NacosDatabaseDialect getDialect(String databaseType){ + NacosDatabaseDialect dialect = this.dialectMap.get(databaseType); if(dialect==null){ throw new RuntimeException("unsupported database dialect: " + databaseType); } return dialect; } - private static final DatabaseDialectManager INSTANCE = new DatabaseDialectManager(); + private static final NacosDatabaseDialectManager INSTANCE = new NacosDatabaseDialectManager(); - public static DatabaseDialectManager getInstance(){ + public static NacosDatabaseDialectManager getInstance(){ return INSTANCE; } } diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index a8309c2..d5db72c 100644 --- a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -2,17 +2,17 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.jn.langx.util.Preconditions; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialect; -import com.jn.nacos.plugin.datasource.dialect.DatabaseDialectManager; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialectManager; public abstract class BaseMapper extends AbstractMapper{ private String databaseId; - protected DatabaseDialect dialect; + protected NacosDatabaseDialect dialect; public BaseMapper(String databaseId){ Preconditions.checkNotEmpty(databaseId,"database id is empty"); this.databaseId = databaseId; - this.dialect = DatabaseDialectManager.getInstance().getDialect(this.databaseId); + this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } @@ -21,7 +21,7 @@ public abstract class BaseMapper extends AbstractMapper{ return databaseId; } - public DatabaseDialect getDialect() { + public NacosDatabaseDialect getDialect() { return dialect; } diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect b/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect similarity index 100% rename from nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.DatabaseDialect rename to nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect -- Gitee From 86fc616b01a44042ccfa0182ded94f018476438d Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 07:33:30 +0800 Subject: [PATCH 036/159] * rename it --- .../pom.xml | 2 +- .../resources/sql/dm/create-schema.sql | 0 .../resources/sql/dm/create-tables.sql | 0 .../resources/sql/kingbase/create-schema.sql | 0 .../resources/sql/kingbase/create-tables.sql | 0 .../resources/sql/magicdata/create-schema.sql | 0 .../resources/sql/magicdata/create-tables.sql | 0 .../resources/sql/mssql/create-schema.sql | 0 .../resources/sql/mssql/create-tables.sql | 0 .../resources/sql/mysql/create-schema.sql | 0 .../resources/sql/mysql/create-tables.sql | 0 .../resources/sql/opengauss/create-schema.sql | 0 .../resources/sql/opengauss/create-tables.sql | 0 .../resources/sql/oracle/create-schema.sql | 0 .../resources/sql/oracle/create-tables.sql | 0 .../resources/sql/oscar/create-schema.sql | 0 .../resources/sql/oscar/create-tables.sql | 0 .../resources/sql/postgresql/create-schema.sql | 0 .../resources/sql/postgresql/create-tables.sql | 0 {nacos-plugin-datasource => nacosplugin-datasource}/pom.xml | 2 +- .../java/com/jn/nacos/plugin/datasource/DatabaseTypes.java | 0 .../plugin/datasource/db/dm/dialect/DmDatabaseDialect.java | 0 .../plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java | 0 .../plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java | 0 .../plugin/datasource/db/dm/mapper/ConfigInfoMapper.java | 0 .../plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java | 0 .../datasource/db/dm/mapper/ConfigTagRelationMapper.java | 0 .../plugin/datasource/db/dm/mapper/GroupCapacityMapper.java | 0 .../datasource/db/dm/mapper/HistoryConfigInfoMapper.java | 0 .../plugin/datasource/db/dm/mapper/TenantCapacityMapper.java | 0 .../plugin/datasource/db/dm/mapper/TenantInfoMapper.java | 0 .../db/kingbase/dialect/KingbaseDatabaseDialect.java | 0 .../datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java | 0 .../datasource/db/kingbase/mapper/ConfigInfoMapper.java | 0 .../datasource/db/kingbase/mapper/ConfigInfoTagMapper.java | 0 .../db/kingbase/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/kingbase/mapper/GroupCapacityMapper.java | 0 .../db/kingbase/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/kingbase/mapper/TenantCapacityMapper.java | 0 .../datasource/db/kingbase/mapper/TenantInfoMapper.java | 0 .../db/magicdata/dailect/MagicDataDatabaseDialect.java | 0 .../datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java | 0 .../datasource/db/magicdata/mapper/ConfigInfoMapper.java | 0 .../datasource/db/magicdata/mapper/ConfigInfoTagMapper.java | 0 .../db/magicdata/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/magicdata/mapper/GroupCapacityMapper.java | 0 .../db/magicdata/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/magicdata/mapper/TenantCapacityMapper.java | 0 .../datasource/db/magicdata/mapper/TenantInfoMapper.java | 0 .../datasource/db/mssql/driver/MssqlDatabaseDialect.java | 0 .../datasource/db/mssql/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/mssql/mapper/ConfigInfoBetaMapper.java | 0 .../plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java | 0 .../datasource/db/mssql/mapper/ConfigInfoTagMapper.java | 0 .../datasource/db/mssql/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/mssql/mapper/GroupCapacityMapper.java | 0 .../datasource/db/mssql/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/mssql/mapper/TenantCapacityMapper.java | 0 .../plugin/datasource/db/mssql/mapper/TenantInfoMapper.java | 0 .../db/opengauss/dialect/OpenGaussDatabaseDialect.java | 0 .../datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java | 0 .../datasource/db/opengauss/mapper/ConfigInfoMapper.java | 0 .../datasource/db/opengauss/mapper/ConfigInfoTagMapper.java | 0 .../db/opengauss/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/opengauss/mapper/GroupCapacityMapper.java | 0 .../db/opengauss/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/opengauss/mapper/TenantCapacityMapper.java | 0 .../datasource/db/opengauss/mapper/TenantInfoMapper.java | 0 .../datasource/db/oracle/dialect/OracleDatabaseDialect.java | 0 .../datasource/db/oracle/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/oracle/mapper/ConfigInfoBetaMapper.java | 0 .../plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java | 0 .../datasource/db/oracle/mapper/ConfigInfoTagMapper.java | 0 .../datasource/db/oracle/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/oracle/mapper/GroupCapacityMapper.java | 0 .../datasource/db/oracle/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/oracle/mapper/TenantCapacityMapper.java | 0 .../plugin/datasource/db/oracle/mapper/TenantInfoMapper.java | 0 .../datasource/db/oscar/dialect/OscarDatabaseDialect.java | 0 .../datasource/db/oscar/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/oscar/mapper/ConfigInfoBetaMapper.java | 0 .../plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java | 0 .../datasource/db/oscar/mapper/ConfigInfoTagMapper.java | 0 .../datasource/db/oscar/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/oscar/mapper/GroupCapacityMapper.java | 0 .../datasource/db/oscar/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/oscar/mapper/TenantCapacityMapper.java | 0 .../plugin/datasource/db/oscar/mapper/TenantInfoMapper.java | 0 .../db/postgresql/dialect/PostgresqlDatabaseDialect.java | 0 .../datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java | 0 .../datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java | 0 .../datasource/db/postgresql/mapper/ConfigInfoMapper.java | 0 .../datasource/db/postgresql/mapper/ConfigInfoTagMapper.java | 0 .../db/postgresql/mapper/ConfigTagRelationMapper.java | 0 .../datasource/db/postgresql/mapper/GroupCapacityMapper.java | 0 .../db/postgresql/mapper/HistoryConfigInfoMapper.java | 0 .../datasource/db/postgresql/mapper/TenantCapacityMapper.java | 0 .../datasource/db/postgresql/mapper/TenantInfoMapper.java | 0 .../nacos/plugin/datasource/dialect/NacosDatabaseDialect.java | 0 .../datasource/dialect/NacosDatabaseDialectManager.java | 0 .../plugin/datasource/mapper/BaseConfigInfoAggrMapper.java | 0 .../plugin/datasource/mapper/BaseConfigInfoBetaMapper.java | 0 .../nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java | 0 .../plugin/datasource/mapper/BaseConfigInfoTagMapper.java | 0 .../plugin/datasource/mapper/BaseConfigTagRelationMapper.java | 0 .../plugin/datasource/mapper/BaseGroupCapacityMapper.java | 0 .../plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java | 0 .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 0 .../plugin/datasource/mapper/BaseTenantCapacityMapper.java | 0 .../nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java | 0 .../com.alibaba.nacos.plugin.datasource.mapper.Mapper | 0 ...om.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect | 0 pom.xml | 4 ++-- 116 files changed, 4 insertions(+), 4 deletions(-) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/pom.xml (91%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/dm/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/dm/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/kingbase/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/kingbase/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/magicdata/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/magicdata/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/mssql/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/mssql/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/mysql/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/mysql/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/opengauss/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/opengauss/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/oracle/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/oracle/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/oscar/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/oscar/create-tables.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/postgresql/create-schema.sql (100%) rename {nacos-plugin-datasource-sqlscript => nacosplugin-datasource-sqlscript}/resources/sql/postgresql/create-tables.sql (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/pom.xml (95%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper (100%) rename {nacos-plugin-datasource => nacosplugin-datasource}/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect (100%) diff --git a/nacos-plugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml similarity index 91% rename from nacos-plugin-datasource-sqlscript/pom.xml rename to nacosplugin-datasource-sqlscript/pom.xml index 85bc006..3b3c79a 100644 --- a/nacos-plugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -9,7 +9,7 @@ 1.0.0 - nacos-plugin-datasource-sqlscript + nacosplugin-datasource-sqlscript ${project.groupId}:${project.artifactId}:${project.version} true diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/dm/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/dm/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/mysql/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql rename to nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql diff --git a/nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql similarity index 100% rename from nacos-plugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql rename to nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql diff --git a/nacos-plugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml similarity index 95% rename from nacos-plugin-datasource/pom.xml rename to nacosplugin-datasource/pom.xml index af3457b..627b932 100644 --- a/nacos-plugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -9,7 +9,7 @@ 1.0.0 - nacos-plugin-datasource + nacosplugin-datasource ${project.groupId}:${project.artifactId}:${project.version} 8 diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java diff --git a/nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java similarity index 100% rename from nacos-plugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper b/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper similarity index 100% rename from nacos-plugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper rename to nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper diff --git a/nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect similarity index 100% rename from nacos-plugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect rename to nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect diff --git a/pom.xml b/pom.xml index 391d478..f1d09bb 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,8 @@ nacos plugins - nacos-plugin-datasource - nacos-plugin-datasource-sqlscript + nacosplugin-datasource + nacosplugin-datasource-sqlscript -- Gitee From 7417beb3d393b0f82bac3f70f89fdd385e975f63 Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 07:48:28 +0800 Subject: [PATCH 037/159] =?UTF-8?q?+=20=E6=8F=90=E4=BE=9Bdatasource=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85=E6=95=99=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- nacosplugin-datasource/installation.MD | 29 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 nacosplugin-datasource/installation.MD diff --git a/README.md b/README.md index e7080d9..c1224bb 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,7 @@ #### 安装教程 - -1. 将插件及其依赖，放到 nacos plugins目录即可 +1. [nacosplugin-datasource 安装](./nacosplugin-datasource/installation.MD) #### 使用说明 diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD new file mode 100644 index 0000000..7f9b123 --- /dev/null +++ b/nacosplugin-datasource/installation.MD @@ -0,0 +1,29 @@ +## datasource 插件安装 +1. 将插件、插件依赖、数据库驱动、数据库驱动依赖，放到 nacos plugins目录 +```text +io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar +io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar +io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar +``` + +2. 在application.properties中配置数据库 + +以postgresql 数据库为例，修改 `nacos/conf/application.properties` ： +```properties +# PostgreSQL +spring.sql.init.platform=postgresql +db.num=1 +db.url.0=jdbc:postgresql://192.168.188.131:5432/db1?currentSchema=nacos +db.user.0=postgresql +db.password.0=postgresql +db.pool.config.driverClassName=org.postgresql.Driver +``` + +3. 初始数据库schema + +使用DBeaver 等工具，连接到数据库，执行相关schema初始化。脚本位置： +```text +nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 +``` +4. 启动nacos访问 + -- Gitee From 4c3aa99cc9fd1c6bd919ca99a4732b3f176e8578 Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 07:58:36 +0800 Subject: [PATCH 038/159] =?UTF-8?q?+=20=E6=8F=90=E4=BE=9Bdatasource=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=AE=89=E8=A3=85=E6=95=99=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 10 +++++++--- pom.xml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 7f9b123..16f30ea 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -1,9 +1,13 @@ ## datasource 插件安装 1. 将插件、插件依赖、数据库驱动、数据库驱动依赖，放到 nacos plugins目录 ```text -io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar -io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar -io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:VERSION.jar +# 插件及插件依赖，如下为maven-dependency-plugin输出日志重点部分 +[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ nacosplugin-datasource --- +[INFO] io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:jar:1.0.0 +[INFO] +- io.github.bes2008.solution.sqlhelper:sqlhelper-dialect:jar:5.0.2:compile +[INFO] | +- io.github.bes2008.solution.sqlhelper:sqlhelper-common:jar:5.0.2:compile +[INFO] | +- io.github.bes2008.solution.langx:langx-java-el:jar:5.4.4:compile +[INFO] +- io.github.bes2008.solution.langx:langx-java:jar:5.4.4:compile ``` 2. 在application.properties中配置数据库 diff --git a/pom.xml b/pom.xml index f1d09bb..143754f 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ UTF-8 1.23 - 5.4.3 + 5.4.4 1.17.0 2.4.1 5.0.2 -- Gitee From 33d47734803fc7310dc619f4c5afff4d2c563e5e Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 08:27:26 +0800 Subject: [PATCH 039/159] =?UTF-8?q?+=20=E5=B0=86=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=88=90=E5=8D=95=E4=B8=AA=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- nacosplugin-all/pom.xml | 83 ++++++++++++++++++++++++ nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/installation.MD | 9 ++- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 10 ++- 6 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 nacosplugin-all/pom.xml diff --git a/.gitignore b/.gitignore index 555a9f7..b089f00 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,6 @@ hs_err_pid* .idea/ .gitee/ .git/ -target/ \ No newline at end of file +target/ + +dependency-reduced-pom.xml \ No newline at end of file diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml new file mode 100644 index 0000000..e4d3e97 --- /dev/null +++ b/nacosplugin-all/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + + io.github.bes2008.solution.nacosplugins + nacos-plugins + 1.0.0 + + + nacosplugin-all + + + 3.4.1 + + + + + + io.github.bes2008.solution.nacosplugins + nacosplugin-datasource + + + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + true + true + + + + shade-all + package + + shade + + + true + false + + + io.github.bes2008.solution.nacosplugins + io.github.bes2008.solution.sqlhelper + io.github.bes2008.solution.langx + + + + + + io.github.bes2008.solution.nacosplugins + + META-INF/maven/** + + + + io.github.bes2008.solution.sqlhelper + + META-INF/maven/** + + + + io.github.bes2008.solution.langx + + META-INF/maven/** + + + + + + + + + + + + + \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index 3b3c79a..aaf6589 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.bes2008.solution.nacos.plugins + io.github.bes2008.solution.nacosplugins nacos-plugins 1.0.0 diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 16f30ea..f9ec651 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -3,7 +3,7 @@ ```text # 插件及插件依赖，如下为maven-dependency-plugin输出日志重点部分 [INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ nacosplugin-datasource --- -[INFO] io.github.bes2008.solution.nacos.plugins:nacosplugin-datasource:jar:1.0.0 +[INFO] io.github.bes2008.solution.nacosplugins:nacosplugin-datasource:jar:1.0.0 [INFO] +- io.github.bes2008.solution.sqlhelper:sqlhelper-dialect:jar:5.0.2:compile [INFO] | +- io.github.bes2008.solution.sqlhelper:sqlhelper-common:jar:5.0.2:compile [INFO] | +- io.github.bes2008.solution.langx:langx-java-el:jar:5.4.4:compile @@ -31,3 +31,10 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 ``` 4. 启动nacos访问 +--- + +## PostgreSQL 测试时，注意事项 +1. 相关依赖要放全 + +2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到SRAM相关问题 + diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 627b932..6668672 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.bes2008.solution.nacos.plugins + io.github.bes2008.solution.nacosplugins nacos-plugins 1.0.0 diff --git a/pom.xml b/pom.xml index 143754f..2fd41e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.github.bes2008.solution.nacos.plugins + io.github.bes2008.solution.nacosplugins nacos-plugins 1.0.0 pom @@ -16,6 +16,7 @@ nacosplugin-datasource nacosplugin-datasource-sqlscript + nacosplugin-all @@ -32,6 +33,13 @@ + + io.github.bes2008.solution.nacosplugins + nacosplugin-datasource + ${project.version} + + + org.openjdk.jmh jmh-core -- Gitee From 42e2af4e7a21a592807449ff328097cefeca0760 Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 08:30:50 +0800 Subject: [PATCH 040/159] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index f9ec651..687a49f 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -1,13 +1,7 @@ ## datasource 插件安装 -1. 将插件、插件依赖、数据库驱动、数据库驱动依赖，放到 nacos plugins目录 +1. 将插件、数据库驱动、数据库驱动依赖，放到 nacos plugins目录 ```text -# 插件及插件依赖，如下为maven-dependency-plugin输出日志重点部分 -[INFO] --- maven-dependency-plugin:2.8:tree (default-cli) @ nacosplugin-datasource --- -[INFO] io.github.bes2008.solution.nacosplugins:nacosplugin-datasource:jar:1.0.0 -[INFO] +- io.github.bes2008.solution.sqlhelper:sqlhelper-dialect:jar:5.0.2:compile -[INFO] | +- io.github.bes2008.solution.sqlhelper:sqlhelper-common:jar:5.0.2:compile -[INFO] | +- io.github.bes2008.solution.langx:langx-java-el:jar:5.4.4:compile -[INFO] +- io.github.bes2008.solution.langx:langx-java:jar:5.4.4:compile +io.github.bes2008.solution.nacosplugins:nacosplugin-all:jar:1.0.0 ``` 2. 在application.properties中配置数据库 -- Gitee From 48c89f625948c4af8b61ffd545dce4bb8481d460 Mon Sep 17 00:00:00 2001 From: coderjn Date: Mon, 26 Aug 2024 08:34:09 +0800 Subject: [PATCH 041/159] =?UTF-8?q?*=20=E7=AE=80=E5=8C=96=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 687a49f..0e71c02 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -28,7 +28,6 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 --- ## PostgreSQL 测试时，注意事项 -1. 相关依赖要放全 - -2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到SRAM相关问题 +1. postgresql 相关依赖要放全，且要与服务端兼容，建议 >= 42.2.0 版本。 +2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到 PostgreSQL SCRAM 认证相关问题 -- Gitee From 48ad3bce512c2dffb89134dedf13e35ec6f859ee Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 26 Aug 2024 14:41:42 +0800 Subject: [PATCH 042/159] =?UTF-8?q?*=20=E5=88=9D=E5=A7=8B=E5=8C=96=20postg?= =?UTF-8?q?res=20=E7=9A=84s=20ql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/postgresql/create-schema.sql | 2 + .../sql/postgresql/create-tables.sql | 464 ++++++++++++++++++ 2 files changed, 466 insertions(+) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql index e69de29..15640f5 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-schema.sql @@ -0,0 +1,2 @@ +DROP schema if EXISTS nacos CASCADE; +CREATE SCHEMA nacos; \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql index e69de29..af313bf 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql @@ -0,0 +1,464 @@ +SET search_path TO nacos; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" text , + "encrypted_data_key" text +) +; + +COMMENT ON COLUMN "config_info"."id" IS 'id'; +COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info"."content" IS 'content'; +COMMENT ON COLUMN "config_info"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info"."effect" IS '配置生效描述'; +COMMENT ON COLUMN "config_info"."type" IS '配置的类型'; +COMMENT ON COLUMN "config_info"."c_schema" IS '配置的模式'; +COMMENT ON COLUMN "config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info" IS 'config_info'; + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" text NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +) +; +COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; +COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_aggr"."datum_id" IS 'datum_id'; +COMMENT ON COLUMN "config_info_aggr"."content" IS '内容'; +COMMENT ON COLUMN "config_info_aggr"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_aggr"."tenant_id" IS '租户字段'; +COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "config_info_beta"."id" IS 'id'; +COMMENT ON COLUMN "config_info_beta"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_beta"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_beta"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_beta"."content" IS 'content'; +COMMENT ON COLUMN "config_info_beta"."beta_ips" IS 'betaIps'; +COMMENT ON COLUMN "config_info_beta"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_beta"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_beta"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_beta"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_beta"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info_beta"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info_beta"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) +) +; +COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; +COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_tag"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "config_info_tag"."tag_id" IS 'tag_id'; +COMMENT ON COLUMN "config_info_tag"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_tag"."content" IS 'content'; +COMMENT ON COLUMN "config_info_tag"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_tag"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_tag"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_tag"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_tag"."src_ip" IS 'source ip'; +COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" bigserial NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" bigserial NOT NULL +) +; +COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; +COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; +COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; +COMMENT ON COLUMN "config_tags_relation"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_tags_relation"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_tags_relation"."tenant_id" IS 'tenant_id'; +COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" bigserial NOT NULL, + "group_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "group_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_count" IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "group_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "group_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" int8 NOT NULL, + "nid" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +) +; +COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "his_config_info" IS '多租户改造'; + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" USING btree ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" bigserial NOT NULL, + "tenant_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; +COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "tenant_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_count" IS '聚合子配置最大个数'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "tenant_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" bigserial NOT NULL, + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" int8 NOT NULL, + "gmt_modified" int8 NOT NULL +) +; +COMMENT ON COLUMN "tenant_info"."id" IS 'id'; +COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; +COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "tenant_info"."tenant_name" IS 'tenant_name'; +COMMENT ON COLUMN "tenant_info"."tenant_desc" IS 'tenant_desc'; +COMMENT ON COLUMN "tenant_info"."create_source" IS 'create_source'; +COMMENT ON COLUMN "tenant_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_info"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_info" IS 'tenant_info'; + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( + "kp", + "tenant_id" + ); + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" boolean NOT NULL +) +; + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( + "username", + "role" + ); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + + +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); + + +COMMIT; \ No newline at end of file -- Gitee From 9a9becda93e258f45d701480aab9ee140cdc5964 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 26 Aug 2024 14:58:50 +0800 Subject: [PATCH 043/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- .../nacos/plugin/datasource/dialect/NacosDatabaseDialect.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index e4d3e97..3249032 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -10,7 +10,7 @@ nacosplugin-all - + ${project.groupId}:${project.artifactId}:${project.version} 3.4.1 diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java index b9f3517..d57876b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java @@ -59,7 +59,7 @@ public abstract class NacosDatabaseDialect { } public List rebuildParameters(List queryParams, RowSelection selection){ - return Instrumentations.rebuildParameters(this.delegate, queryParams, selection); + return this.delegate.rebuildParameters(selection, queryParams); } public String getName() { -- Gitee From cf768af342a2e8bea186300812e6717b7e46095e Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 26 Aug 2024 15:33:06 +0800 Subject: [PATCH 044/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/db/dm/dialect/DmDatabaseDialect.java | 9 +++++++++ .../plugin/datasource/dialect/NacosDatabaseDialect.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java index 9272404..655a4f0 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java @@ -3,8 +3,17 @@ package com.jn.nacos.plugin.datasource.db.dm.dialect; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import java.util.Map; + public class DmDatabaseDialect extends NacosDatabaseDialect { public DmDatabaseDialect() { super(DatabaseTypes.DAMENG); } + + @Override + protected Map initFunctionMap() { + Map map= super.initFunctionMap(); + map.put("NOW()", "CURRENT_TIMESTAMP(3)"); + return map; + } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java index d57876b..402c436 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java @@ -8,7 +8,6 @@ import com.jn.langx.util.collection.Maps; import com.jn.langx.util.reflect.Reflects; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; -import com.jn.sqlhelper.dialect.instrument.Instrumentations; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -43,6 +42,7 @@ public abstract class NacosDatabaseDialect { protected Map initFunctionMap(){ Map map = Maps.newHashMap(); + // 需要获取到毫秒 map.put("NOW()", "CURRENT_TIMESTAMP"); return map; } -- Gitee From e6dd76bfd1da5c22d41a0407ead0e2a38332aaed Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 26 Aug 2024 20:22:22 +0800 Subject: [PATCH 045/159] =?UTF-8?q?*=20=E5=AF=B9=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=8C=85=E8=BF=9B=E8=A1=8C=E7=98=A6=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 124 ++++++++++++++++++++++++- nacosplugin-datasource/installation.MD | 3 +- nacosplugin-datasource/pom.xml | 6 ++ 3 files changed, 129 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 3249032..424a62d 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -47,7 +47,7 @@ io.github.bes2008.solution.nacosplugins io.github.bes2008.solution.sqlhelper - io.github.bes2008.solution.langx + io.github.bes2008.solution.langx:langx-java @@ -59,15 +59,133 @@ - io.github.bes2008.solution.sqlhelper + io.github.bes2008.solution.sqlhelper:sqlhelper-dialect META-INF/maven/** + + com/jn/sqlhelper/dialect/config/** + com/jn/sqlhelper/dialect/expression/** + com/jn/sqlhelper/dialect/instrument/** + com/jn/sqlhelper/dialect/orderby/** + com/jn/sqlhelper/dialect/pagination/Paged* + com/jn/sqlhelper/dialect/pagination/*Pagin* + com/jn/sqlhelper/dialect/parameter/** + com/jn/sqlhelper/dialect/sqlparser/** + com/jn/sqlhelper/dialect/tenant/** + com/jn/sqlhelper/dialect/SelectRequest* + com/jn/sqlhelper/dialect/SqlRequest* + + + + io.github.bes2008.solution.sqlhelper:sqlhelper-common + + META-INF/maven/** + + com/jn/sqlhelper/common/batch/** + com/jn/sqlhelper/common/connection/** + com/jn/sqlhelper/common/er/** + com/jn/sqlhelper/common/formatter/** + com/jn/sqlhelper/common/jdbc/** + com/jn/sqlhelper/common/resultset/** + com/jn/sqlhelper/common/security/** + com/jn/sqlhelper/common/statement/** + com/jn/sqlhelper/common/symbolmapper/** + com/jn/sqlhelper/common/transaction/** - io.github.bes2008.solution.langx + io.github.bes2008.solution.langx:langx-java META-INF/maven/** + + com/jn/langx/accessor/** + com/jn/langx/beans/** + com/jn/langx/cache/** + com/jn/langx/chain/** + com/jn/langx/codec/** + com/jn/langx/configuration/** + com/jn/langx/environment/** + com/jn/langx/event/** + com/jn/langx/http/** + com/jn/langx/invocation/** + com/jn/langx/io/stream/bandwidthlimit/** + com/jn/langx/io/stream/obj/** + com/jn/langx/io/stream/BufferEx* + com/jn/langx/io/stream/ConsumerTo* + com/jn/langx/io/stream/IOStream* + com/jn/langx/io/stream/InputStream* + com/jn/langx/io/stream/OutputStream* + com/jn/langx/io/stream/Progress* + com/jn/langx/io/stream/Unicode* + com/jn/langx/io/stream/UnsyncByte* + com/jn/langx/io/stream/Wrapped* + com/jn/langx/management/** + com/jn/langx/navigation/** + com/jn/langx/pipeline/** + com/jn/langx/plugin/** + com/jn/langx/propertyset/** + com/jn/langx/repository/** + com/jn/langx/security/** + + com/jn/langx/text/dfa/** + com/jn/langx/text/fragment/** + com/jn/langx/text/grok/** + com/jn/langx/text/i18n/** + com/jn/langx/text/ini/** + com/jn/langx/text/lexer/** + com/jn/langx/text/repository/** + com/jn/langx/text/sensitive/** + com/jn/langx/text/translate/** + com/jn/langx/text/xml/** + + com/jn/langx/util/bean/** + com/jn/langx/util/bit/** + com/jn/langx/util/bloom/** + + com/jn/langx/util/collection/exclusion/** + com/jn/langx/util/collection/forwarding/** + com/jn/langx/util/collection/graph/** + com/jn/langx/util/collection/list/** + com/jn/langx/util/collection/multivalue/** + com/jn/langx/util/collection/pushback/** + com/jn/langx/util/collection/stack/** + com/jn/langx/util/collection/tree/** + com/jn/langx/util/collection/trie/** + + com/jn/langx/util/concurrent/async/** + com/jn/langx/util/concurrent/clhm/** + com/jn/langx/util/concurrent/executor/** + com/jn/langx/util/concurrent/lock/** + com/jn/langx/util/concurrent/ConcurrentCyclicSequence* + com/jn/langx/util/concurrent/CopyOnWrite* + com/jn/langx/util/concurrent/MpscQueue* + com/jn/langx/util/concurrent/ThreadPoolProperties* + + com/jn/langx/util/converter/** + com/jn/langx/util/datetime/** + com/jn/langx/util/hash/*streming/** + com/jn/langx/util/hash/Hashing*Stream* + com/jn/langx/util/id/** + + com/jn/langx/util/io/bytes/** + com/jn/langx/util/io/unicode/** + com/jn/langx/util/io/Channels + com/jn/langx/util/io/IODebugger + com/jn/langx/util/io/ObjectIOs + + com/jn/langx/util/jar/** + com/jn/langx/util/jni/** + com/jn/langx/util/memory/** + com/jn/langx/util/net/** + com/jn/langx/util/pagination/** + com/jn/langx/util/pattern/** + com/jn/langx/util/progress/** + com/jn/langx/util/ranges/** + com/jn/langx/util/retry/** + com/jn/langx/util/reflect/classparse/** + com/jn/langx/util/script/** + com/jn/langx/util/timing/** + com/jn/langx/util/transformer/** diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 0e71c02..d3cb234 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -1,5 +1,5 @@ ## datasource 插件安装 -1. 将插件、数据库驱动、数据库驱动依赖，放到 nacos plugins目录 +1. 将插件、数据库驱动 放到 `nacos/plugins` 目录 ```text io.github.bes2008.solution.nacosplugins:nacosplugin-all:jar:1.0.0 ``` @@ -30,4 +30,5 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 ## PostgreSQL 测试时，注意事项 1. postgresql 相关依赖要放全，且要与服务端兼容，建议 >= 42.2.0 版本。 2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到 PostgreSQL SCRAM 认证相关问题 +3. 驱动[下载地址](https://mvnrepository.com/artifact/org.postgresql/postgresql) diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 6668672..58f8c74 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -26,6 +26,12 @@ io.github.bes2008.solution.sqlhelper sqlhelper-dialect + + + io.github.bes2008.solution.langx + langx-java-el + + -- Gitee From b7b3fbd4dbec2677852c5b93538f46eb55225eaf Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 27 Aug 2024 08:23:36 +0800 Subject: [PATCH 046/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{dialect => }/NacosDatabaseDialect.java | 35 +++++++++++++++++-- .../NacosDatabaseDialectManager.java | 2 +- .../dm/{dialect => }/DmDatabaseDialect.java | 4 +-- .../KingbaseDatabaseDialect.java | 4 +-- .../MagicDataDatabaseDialect.java | 4 +-- .../{driver => }/MssqlDatabaseDialect.java | 4 +-- .../OpenGaussDatabaseDialect.java | 4 +-- .../{dialect => }/OracleDatabaseDialect.java | 4 +-- .../{dialect => }/OscarDatabaseDialect.java | 4 +-- .../PostgresqlDatabaseDialect.java | 4 +-- .../plugin/datasource/mapper/BaseMapper.java | 4 +-- ...cos.plugin.datasource.NacosDatabaseDialect | 8 +++++ ...in.datasource.dialect.NacosDatabaseDialect | 8 ----- 13 files changed, 60 insertions(+), 29 deletions(-) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{dialect => }/NacosDatabaseDialect.java (67%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{dialect => }/NacosDatabaseDialectManager.java (96%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/{dialect => }/DmDatabaseDialect.java (77%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/{dialect => }/KingbaseDatabaseDialect.java (62%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/{dailect => }/MagicDataDatabaseDialect.java (62%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/{driver => }/MssqlDatabaseDialect.java (61%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/{dialect => }/OpenGaussDatabaseDialect.java (62%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/{dialect => }/OracleDatabaseDialect.java (61%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/{dialect => }/OscarDatabaseDialect.java (61%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/{dialect => }/PostgresqlDatabaseDialect.java (62%) create mode 100644 nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect delete mode 100644 nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java similarity index 67% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 402c436..f3a6282 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.dialect; +package com.jn.nacos.plugin.datasource; import com.jn.langx.text.StringTemplates; import com.jn.langx.util.Objs; @@ -40,12 +40,43 @@ public abstract class NacosDatabaseDialect { return customizedDialect; } - protected Map initFunctionMap(){ + private static Map COMMON_FUNCTIONS = defineCommonFunctionMap(); + + /** + * 
+     *  -----------------------定义公有函数-------------------------
+     *  在这里定义的是公有函数，没有必要必须在所有的数据库中存在，只保证在大部分数据库即可;
+     *  并且这里要将所有需要的函数全部定义上
+     *
+ * @return 公有函数 + */ + private static Map defineCommonFunctionMap(){ Map map = Maps.newHashMap(); // 需要获取到毫秒 map.put("NOW()", "CURRENT_TIMESTAMP"); + + return map; + } + + private Map initFunctionMap(){ + Map map = Maps.newHashMap(); + map.putAll(COMMON_FUNCTIONS); + + Map specifiedFunctions = specifiedFunctions(); + if(specifiedFunctions!=null){ + map.putAll(specifiedFunctions); + } return map; } + + /** + * -----------------------定义特定函数------------------------- + * 对于特定的数据库，如果一个函数，与公有函数定义的有所不同时，需要在这里定义 + * @return 特定函数集 + */ + protected Map specifiedFunctions(){ + return null; + } public String getFunction(String functionName){ String func =this.functionMap.get(functionName); if(Objs.isEmpty(func)){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java similarity index 96% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java index c13dc01..a2260ef 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/dialect/NacosDatabaseDialectManager.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java @@ -1,4 +1,4 @@ -package com.jn.nacos.plugin.datasource.dialect; +package com.jn.nacos.plugin.datasource; import com.alibaba.nacos.common.spi.NacosServiceLoader; import com.jn.langx.util.collection.Maps; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java similarity index 77% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java index 655a4f0..0fc151d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/dialect/DmDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.dm.dialect; +package com.jn.nacos.plugin.datasource.db.dm; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import java.util.Map; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java similarity index 62% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java index 0dbdc3f..9f7dde1 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/dialect/KingbaseDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.dialect; +package com.jn.nacos.plugin.datasource.db.kingbase; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class KingbaseDatabaseDialect extends NacosDatabaseDialect { public KingbaseDatabaseDialect() { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java similarity index 62% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java index 7877d6d..ac6291e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/dailect/MagicDataDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.dailect; +package com.jn.nacos.plugin.datasource.db.magicdata; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class MagicDataDatabaseDialect extends NacosDatabaseDialect { public MagicDataDatabaseDialect() { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java similarity index 61% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java index 25918a9..472119b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/driver/MssqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.mssql.driver; +package com.jn.nacos.plugin.datasource.db.mssql; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class MssqlDatabaseDialect extends NacosDatabaseDialect { public MssqlDatabaseDialect() { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java similarity index 62% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java index 9f8924e..1b2b5d1 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/dialect/OpenGaussDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.dialect; +package com.jn.nacos.plugin.datasource.db.opengauss; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OpenGaussDatabaseDialect extends NacosDatabaseDialect { public OpenGaussDatabaseDialect(){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java similarity index 61% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index 65ed95f..b366d14 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/dialect/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.oracle.dialect; +package com.jn.nacos.plugin.datasource.db.oracle; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect() { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java similarity index 61% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java index 72b4529..da798bd 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/dialect/OscarDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.oscar.dialect; +package com.jn.nacos.plugin.datasource.db.oscar; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OscarDatabaseDialect extends NacosDatabaseDialect { public OscarDatabaseDialect(){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java similarity index 62% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java index 3aa7b8b..c63840d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/dialect/PostgresqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java @@ -1,7 +1,7 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.dialect; +package com.jn.nacos.plugin.datasource.db.postgresql; import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class PostgresqlDatabaseDialect extends NacosDatabaseDialect { public PostgresqlDatabaseDialect(){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index d5db72c..964256e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -2,8 +2,8 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.jn.langx.util.Preconditions; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect; -import com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialectManager; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; public abstract class BaseMapper extends AbstractMapper{ private String databaseId; diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect new file mode 100644 index 0000000..0f3071c --- /dev/null +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect @@ -0,0 +1,8 @@ +com.jn.nacos.plugin.datasource.db.dm.DmDatabaseDialect +com.jn.nacos.plugin.datasource.db.kingbase.KingbaseDatabaseDialect +com.jn.nacos.plugin.datasource.db.magicdata.MagicDataDatabaseDialect +com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect +com.jn.nacos.plugin.datasource.db.opengauss.OpenGaussDatabaseDialect +com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect +com.jn.nacos.plugin.datasource.db.oscar.OscarDatabaseDialect +com.jn.nacos.plugin.datasource.db.postgresql.PostgresqlDatabaseDialect \ No newline at end of file diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect deleted file mode 100644 index aa3bbca..0000000 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.dialect.NacosDatabaseDialect +++ /dev/null @@ -1,8 +0,0 @@ -com.jn.nacos.plugin.datasource.db.dm.dialect.DmDatabaseDialect -com.jn.nacos.plugin.datasource.db.kingbase.dialect.KingbaseDatabaseDialect -com.jn.nacos.plugin.datasource.db.magicdata.dailect.MagicDataDatabaseDialect -com.jn.nacos.plugin.datasource.db.mssql.driver.MssqlDatabaseDialect -com.jn.nacos.plugin.datasource.db.opengauss.dialect.OpenGaussDatabaseDialect -com.jn.nacos.plugin.datasource.db.oracle.dialect.OracleDatabaseDialect -com.jn.nacos.plugin.datasource.db.oscar.dialect.OscarDatabaseDialect -com.jn.nacos.plugin.datasource.db.postgresql.dialect.PostgresqlDatabaseDialect \ No newline at end of file -- Gitee From dd0d25a4bd0ad11edb78ab1cd70b80c3dbb3b3d4 Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 27 Aug 2024 08:26:51 +0800 Subject: [PATCH 047/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jn/nacos/plugin/datasource/NacosDatabaseDialect.java | 7 ++++++- .../nacos/plugin/datasource/db/dm/DmDatabaseDialect.java | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index f3a6282..40ca2dd 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -62,9 +62,14 @@ public abstract class NacosDatabaseDialect { Map map = Maps.newHashMap(); map.putAll(COMMON_FUNCTIONS); + // 使用自定义的函数进行重写 Map specifiedFunctions = specifiedFunctions(); if(specifiedFunctions!=null){ - map.putAll(specifiedFunctions); + for (Map.Entry entry : specifiedFunctions.entrySet()){ + if(COMMON_FUNCTIONS.containsKey(entry.getKey())){ + map.put(entry.getKey(), entry.getValue()); + } + } } return map; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java index 0fc151d..7bafd7d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource.db.dm; +import com.google.common.collect.Maps; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; @@ -11,8 +12,8 @@ public class DmDatabaseDialect extends NacosDatabaseDialect { } @Override - protected Map initFunctionMap() { - Map map= super.initFunctionMap(); + protected Map specifiedFunctions() { + Map map= Maps.newHashMap(); map.put("NOW()", "CURRENT_TIMESTAMP(3)"); return map; } -- Gitee From de8fae6082bb3e09a87538112cc59c13c600685e Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 27 Aug 2024 08:28:08 +0800 Subject: [PATCH 048/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.alibaba.nacos.plugin.datasource.mapper.Mapper | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper b/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper index 1a3878e..defd257 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper @@ -7,6 +7,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoAggrMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoAggrMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoAggrMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoBetaMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoBetaMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoBetaMapper @@ -16,6 +17,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoBetaMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoBetaMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoBetaMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoMapper @@ -25,6 +27,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoTagMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoTagMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoTagMapper @@ -34,6 +37,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoTagMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoTagMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoTagMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigTagRelationMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigTagRelationMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigTagRelationMapper @@ -43,6 +47,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigTagRelationMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigTagRelationMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigTagRelationMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.GroupCapacityMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.GroupCapacityMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.GroupCapacityMapper @@ -52,6 +57,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.GroupCapacityMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.GroupCapacityMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.GroupCapacityMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.HistoryConfigInfoMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.HistoryConfigInfoMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.HistoryConfigInfoMapper @@ -61,6 +67,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.HistoryConfigInfoMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.HistoryConfigInfoMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.HistoryConfigInfoMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.TenantCapacityMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantCapacityMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantCapacityMapper @@ -70,6 +77,7 @@ com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantCapacityMapper com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantCapacityMapper com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantCapacityMapper + com.jn.nacos.plugin.datasource.db.dm.mapper.TenantInfoMapper com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantInfoMapper com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantInfoMapper -- Gitee From 2956af7367a98c4ba5461ef16629ca57dbdf9c1b Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 27 Aug 2024 08:47:48 +0800 Subject: [PATCH 049/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/pom.xml | 10 ++ .../plugin/datasource/DatabaseTypes.java | 6 +- .../mapper/BaseConfigInfoAggrMapper.java | 4 +- .../mapper/BaseConfigInfoBetaMapper.java | 6 +- .../mapper/BaseConfigInfoMapper.java | 97 +++++++++---------- .../mapper/BaseConfigInfoTagMapper.java | 9 +- .../mapper/BaseConfigTagRelationMapper.java | 18 ++-- .../mapper/BaseGroupCapacityMapper.java | 5 +- .../mapper/BaseHistoryConfigInfoMapper.java | 10 +- .../plugin/datasource/mapper/BaseMapper.java | 6 +- .../mapper/BaseTenantCapacityMapper.java | 4 +- 11 files changed, 92 insertions(+), 83 deletions(-) diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 58f8c74..36ba500 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -22,6 +22,16 @@ com.alibaba.nacos nacos-datasource-plugin + + + com.google.guava + guava + + + commons-codec + commons-codec + + io.github.bes2008.solution.sqlhelper diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index b36976f..902c625 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -6,9 +6,9 @@ public class DatabaseTypes extends DataSourceConstant { public static final String OPENGAUSS = "opengauss"; public static final String KINGBASE = "kingbase"; public static final String MAGICDATA = "magicdata"; - public static final String ORACLE="oracle"; + public static final String ORACLE = "oracle"; public static final String DAMENG = "dm"; - public static final String MSSQL ="sqlserver"; + public static final String MSSQL = "sqlserver"; public static final String POSTGRESQL = "postgresql"; - public static final String OSCAR ="oscar"; + public static final String OSCAR = "oscar"; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java index 2f71628..20a3eba 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java @@ -1,10 +1,10 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -24,7 +24,7 @@ public abstract class BaseConfigInfoAggrMapper extends BaseMapper implements Con RowSelection rowSelection = new RowSelection(startRow, pageSize); String sql = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? ORDER BY datum_id "; - List paramList = CollectionUtils.list(dataId, groupId, tenantId); + List paramList = Lists.newArrayList(dataId, groupId, tenantId); sql = getDialect().getLimitSql(sql, rowSelection); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java index ec44c61..f0ab962 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java @@ -3,7 +3,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; -import com.google.common.collect.Lists; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -19,10 +19,10 @@ public abstract class BaseConfigInfoBetaMapper extends BaseMapper implements Con int pageSize = context.getPageSize(); RowSelection rowSelection = new RowSelection(startRow, pageSize); - String subquery= "SELECT id FROM config_info_beta ORDER BY id "; + String subquery = "SELECT id FROM config_info_beta ORDER BY id "; subquery = getDialect().getLimitSql(subquery, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " - + " FROM ( "+subquery+" )" + " g, config_info_beta t WHERE g.id = t.id"; + + " FROM ( " + subquery + " )" + " g, config_info_beta t WHERE g.id = t.id"; List paramList = Lists.newArrayList(); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java index 6f364e7..da33342 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java @@ -1,19 +1,18 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.NamespaceUtil; -import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.ContextConstant; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.Strings; +import com.jn.langx.util.collection.Collects; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.sql.Timestamp; import java.util.ArrayList; -import java.util.Collections; import java.util.List; public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { @@ -27,26 +26,26 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ?"; - sql=getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(CollectionUtils.list(tenantId, appName), rowSelection); + sql = getDialect().getLimitSql(sql, rowSelection); + List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(tenantId, appName), rowSelection); return new MapperResult(sql, pagedParams); } @Override public MapperResult getTenantIdList(MapperContext context) { - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != '" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY tenant_id "; sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); - return new MapperResult(sql, pagedParams ); + return new MapperResult(sql, pagedParams); } @Override public MapperResult getGroupIdList(MapperContext context) { - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT group_id FROM config_info WHERE tenant_id ='" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY group_id "; sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); @@ -55,23 +54,23 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI @Override public MapperResult findAllConfigKey(MapperContext context) { - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - String sql = " SELECT data_id,group_id,app_name FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; + String sql = " SELECT data_id,group_id,app_name FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; - List queryParams = CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID)); + List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID)); List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); - return new MapperResult(sql,pagedParams); + return new MapperResult(sql, pagedParams); } @Override public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - String sql = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; - List pagedParams = getDialect().rebuildParameters(Collections.emptyList(), rowSelection); + String sql = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; + List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -80,11 +79,11 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI String contextParameter = context.getContextParameter(ContextConstant.NEED_CONTENT); boolean needContent = contextParameter != null && Boolean.parseBoolean(contextParameter); - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT id,data_id,group_id,tenant_id,app_name," + (needContent ? "content," : "") + "md5,gmt_modified,type FROM config_info WHERE id > ? " + "ORDER BY id ASC "; sql = getDialect().getLimitSql(sql, rowSelection); - List queryParams = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); return new MapperResult(sql, pagedParams); } @@ -105,21 +104,21 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI + " config_info WHERE "; String where = " 1=1 "; - if (!StringUtils.isBlank(dataId)) { + if (!Strings.isBlank(dataId)) { where += " AND data_id LIKE ? "; paramList.add(dataId); } - if (!StringUtils.isBlank(group)) { + if (!Strings.isBlank(group)) { where += " AND group_id LIKE ? "; paramList.add(group); } - if (!StringUtils.isBlank(tenant)) { + if (!Strings.isBlank(tenant)) { where += " AND tenant_id = ? "; paramList.add(tenant); } - if (!StringUtils.isBlank(appName)) { + if (!Strings.isBlank(appName)) { where += " AND app_name = ? "; paramList.add(appName); } @@ -133,7 +132,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI } String sql = sqlFetchRows + where; - RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize() ); + RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); @@ -143,10 +142,10 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; - String pagedSubquery= getDialect().getLimitSql(subquery, rowSelection); - String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id"; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(Collections.emptyList(),rowSelection); + List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -159,23 +158,23 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI List paramList = new ArrayList<>(); final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,content FROM config_info WHERE "; String where = " tenant_id='" + NamespaceUtil.getNamespaceDefaultId() + "' "; - if (!StringUtils.isBlank(dataId)) { + if (!Strings.isBlank(dataId)) { where += " AND data_id LIKE ? "; paramList.add(dataId); } - if (!StringUtils.isBlank(group)) { + if (!Strings.isBlank(group)) { where += " AND group_id LIKE ? "; paramList.add(group); } - if (!StringUtils.isBlank(tenant)) { + if (!Strings.isBlank(tenant)) { where += " AND content LIKE ? "; paramList.add(tenant); } - String sql=sqlFetchRows + where; + String sql = sqlFetchRows + where; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -193,20 +192,20 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI StringBuilder where = new StringBuilder(" WHERE "); where.append(" tenant_id=? "); paramList.add(tenantId); - if (StringUtils.isNotBlank(dataId)) { + if (Strings.isNotBlank(dataId)) { where.append(" AND data_id=? "); paramList.add(dataId); } - if (StringUtils.isNotBlank(group)) { + if (Strings.isNotBlank(group)) { where.append(" AND group_id=? "); paramList.add(group); } - if (StringUtils.isNotBlank(appName)) { + if (Strings.isNotBlank(appName)) { where.append(" AND app_name=? "); paramList.add(appName); } - if (!StringUtils.isBlank(content)) { + if (!Strings.isBlank(content)) { where.append(" AND content LIKE ? "); paramList.add(content); } @@ -215,7 +214,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -225,9 +224,9 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=?"; - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.GROUP_ID), + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -246,19 +245,19 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI StringBuilder where = new StringBuilder(" WHERE "); where.append(" tenant_id LIKE ? "); paramList.add(tenantId); - if (!StringUtils.isBlank(dataId)) { + if (!Strings.isBlank(dataId)) { where.append(" AND data_id LIKE ? "); paramList.add(dataId); } - if (!StringUtils.isBlank(group)) { + if (!Strings.isBlank(group)) { where.append(" AND group_id LIKE ? "); paramList.add(group); } - if (!StringUtils.isBlank(appName)) { + if (!Strings.isBlank(appName)) { where.append(" AND app_name = ? "); paramList.add(appName); } - if (!StringUtils.isBlank(content)) { + if (!Strings.isBlank(content)) { where.append(" AND content LIKE ? "); paramList.add(content); } @@ -266,7 +265,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = sqlFetchRows + where; sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -275,10 +274,10 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( "+pagedSubquery+" ) g, config_info t WHERE g.id = t.id "; - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), + String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), context.getPageSize()); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -287,15 +286,15 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI public MapperResult findChangeConfig(MapperContext context) { RowSelection rowSelection = new RowSelection(0, context.getPageSize()); String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " - + "gmt_modified >= ? and id > ? order by id "; + + "gmt_modified >= ? and id > ? order by id "; sql = getDialect().getLimitSql(sql, rowSelection); - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME), + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), context.getWhereParameter(FieldConstant.LAST_MAX_ID), context.getWhereParameter(FieldConstant.PAGE_SIZE)); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java index 18d5c98..3681835 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java @@ -3,9 +3,9 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Collects; import com.jn.sqlhelper.dialect.pagination.RowSelection; -import java.util.Collections; import java.util.List; public abstract class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { @@ -16,11 +16,10 @@ public abstract class BaseConfigInfoTagMapper extends BaseMapper implements Conf @Override public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String subquery= " SELECT id FROM config_info_tag ORDER BY id "; + String subquery = " SELECT id FROM config_info_tag ORDER BY id "; String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( "+pagedSubquery+" ) g, config_info_tag t WHERE g.id = t.id"; - List paramList = Collections.emptyList(); - List pagedParams = getDialect().rebuildParameters(paramList,rowSelection); + String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info_tag t WHERE g.id = t.id"; + List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java index 7695042..901116c 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java @@ -1,10 +1,10 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.Strings; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.ArrayList; @@ -33,19 +33,19 @@ public abstract class BaseConfigTagRelationMapper extends BaseMapper implements where.append(" a.tenant_id=? "); paramList.add(tenantId); - if (StringUtils.isNotBlank(dataId)) { + if (Strings.isNotBlank(dataId)) { where.append(" AND a.data_id=? "); paramList.add(dataId); } - if (StringUtils.isNotBlank(group)) { + if (Strings.isNotBlank(group)) { where.append(" AND a.group_id=? "); paramList.add(group); } - if (StringUtils.isNotBlank(appName)) { + if (Strings.isNotBlank(appName)) { where.append(" AND a.app_name=? "); paramList.add(appName); } - if (!StringUtils.isBlank(content)) { + if (Strings.isNotBlank(content)) { where.append(" AND a.content LIKE ? "); paramList.add(content); } @@ -84,19 +84,19 @@ public abstract class BaseConfigTagRelationMapper extends BaseMapper implements where.append(" a.tenant_id LIKE ? "); paramList.add(tenantId); - if (!StringUtils.isBlank(dataId)) { + if (!Strings.isBlank(dataId)) { where.append(" AND a.data_id LIKE ? "); paramList.add(dataId); } - if (!StringUtils.isBlank(group)) { + if (!Strings.isBlank(group)) { where.append(" AND a.group_id LIKE ? "); paramList.add(group); } - if (!StringUtils.isBlank(appName)) { + if (!Strings.isBlank(appName)) { where.append(" AND a.app_name = ? "); paramList.add(appName); } - if (!StringUtils.isBlank(content)) { + if (!Strings.isBlank(content)) { where.append(" AND a.content LIKE ? "); paramList.add(content); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index fd12d42..9cdbde1 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -1,13 +1,14 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.GroupCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; + @SuppressWarnings("all") public abstract class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { public BaseGroupCapacityMapper(String databaseId) { @@ -19,7 +20,7 @@ public abstract class BaseGroupCapacityMapper extends BaseMapper implements Grou RowSelection rowSelection = new RowSelection(0, context.getPageSize()); String sql = "SELECT id, group_id FROM group_capacity WHERE id > ? "; sql = getDialect().getLimitSql(sql, rowSelection); - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java index a35397b..a5bb5c2 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java @@ -1,10 +1,10 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -23,9 +23,9 @@ public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements String subquery = "SELECT id FROM his_config_info WHERE gmt_modified < ? "; String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - String sql = "DELETE FROM his_config_info WHERE id IN( "+ pagedSubquery+ ")"; + String sql = "DELETE FROM his_config_info WHERE id IN( " + pagedSubquery + ")"; - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME)); + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -40,7 +40,7 @@ public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements sql = getDialect().getLimitSql(sql, rowSelection); - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.DATA_ID), + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.DATA_ID), context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); @@ -57,7 +57,7 @@ public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements + "gmt_modified >= ? and nid > ? order by nid "; sql = getDialect().getLimitSql(sql, rowSelection); - List paramList =CollectionUtils.list(context.getWhereParameter(FieldConstant.START_TIME), + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), context.getWhereParameter(FieldConstant.LAST_MAX_ID)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 964256e..27e79c4 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -5,12 +5,12 @@ import com.jn.langx.util.Preconditions; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; -public abstract class BaseMapper extends AbstractMapper{ +public abstract class BaseMapper extends AbstractMapper { private String databaseId; protected NacosDatabaseDialect dialect; - public BaseMapper(String databaseId){ - Preconditions.checkNotEmpty(databaseId,"database id is empty"); + public BaseMapper(String databaseId) { + Preconditions.checkNotEmpty(databaseId, "database id is empty"); this.databaseId = databaseId; this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java index b4976aa..a1db865 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java @@ -1,10 +1,10 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -22,7 +22,7 @@ public abstract class BaseTenantCapacityMapper extends BaseMapper implements Ten String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>? "; sql = getDialect().getLimitSql(sql, rowSelection); - List paramList = CollectionUtils.list(context.getWhereParameter(FieldConstant.ID)); + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } -- Gitee From ddf9ee035f02fe6f880cef0f5771e55cab90ca7d Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 27 Aug 2024 08:51:36 +0800 Subject: [PATCH 050/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/pom.xml | 10 ---------- pom.xml | 27 ++++++++++++++++++++++----- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 36ba500..58f8c74 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -22,16 +22,6 @@ com.alibaba.nacos nacos-datasource-plugin - - - com.google.guava - guava - - - commons-codec - commons-codec - - io.github.bes2008.solution.sqlhelper diff --git a/pom.xml b/pom.xml index 2fd41e4..ba81298 100644 --- a/pom.xml +++ b/pom.xml @@ -62,12 +62,34 @@ nacos-datasource-plugin ${nacos.version} provided + + + + com.google.guava + guava + + + commons-codec + commons-codec + + com.alibaba.nacos nacos-common ${nacos.version} provided + + + + com.google.guava + guava + + + commons-codec + commons-codec + + commons-codec @@ -100,11 +122,6 @@ com.alibaba.nacos nacos-common - - commons-codec - commons-codec - - -- Gitee From e3b1a1de4a457f02bc44a822039b884eb2270cbd Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 09:41:09 +0800 Subject: [PATCH 051/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/BaseConfigInfoAggrMapper.java | 2 +- .../plugin/datasource/mapper/BaseConfigInfoBetaMapper.java | 2 +- .../nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java | 2 +- .../plugin/datasource/mapper/BaseConfigInfoTagMapper.java | 2 +- .../plugin/datasource/mapper/BaseConfigTagRelationMapper.java | 2 +- .../plugin/datasource/mapper/BaseGroupCapacityMapper.java | 2 +- .../plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java | 2 +- .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 4 ++-- .../plugin/datasource/mapper/BaseTenantCapacityMapper.java | 2 +- .../nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java index 20a3eba..fb3e926 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java @@ -10,7 +10,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; public abstract class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { - public BaseConfigInfoAggrMapper(String databaseId) { + protected BaseConfigInfoAggrMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java index f0ab962..af4ffd0 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; public abstract class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { - public BaseConfigInfoBetaMapper(String databaseId) { + protected BaseConfigInfoBetaMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java index da33342..e089717 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java @@ -17,7 +17,7 @@ import java.util.List; public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { - public BaseConfigInfoMapper(String databaseId) { + protected BaseConfigInfoMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java index 3681835..a7f759e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java @@ -9,7 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; public abstract class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { - public BaseConfigInfoTagMapper(String databaseId) { + protected BaseConfigInfoTagMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java index 901116c..e92361a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; public abstract class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { - public BaseConfigTagRelationMapper(String databaseId) { + protected BaseConfigTagRelationMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index 9cdbde1..08aca97 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -11,7 +11,7 @@ import java.util.List; @SuppressWarnings("all") public abstract class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { - public BaseGroupCapacityMapper(String databaseId) { + protected BaseGroupCapacityMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java index a5bb5c2..b9bb225 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java @@ -10,7 +10,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { - public BaseHistoryConfigInfoMapper(String databaseId) { + protected BaseHistoryConfigInfoMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 27e79c4..129fb34 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -6,10 +6,10 @@ import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; public abstract class BaseMapper extends AbstractMapper { - private String databaseId; + private final String databaseId; protected NacosDatabaseDialect dialect; - public BaseMapper(String databaseId) { + protected BaseMapper(String databaseId) { Preconditions.checkNotEmpty(databaseId, "database id is empty"); this.databaseId = databaseId; this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java index a1db865..f22640d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java @@ -10,7 +10,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; public abstract class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { - public BaseTenantCapacityMapper(String databaseId) { + protected BaseTenantCapacityMapper(String databaseId) { super(databaseId); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java index 0786c1b..43eb17e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java @@ -3,7 +3,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper; public abstract class BaseTenantInfoMapper extends BaseMapper implements TenantInfoMapper { - public BaseTenantInfoMapper(String databaseId) { + protected BaseTenantInfoMapper(String databaseId) { super(databaseId); } } -- Gitee From 886610602b878eea3db7171b5ff9ed3de3587ad5 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 09:42:36 +0800 Subject: [PATCH 052/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java index 7bafd7d..c786696 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource.db.dm; -import com.google.common.collect.Maps; +import com.jn.langx.util.collection.Maps; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; -- Gitee From e61c5b4e79b6f8569e3787a526f12294255606df Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 10:24:39 +0800 Subject: [PATCH 053/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jn/nacos/plugin/datasource/NacosDatabaseDialect.java | 4 ++-- .../nacos/plugin/datasource/db/dm/DmDatabaseDialect.java | 8 -------- .../db/postgresql/PostgresqlDatabaseDialect.java | 4 ++++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 40ca2dd..5998224 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -18,7 +18,7 @@ public abstract class NacosDatabaseDialect { private String name; private Dialect delegate; private Map functionMap; - public NacosDatabaseDialect(String name){ + protected NacosDatabaseDialect(String name){ Preconditions.checkNotEmpty(name, "invalid dialect in class {}", Reflects.getFQNClassName(this.getClass())); this.name = name; String sqlhelperDialect = getCustomizedDialect(this.name); @@ -53,7 +53,7 @@ public abstract class NacosDatabaseDialect { private static Map defineCommonFunctionMap(){ Map map = Maps.newHashMap(); // 需要获取到毫秒 - map.put("NOW()", "CURRENT_TIMESTAMP"); + map.put("NOW()", "CURRENT_TIMESTAMP(3)"); return map; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java index c786696..b30e8d3 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java @@ -1,20 +1,12 @@ package com.jn.nacos.plugin.datasource.db.dm; -import com.jn.langx.util.collection.Maps; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; -import java.util.Map; public class DmDatabaseDialect extends NacosDatabaseDialect { public DmDatabaseDialect() { super(DatabaseTypes.DAMENG); } - @Override - protected Map specifiedFunctions() { - Map map= Maps.newHashMap(); - map.put("NOW()", "CURRENT_TIMESTAMP(3)"); - return map; - } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java index c63840d..798f995 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java @@ -1,10 +1,14 @@ package com.jn.nacos.plugin.datasource.db.postgresql; +import com.jn.langx.util.collection.Maps; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; +import java.util.Map; + public class PostgresqlDatabaseDialect extends NacosDatabaseDialect { public PostgresqlDatabaseDialect(){ super(DatabaseTypes.POSTGRESQL); } + } -- Gitee From db7c761c22469173a6ef1a434386b6f35759d231 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 10:24:59 +0800 Subject: [PATCH 054/159] =?UTF-8?q?+=20=E6=8F=90=E4=BE=9B=E5=8F=82?= =?UTF-8?q?=E8=80=83=E6=89=8B=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .wiki/dev.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .wiki/dev.md diff --git a/.wiki/dev.md b/.wiki/dev.md new file mode 100644 index 0000000..c7fff9f --- /dev/null +++ b/.wiki/dev.md @@ -0,0 +1,9 @@ +[达梦 SQL 参考手册](https://eco.dameng.com/document/dm/zh-cn/pm/index.html) +[Kingbase SQL 参考手册](https://help.kingbase.com.cn/v8/development/sql-plsql/sql/index.html) +[MagicData SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) +[SqlServer SQL 参考手册](https://learn.microsoft.com/zh-cn/sql/t-sql/language-reference?view=sql-server-ver16) +[OpenGauss SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) +[Oracle SQL 参考手册](https://docs.oracle.com/en/database/oracle/oracle-database/23/sqlrf/index.html) +OSCAR SQL: 目前还没有 +[PostgreSQL SQL 参考手册](https://www.postgresql.org/docs/15/index.html) + -- Gitee From f169f9e46f872ce3af46e5def41a422b582cb942 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 10:52:13 +0800 Subject: [PATCH 055/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0wiki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .wiki/dev.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.wiki/dev.md b/.wiki/dev.md index c7fff9f..99f2154 100644 --- a/.wiki/dev.md +++ b/.wiki/dev.md @@ -1,9 +1,10 @@ -[达梦 SQL 参考手册](https://eco.dameng.com/document/dm/zh-cn/pm/index.html) -[Kingbase SQL 参考手册](https://help.kingbase.com.cn/v8/development/sql-plsql/sql/index.html) -[MagicData SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) -[SqlServer SQL 参考手册](https://learn.microsoft.com/zh-cn/sql/t-sql/language-reference?view=sql-server-ver16) -[OpenGauss SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) -[Oracle SQL 参考手册](https://docs.oracle.com/en/database/oracle/oracle-database/23/sqlrf/index.html) -OSCAR SQL: 目前还没有 -[PostgreSQL SQL 参考手册](https://www.postgresql.org/docs/15/index.html) +## SQL 参考手册 ++ [达梦 SQL 参考手册](https://eco.dameng.com/document/dm/zh-cn/pm/index.html) ++ [Kingbase SQL 参考手册](https://help.kingbase.com.cn/v8/development/sql-plsql/sql/index.html) ++ [MagicData SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) ++ [SqlServer SQL 参考手册](https://learn.microsoft.com/zh-cn/sql/t-sql/language-reference?view=sql-server-ver16) ++ [OpenGauss SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) ++ [Oracle SQL 参考手册](https://docs.oracle.com/en/database/oracle/oracle-database/23/sqlrf/index.html) ++ OSCAR SQL: 目前还没有 ++ [PostgreSQL SQL 参考手册](https://www.postgresql.org/docs/15/index.html) -- Gitee From 4bba0be53173c0d0879161f35b92381c0d644ed3 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 11:12:25 +0800 Subject: [PATCH 056/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=87=20DM=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/dm/create-schema.sql | 1 + .../resources/sql/dm/create-tables.sql | 464 ++++++++++++++++++ 2 files changed, 465 insertions(+) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql index e69de29..69f1465 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql @@ -0,0 +1 @@ +DROP schema if EXISTS nacos CASCADE; \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql index e69de29..f68e499 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql @@ -0,0 +1,464 @@ +SET SCHEMA nacos; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" BIGINT NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" text , + "encrypted_data_key" text +) +; + +COMMENT ON COLUMN "config_info"."id" IS 'id'; +COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info"."content" IS 'content'; +COMMENT ON COLUMN "config_info"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info"."effect" IS '配置生效描述'; +COMMENT ON COLUMN "config_info"."type" IS '配置的类型'; +COMMENT ON COLUMN "config_info"."c_schema" IS '配置的模式'; +COMMENT ON COLUMN "config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info" IS 'config_info'; + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" BIGINT NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" text NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +) +; +COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; +COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_aggr"."datum_id" IS 'datum_id'; +COMMENT ON COLUMN "config_info_aggr"."content" IS '内容'; +COMMENT ON COLUMN "config_info_aggr"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_aggr"."tenant_id" IS '租户字段'; +COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" BIGINT NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "config_info_beta"."id" IS 'id'; +COMMENT ON COLUMN "config_info_beta"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_beta"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_beta"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_beta"."content" IS 'content'; +COMMENT ON COLUMN "config_info_beta"."beta_ips" IS 'betaIps'; +COMMENT ON COLUMN "config_info_beta"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_beta"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_beta"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_beta"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_beta"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info_beta"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info_beta"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" BIGINT NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) +) +; +COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; +COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_tag"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "config_info_tag"."tag_id" IS 'tag_id'; +COMMENT ON COLUMN "config_info_tag"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_tag"."content" IS 'content'; +COMMENT ON COLUMN "config_info_tag"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_tag"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_tag"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_tag"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_tag"."src_ip" IS 'source ip'; +COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" BIGINT NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" BIGINT NOT NULL +) +; +COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; +COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; +COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; +COMMENT ON COLUMN "config_tags_relation"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_tags_relation"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_tags_relation"."tenant_id" IS 'tenant_id'; +COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" BIGINT NOT NULL, + "group_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "group_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_count" IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "group_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "group_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" int8 NOT NULL, + "nid" BIGINT NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +) +; +COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "his_config_info" IS '多租户改造'; + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" USING btree ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" BIGINT NOT NULL, + "tenant_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +) +; +COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; +COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "tenant_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_count" IS '聚合子配置最大个数'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "tenant_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" BIGINT NOT NULL, + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" int8 NOT NULL, + "gmt_modified" int8 NOT NULL +) +; +COMMENT ON COLUMN "tenant_info"."id" IS 'id'; +COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; +COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "tenant_info"."tenant_name" IS 'tenant_name'; +COMMENT ON COLUMN "tenant_info"."tenant_desc" IS 'tenant_desc'; +COMMENT ON COLUMN "tenant_info"."create_source" IS 'create_source'; +COMMENT ON COLUMN "tenant_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_info"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_info" IS 'tenant_info'; + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( + "kp", + "tenant_id" + ); + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" boolean NOT NULL +) +; + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( + "username", + "role" + ); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +) +; + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + + +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); + + +COMMIT; \ No newline at end of file -- Gitee From 4f72d9c818cebf45848902d1f77747d840da22fa Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 11:20:40 +0800 Subject: [PATCH 057/159] =?UTF-8?q?*=20=E9=80=82=E9=85=8D=E4=B8=BA=20DM?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/dm/create-tables.sql | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql index f68e499..cf80669 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql @@ -232,12 +232,12 @@ DROP TABLE IF EXISTS "group_capacity"; CREATE TABLE "group_capacity" ( "id" BIGINT NOT NULL, "group_id" varchar(128) NOT NULL, - "quota" int4 NOT NULL, - "usage" int4 NOT NULL, - "max_size" int4 NOT NULL, - "max_aggr_count" int4 NOT NULL, - "max_aggr_size" int4 NOT NULL, - "max_history_count" int4 NOT NULL, + "quota" INT NOT NULL, + "usage" INT NOT NULL, + "max_size" INT NOT NULL, + "max_aggr_count" INT NOT NULL, + "max_aggr_size" INT NOT NULL, + "max_history_count" INT NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL ) @@ -275,7 +275,7 @@ ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY (" -- ---------------------------- DROP TABLE IF EXISTS "his_config_info"; CREATE TABLE "his_config_info" ( - "id" int8 NOT NULL, + "id" BIGINT NOT NULL, "nid" BIGINT NOT NULL, "data_id" varchar(255) NOT NULL, "group_id" varchar(128) NOT NULL, @@ -323,12 +323,12 @@ DROP TABLE IF EXISTS "tenant_capacity"; CREATE TABLE "tenant_capacity" ( "id" BIGINT NOT NULL, "tenant_id" varchar(128) NOT NULL, - "quota" int4 NOT NULL, - "usage" int4 NOT NULL, - "max_size" int4 NOT NULL, - "max_aggr_count" int4 NOT NULL, - "max_aggr_size" int4 NOT NULL, - "max_history_count" int4 NOT NULL, + "quota" INT NOT NULL, + "usage" INT NOT NULL, + "max_size" INT NOT NULL, + "max_aggr_count" INT NOT NULL, + "max_aggr_size" INT NOT NULL, + "max_history_count" INT NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL ) @@ -371,8 +371,8 @@ CREATE TABLE "tenant_info" ( "tenant_name" varchar(128) , "tenant_desc" varchar(256) , "create_source" varchar(32) , - "gmt_create" int8 NOT NULL, - "gmt_modified" int8 NOT NULL + "gmt_create" BIGINT NOT NULL, + "gmt_modified" BIGINT NOT NULL ) ; COMMENT ON COLUMN "tenant_info"."id" IS 'id'; -- Gitee From 20a835fe09492f9d47e612a35e235f0cd66c486d Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 16:46:21 +0800 Subject: [PATCH 058/159] =?UTF-8?q?*=20=E9=80=82=E9=85=8D=E4=B8=BA=20DM?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/dm/create-schema.sql | 4 +- .../resources/sql/dm/create-tables.sql | 67 ++++++++----------- nacosplugin-datasource/installation.MD | 18 +++++ 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql index 69f1465..68b91a6 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql @@ -1 +1,3 @@ -DROP schema if EXISTS nacos CASCADE; \ No newline at end of file +DROP SCHEMA if EXISTS nacos CASCADE; +CREATE SCHEMA nacos; +/ \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql index cf80669..6d115d2 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql @@ -1,5 +1,4 @@ -SET SCHEMA nacos; - +ALTER SESSION SET CURRENT_SCHEMA=nacos; -- ---------------------------- -- Table structure for config_info @@ -23,8 +22,7 @@ CREATE TABLE "config_info" ( "type" varchar(64) , "c_schema" text , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "config_info"."id" IS 'id'; COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; @@ -67,8 +65,8 @@ CREATE TABLE "config_info_aggr" ( "gmt_modified" timestamp(3) without time zone NOT NULL, "app_name" varchar(128) , "tenant_id" varchar(128) -) -; +); + COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; @@ -82,7 +80,7 @@ COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; -- ---------------------------- -- Indexes structure for table config_info_aggr -- ---------------------------- -CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); +CREATE UNIQUE INDEX IF NOT EXISTS "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" ("data_id","group_id","tenant_id","datum_id"); -- ---------------------------- -- Primary Key structure for table config_info_aggr @@ -129,7 +127,7 @@ COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; -- ---------------------------- -- Indexes structure for table config_info_beta -- ---------------------------- -CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); +CREATE UNIQUE INDEX IF NOT EXISTS "uk_configinfobeta_datagrouptenant" ON "config_info_beta" ("data_id","group_id","tenant_id"); -- ---------------------------- -- Primary Key structure for table config_info_beta @@ -154,8 +152,7 @@ CREATE TABLE "config_info_tag" ( "gmt_modified" timestamp(3) without time zone NOT NULL, "src_user" text , "src_ip" varchar(20) -) -; +); COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; @@ -174,7 +171,7 @@ COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; -- ---------------------------- -- Indexes structure for table config_info_tag -- ---------------------------- -CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); +CREATE UNIQUE INDEX IF NOT EXISTS "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" ("data_id","group_id","tenant_id","tag_id"); -- ---------------------------- -- Primary Key structure for table config_info_tag @@ -193,8 +190,8 @@ CREATE TABLE "config_tags_relation" ( "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , "nid" BIGINT NOT NULL -) -; +); + COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; @@ -208,10 +205,10 @@ COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; -- ---------------------------- -- Indexes structure for table config_tags_relation -- ---------------------------- -CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( +CREATE INDEX IF NOT EXISTS "idx_tenant_id" ON "config_tags_relation" ( "tenant_id" ); -CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_configtagrelation_configidtag" ON "config_tags_relation" ( "id", "tag_name", "tag_type" @@ -240,8 +237,7 @@ CREATE TABLE "group_capacity" ( "max_history_count" INT NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL -) -; +); COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; @@ -259,7 +255,7 @@ COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; -- ---------------------------- -- Indexes structure for table group_capacity -- ---------------------------- -CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_group_id" ON "group_capacity" ( "group_id" ); @@ -289,8 +285,7 @@ CREATE TABLE "his_config_info" ( "op_type" char(10) , "tenant_id" varchar(128) , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; @@ -300,13 +295,13 @@ COMMENT ON TABLE "his_config_info" IS '多租户改造'; -- ---------------------------- -- Indexes structure for table his_config_info -- ---------------------------- -CREATE INDEX "idx_did" ON "his_config_info" USING btree ( +CREATE INDEX IF NOT EXISTS "idx_did" ON "his_config_info" ( "data_id" ); -CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( +CREATE INDEX IF NOT EXISTS "idx_gmt_create" ON "his_config_info" ( "gmt_create" ); -CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( +CREATE INDEX IF NOT EXISTS "idx_gmt_modified" ON "his_config_info" ( "gmt_modified" ); @@ -349,7 +344,7 @@ COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; -- ---------------------------- -- Indexes structure for table tenant_capacity -- ---------------------------- -CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_tenant_id" ON "tenant_capacity" ( "tenant_id" ); @@ -373,8 +368,7 @@ CREATE TABLE "tenant_info" ( "create_source" varchar(32) , "gmt_create" BIGINT NOT NULL, "gmt_modified" BIGINT NOT NULL -) -; +); COMMENT ON COLUMN "tenant_info"."id" IS 'id'; COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; @@ -388,7 +382,7 @@ COMMENT ON TABLE "tenant_info" IS 'tenant_info'; -- ---------------------------- -- Indexes structure for table tenant_info -- ---------------------------- -CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_tenant_info_kptenantid" ON "tenant_info" ( "kp", "tenant_id" ); @@ -402,9 +396,8 @@ DROP TABLE IF EXISTS "users"; CREATE TABLE "users" ( "username" varchar(50) NOT NULL, "password" varchar(500) NOT NULL, - "enabled" boolean NOT NULL -) -; + "enabled" BIT NOT NULL +); -- ---------------------------- @@ -414,14 +407,13 @@ DROP TABLE IF EXISTS "roles"; CREATE TABLE "roles" ( "username" varchar(50) NOT NULL, "role" varchar(50) NOT NULL -) -; +); -- ---------------------------- -- Indexes structure for table roles -- ---------------------------- -CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_username_role" ON "roles" ( "username", "role" ); @@ -434,14 +426,13 @@ CREATE TABLE "permissions" ( "role" varchar(50) NOT NULL, "resource" varchar(512) NOT NULL, "action" varchar(8) NOT NULL -) -; +); -- ---------------------------- -- Indexes structure for table permissions -- ---------------------------- -CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( +CREATE UNIQUE INDEX IF NOT EXISTS "uk_role_permission" ON "permissions" ( "role", "resource", "action" @@ -451,7 +442,7 @@ CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); -- ---------------------------- @@ -460,5 +451,3 @@ INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2ku INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); - -COMMIT; \ No newline at end of file diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index d3cb234..31e6e8c 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -32,3 +32,21 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到 PostgreSQL SCRAM 认证相关问题 3. 驱动[下载地址](https://mvnrepository.com/artifact/org.postgresql/postgresql) +## DM 测试时，注意事项 +1. jdbc驱动选择： +```markdown ++ 在JDK8上运行时，选择：com.dameng:DmJdbcDriver18:8.1.3.140 ++ 在JDK7上运行时，选择：com.dameng:DmJdbcDriver17:8.1.3.140 ++ 在JDK6上运行时，选择：com.dameng:DmJdbcDriver16:8.1.3.140 +``` +2. SQL脚本的执行 +使用 DBeaver 连接到达梦数据库上时，一次只能执行一条SQL语句。 + +想要执行SQL脚本文件，需要提供的命令行工具：dmdbms/disql + +```shell +./disql SYSDBA/dameng777@localhost:5236 \`./nacos-schema.sql +``` + +3. + -- Gitee From 767ba15b8704ea9105631423bc2d010238db9b17 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 16:47:45 +0800 Subject: [PATCH 059/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0SQL=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 31e6e8c..389a169 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -40,13 +40,13 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 + 在JDK6上运行时，选择：com.dameng:DmJdbcDriver16:8.1.3.140 ``` 2. SQL脚本的执行 + 使用 DBeaver 连接到达梦数据库上时，一次只能执行一条SQL语句。 -想要执行SQL脚本文件，需要提供的命令行工具：dmdbms/disql +想要执行SQL脚本文件，需要提供的命令行工具：${dmdbms}/disql ```shell ./disql SYSDBA/dameng777@localhost:5236 \`./nacos-schema.sql ``` -3. -- Gitee From 45183b847a0bd0c4e218cc74c0312026ba958f0e Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 17:48:05 +0800 Subject: [PATCH 060/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/kingbase/create-tables.sql | 2 +- .../resources/sql/magicdata/create-tables.sql | 2 +- .../resources/sql/postgresql/create-tables.sql | 2 +- nacosplugin-datasource/installation.MD | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql index af313bf..cb5c934 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql @@ -186,7 +186,7 @@ ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY -- ---------------------------- DROP TABLE IF EXISTS "config_tags_relation"; CREATE TABLE "config_tags_relation" ( - "id" bigserial NOT NULL, + "id" bigint NOT NULL, "tag_name" varchar(128) NOT NULL, "tag_type" varchar(64) , "data_id" varchar(255) NOT NULL, diff --git a/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql index bea5d52..19f2b91 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql @@ -202,7 +202,7 @@ COMMIT; -- ---------------------------- DROP TABLE IF EXISTS "config_tags_relation"; CREATE TABLE "config_tags_relation" ( - "id" bigserial NOT NULL, + "id" bigint NOT NULL, "tag_name" varchar(128) NOT NULL, "tag_type" varchar(64) , "data_id" varchar(255) NOT NULL, diff --git a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql index af313bf..cb5c934 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql @@ -186,7 +186,7 @@ ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY -- ---------------------------- DROP TABLE IF EXISTS "config_tags_relation"; CREATE TABLE "config_tags_relation" ( - "id" bigserial NOT NULL, + "id" bigint NOT NULL, "tag_name" varchar(128) NOT NULL, "tag_type" varchar(64) , "data_id" varchar(255) NOT NULL, diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 389a169..32cdadb 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -46,7 +46,8 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 想要执行SQL脚本文件，需要提供的命令行工具：${dmdbms}/disql ```shell -./disql SYSDBA/dameng777@localhost:5236 \`./nacos-schema.sql +./disql SYSDBA/dameng777@localhost:5236 \`./create-schema.sql +./disql SYSDBA/dameng777@localhost:5236 \`./create-tables.sql ``` -- Gitee From 7e0fdaf98c201060e3bbf76d14b32da732259f38 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 18:00:21 +0800 Subject: [PATCH 061/159] =?UTF-8?q?*=20=E4=BF=AE=E6=94=B9=20=E8=BE=BE?= =?UTF-8?q?=E6=A2=A6=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/dm/create-tables.sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql index 6d115d2..542ba1a 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql @@ -5,7 +5,7 @@ ALTER SESSION SET CURRENT_SCHEMA=nacos; -- ---------------------------- DROP TABLE IF EXISTS "config_info"; CREATE TABLE "config_info" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "data_id" varchar(255) NOT NULL, "group_id" varchar(255) , "content" text NOT NULL, @@ -57,7 +57,7 @@ ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); -- ---------------------------- DROP TABLE IF EXISTS "config_info_aggr"; CREATE TABLE "config_info_aggr" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "data_id" varchar(255) NOT NULL, "group_id" varchar(255) NOT NULL, "datum_id" varchar(255) NOT NULL, @@ -94,7 +94,7 @@ ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KE -- ---------------------------- DROP TABLE IF EXISTS "config_info_beta"; CREATE TABLE "config_info_beta" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "data_id" varchar(255) NOT NULL, "group_id" varchar(128) NOT NULL, "app_name" varchar(128) , @@ -140,7 +140,7 @@ ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KE -- ---------------------------- DROP TABLE IF EXISTS "config_info_tag"; CREATE TABLE "config_info_tag" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "data_id" varchar(255) NOT NULL, "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , @@ -189,7 +189,7 @@ CREATE TABLE "config_tags_relation" ( "data_id" varchar(255) NOT NULL, "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , - "nid" BIGINT NOT NULL + "nid" BIGINT NOT NULL IDENTITY(1,1) ); COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; @@ -227,7 +227,7 @@ ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PR -- ---------------------------- DROP TABLE IF EXISTS "group_capacity"; CREATE TABLE "group_capacity" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "group_id" varchar(128) NOT NULL, "quota" INT NOT NULL, "usage" INT NOT NULL, @@ -272,7 +272,7 @@ ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY (" DROP TABLE IF EXISTS "his_config_info"; CREATE TABLE "his_config_info" ( "id" BIGINT NOT NULL, - "nid" BIGINT NOT NULL, + "nid" BIGINT NOT NULL IDENTITY(1,1), "data_id" varchar(255) NOT NULL, "group_id" varchar(128) NOT NULL, "app_name" varchar(128) , @@ -316,7 +316,7 @@ ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY -- ---------------------------- DROP TABLE IF EXISTS "tenant_capacity"; CREATE TABLE "tenant_capacity" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "tenant_id" varchar(128) NOT NULL, "quota" INT NOT NULL, "usage" INT NOT NULL, @@ -360,7 +360,7 @@ ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY -- ---------------------------- DROP TABLE IF EXISTS "tenant_info"; CREATE TABLE "tenant_info" ( - "id" BIGINT NOT NULL, + "id" BIGINT NOT NULL IDENTITY(1,1), "kp" varchar(128) NOT NULL, "tenant_id" varchar(128) , "tenant_name" varchar(128) , -- Gitee From 74d310da13262b0423f602d555eaf9d80d9a78c6 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 18:00:39 +0800 Subject: [PATCH 062/159] =?UTF-8?q?*=20=E5=AE=8C=E5=96=84=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 32cdadb..def6eeb 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -31,6 +31,16 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 1. postgresql 相关依赖要放全，且要与服务端兼容，建议 >= 42.2.0 版本。 2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到 PostgreSQL SCRAM 认证相关问题 3. 驱动[下载地址](https://mvnrepository.com/artifact/org.postgresql/postgresql) +4. JDBC 配置 +```properties +# PostgreSQL +spring.sql.init.platform=postgresql +db.num=1 +db.url.0=jdbc:postgresql://192.168.188.131:5432/db1?currentSchema=nacos +db.user.0=postgresql +db.password.0=postgresql +db.pool.config.driverClassName=org.postgresql.Driver +``` ## DM 测试时，注意事项 1. jdbc驱动选择： @@ -49,5 +59,16 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 ./disql SYSDBA/dameng777@localhost:5236 \`./create-schema.sql ./disql SYSDBA/dameng777@localhost:5236 \`./create-tables.sql ``` +3. JDBC 配置 +```properties +# DM +spring.sql.init.platform=dm +db.num=1 +db.url.0=jdbc:dm://192.168.137.133:5236?schema=nacos +db.user.0=SYSDBA +db.password.0=dameng777 +db.pool.config.driverClassName=dm.jdbc.driver.DmDriver + +``` -- Gitee From 44d883aa0d37457aedc8d856d992548b81c86742 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 27 Aug 2024 18:20:20 +0800 Subject: [PATCH 063/159] =?UTF-8?q?*=20=E5=AE=8C=E5=96=84=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/kingbase/create-tables.sql | 33 +- .../resources/sql/magicdata/create-tables.sql | 96 +--- .../resources/sql/opengauss/create-schema.sql | 2 + .../resources/sql/opengauss/create-tables.sql | 456 ++++++++++++++++++ .../sql/postgresql/create-tables.sql | 24 +- 5 files changed, 492 insertions(+), 119 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql index cb5c934..0c91adf 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/kingbase/create-tables.sql @@ -23,8 +23,7 @@ CREATE TABLE "config_info" ( "type" varchar(64) , "c_schema" text , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "config_info"."id" IS 'id'; COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; @@ -67,8 +66,7 @@ CREATE TABLE "config_info_aggr" ( "gmt_modified" timestamp(3) without time zone NOT NULL, "app_name" varchar(128) , "tenant_id" varchar(128) -) -; +); COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; @@ -154,8 +152,7 @@ CREATE TABLE "config_info_tag" ( "gmt_modified" timestamp(3) without time zone NOT NULL, "src_user" text , "src_ip" varchar(20) -) -; +); COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; @@ -193,8 +190,7 @@ CREATE TABLE "config_tags_relation" ( "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , "nid" bigserial NOT NULL -) -; +); COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; @@ -240,8 +236,7 @@ CREATE TABLE "group_capacity" ( "max_history_count" int4 NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL -) -; +); COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; @@ -289,8 +284,7 @@ CREATE TABLE "his_config_info" ( "op_type" char(10) , "tenant_id" varchar(128) , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; @@ -331,8 +325,7 @@ CREATE TABLE "tenant_capacity" ( "max_history_count" int4 NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL -) -; +); COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; @@ -373,8 +366,7 @@ CREATE TABLE "tenant_info" ( "create_source" varchar(32) , "gmt_create" int8 NOT NULL, "gmt_modified" int8 NOT NULL -) -; +); COMMENT ON COLUMN "tenant_info"."id" IS 'id'; COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; @@ -403,8 +395,7 @@ CREATE TABLE "users" ( "username" varchar(50) NOT NULL, "password" varchar(500) NOT NULL, "enabled" boolean NOT NULL -) -; +); -- ---------------------------- @@ -414,8 +405,7 @@ DROP TABLE IF EXISTS "roles"; CREATE TABLE "roles" ( "username" varchar(50) NOT NULL, "role" varchar(50) NOT NULL -) -; +); -- ---------------------------- @@ -434,8 +424,7 @@ CREATE TABLE "permissions" ( "role" varchar(50) NOT NULL, "resource" varchar(512) NOT NULL, "action" varchar(8) NOT NULL -) -; +); -- ---------------------------- diff --git a/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql index 19f2b91..1c3e1f8 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/magicdata/create-tables.sql @@ -23,8 +23,7 @@ CREATE TABLE "config_info" ( "type" varchar(64) , "c_schema" text , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "config_info"."id" IS 'id'; COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; @@ -67,8 +66,7 @@ CREATE TABLE "config_info_aggr" ( "gmt_modified" timestamp(6) NOT NULL, "app_name" varchar(128) , "tenant_id" varchar(128) -) -; +); COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; @@ -89,11 +87,6 @@ CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_agg -- ---------------------------- ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); --- ---------------------------- --- Records of config_info_aggr --- ---------------------------- -BEGIN; -COMMIT; -- ---------------------------- -- Table structure for config_info_beta @@ -141,11 +134,7 @@ CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" US ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); --- ---------------------------- --- Records of config_info_beta --- ---------------------------- -BEGIN; -COMMIT; + -- ---------------------------- -- Table structure for config_info_tag @@ -164,8 +153,7 @@ CREATE TABLE "config_info_tag" ( "gmt_modified" timestamp(6) NOT NULL, "src_user" text , "src_ip" varchar(20) -) -; +); COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; @@ -191,11 +179,6 @@ CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" U -- ---------------------------- ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); --- ---------------------------- --- Records of config_info_tag --- ---------------------------- -BEGIN; -COMMIT; -- ---------------------------- -- Table structure for config_tags_relation @@ -209,8 +192,7 @@ CREATE TABLE "config_tags_relation" ( "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , "nid" bigserial NOT NULL -) -; +); COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; @@ -238,14 +220,6 @@ CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" -- ---------------------------- ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); - - --- ---------------------------- --- Records of config_tags_relation --- ---------------------------- -BEGIN; -COMMIT; - -- ---------------------------- -- Table structure for group_capacity -- ---------------------------- @@ -290,11 +264,6 @@ CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); --- ---------------------------- --- Records of group_capacity --- ---------------------------- -BEGIN; -COMMIT; -- ---------------------------- -- Table structure for his_config_info @@ -315,8 +284,7 @@ CREATE TABLE "his_config_info" ( "op_type" char(10) , "tenant_id" varchar(128) , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; @@ -357,8 +325,7 @@ CREATE TABLE "tenant_capacity" ( "max_history_count" int4 NOT NULL, "gmt_create" timestamp(6) NOT NULL, "gmt_modified" timestamp(6) NOT NULL -) -; +); COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; @@ -386,12 +353,6 @@ ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY --- ---------------------------- --- Records of tenant_capacity --- ---------------------------- -BEGIN; -COMMIT; - -- ---------------------------- -- Table structure for tenant_info -- ---------------------------- @@ -405,8 +366,7 @@ CREATE TABLE "tenant_info" ( "create_source" varchar(32) , "gmt_create" int8 NOT NULL, "gmt_modified" int8 NOT NULL -) -; +); COMMENT ON COLUMN "tenant_info"."id" IS 'id'; COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; @@ -425,13 +385,6 @@ CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( "tenant_id" ); --- ---------------------------- --- Records of tenant_info --- ---------------------------- -BEGIN; -COMMIT; - - -- ---------------------------- -- Table structure for users @@ -441,15 +394,7 @@ CREATE TABLE "users" ( "username" varchar(50) NOT NULL, "password" varchar(500) NOT NULL, "enabled" boolean NOT NULL -) -; - --- ---------------------------- --- Records of users --- ---------------------------- -BEGIN; -INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); -COMMIT; +); -- ---------------------------- @@ -459,8 +404,7 @@ DROP TABLE IF EXISTS "roles"; CREATE TABLE "roles" ( "username" varchar(50) NOT NULL, "role" varchar(50) NOT NULL -) -; +); -- ---------------------------- @@ -471,12 +415,7 @@ CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( "role" ); --- ---------------------------- --- Records of roles --- ---------------------------- -BEGIN; -INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); -COMMIT; + @@ -488,8 +427,7 @@ CREATE TABLE "permissions" ( "role" varchar(50) NOT NULL, "resource" varchar(512) NOT NULL, "action" varchar(8) NOT NULL -) -; +); -- ---------------------------- @@ -502,14 +440,10 @@ CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( ); --- ---------------------------- --- Records of permissions --- ---------------------------- -BEGIN; -COMMIT; - - +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); +COMMIT; diff --git a/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql index e69de29..15640f5 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-schema.sql @@ -0,0 +1,2 @@ +DROP schema if EXISTS nacos CASCADE; +CREATE SCHEMA nacos; \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql index e69de29..9b439cc 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/opengauss/create-tables.sql @@ -0,0 +1,456 @@ +SET search_path TO nacos; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" text , + "encrypted_data_key" text +) +; + +COMMENT ON COLUMN "config_info"."id" IS 'id'; +COMMENT ON COLUMN "config_info"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info"."content" IS 'content'; +COMMENT ON COLUMN "config_info"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info"."effect" IS '配置生效描述'; +COMMENT ON COLUMN "config_info"."type" IS '配置的类型'; +COMMENT ON COLUMN "config_info"."c_schema" IS '配置的模式'; +COMMENT ON COLUMN "config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info" IS 'config_info'; + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" text NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +) +; +COMMENT ON COLUMN "config_info_aggr"."id" IS 'id'; +COMMENT ON COLUMN "config_info_aggr"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_aggr"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_aggr"."datum_id" IS 'datum_id'; +COMMENT ON COLUMN "config_info_aggr"."content" IS '内容'; +COMMENT ON COLUMN "config_info_aggr"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_aggr"."tenant_id" IS '租户字段'; +COMMENT ON TABLE "config_info_aggr" IS '增加租户字段'; + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" USING btree ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "config_info_beta"."id" IS 'id'; +COMMENT ON COLUMN "config_info_beta"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_beta"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_beta"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_beta"."content" IS 'content'; +COMMENT ON COLUMN "config_info_beta"."beta_ips" IS 'betaIps'; +COMMENT ON COLUMN "config_info_beta"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_beta"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_beta"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_beta"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_beta"."src_ip" IS 'source ip'; +COMMENT ON COLUMN "config_info_beta"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "config_info_beta"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "config_info_beta" IS 'config_info_beta'; + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" USING btree ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) +) +; +COMMENT ON COLUMN "config_info_tag"."id" IS 'id'; +COMMENT ON COLUMN "config_info_tag"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_info_tag"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_info_tag"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "config_info_tag"."tag_id" IS 'tag_id'; +COMMENT ON COLUMN "config_info_tag"."app_name" IS 'app_name'; +COMMENT ON COLUMN "config_info_tag"."content" IS 'content'; +COMMENT ON COLUMN "config_info_tag"."md5" IS 'md5'; +COMMENT ON COLUMN "config_info_tag"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "config_info_tag"."gmt_modified" IS '修改时间'; +COMMENT ON COLUMN "config_info_tag"."src_user" IS 'source user'; +COMMENT ON COLUMN "config_info_tag"."src_ip" IS 'source ip'; +COMMENT ON TABLE "config_info_tag" IS 'config_info_tag'; + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" USING btree ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" bigint NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" bigserial NOT NULL +); +COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; +COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; +COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; +COMMENT ON COLUMN "config_tags_relation"."data_id" IS 'data_id'; +COMMENT ON COLUMN "config_tags_relation"."group_id" IS 'group_id'; +COMMENT ON COLUMN "config_tags_relation"."tenant_id" IS 'tenant_id'; +COMMENT ON TABLE "config_tags_relation" IS 'config_tag_relation'; + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" USING btree ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" USING btree ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" bigserial NOT NULL, + "group_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +); +COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "group_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_count" IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "group_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "group_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "group_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "group_capacity" IS '集群、各Group容量信息表'; + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" USING btree ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" int8 NOT NULL, + "nid" bigserial NOT NULL, + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" text NOT NULL, + "md5" varchar(32) , + "gmt_create" timestamp(3) without time zone NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" timestamp(3) without time zone NOT NULL, + "src_user" text , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" text +); +COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; +COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; +COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; +COMMENT ON TABLE "his_config_info" IS '多租户改造'; + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" USING btree ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" USING btree ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" USING btree ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" bigserial NOT NULL, + "tenant_id" varchar(128) NOT NULL, + "quota" int4 NOT NULL, + "usage" int4 NOT NULL, + "max_size" int4 NOT NULL, + "max_aggr_count" int4 NOT NULL, + "max_aggr_size" int4 NOT NULL, + "max_history_count" int4 NOT NULL, + "gmt_create" timestamp(3) without time zone NOT NULL, + "gmt_modified" timestamp(3) without time zone NOT NULL +); +COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; +COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; +COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."usage" IS '使用量'; +COMMENT ON COLUMN "tenant_capacity"."max_size" IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_count" IS '聚合子配置最大个数'; +COMMENT ON COLUMN "tenant_capacity"."max_aggr_size" IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN "tenant_capacity"."max_history_count" IS '最大变更历史数量'; +COMMENT ON COLUMN "tenant_capacity"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_capacity"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_capacity" IS '租户容量信息表'; + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" USING btree ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" bigserial NOT NULL, + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" int8 NOT NULL, + "gmt_modified" int8 NOT NULL +); +COMMENT ON COLUMN "tenant_info"."id" IS 'id'; +COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; +COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; +COMMENT ON COLUMN "tenant_info"."tenant_name" IS 'tenant_name'; +COMMENT ON COLUMN "tenant_info"."tenant_desc" IS 'tenant_desc'; +COMMENT ON COLUMN "tenant_info"."create_source" IS 'create_source'; +COMMENT ON COLUMN "tenant_info"."gmt_create" IS '创建时间'; +COMMENT ON COLUMN "tenant_info"."gmt_modified" IS '修改时间'; +COMMENT ON TABLE "tenant_info" IS 'tenant_info'; + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" USING btree ( + "kp", + "tenant_id" + ); + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" boolean NOT NULL +); + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" USING btree ( + "username", + "role" + ); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" USING btree ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + + +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); + + +COMMIT; \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql index cb5c934..9b439cc 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/postgresql/create-tables.sql @@ -193,8 +193,7 @@ CREATE TABLE "config_tags_relation" ( "group_id" varchar(128) NOT NULL, "tenant_id" varchar(128) , "nid" bigserial NOT NULL -) -; +); COMMENT ON COLUMN "config_tags_relation"."id" IS 'id'; COMMENT ON COLUMN "config_tags_relation"."tag_name" IS 'tag_name'; COMMENT ON COLUMN "config_tags_relation"."tag_type" IS 'tag_type'; @@ -240,8 +239,7 @@ CREATE TABLE "group_capacity" ( "max_history_count" int4 NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL -) -; +); COMMENT ON COLUMN "group_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "group_capacity"."group_id" IS 'Group ID，空字符表示整个集群'; COMMENT ON COLUMN "group_capacity"."quota" IS '配额，0表示使用默认值'; @@ -289,8 +287,7 @@ CREATE TABLE "his_config_info" ( "op_type" char(10) , "tenant_id" varchar(128) , "encrypted_data_key" text -) -; +); COMMENT ON COLUMN "his_config_info"."app_name" IS 'app_name'; COMMENT ON COLUMN "his_config_info"."tenant_id" IS '租户字段'; COMMENT ON COLUMN "his_config_info"."encrypted_data_key" IS '密钥'; @@ -331,8 +328,7 @@ CREATE TABLE "tenant_capacity" ( "max_history_count" int4 NOT NULL, "gmt_create" timestamp(3) without time zone NOT NULL, "gmt_modified" timestamp(3) without time zone NOT NULL -) -; +); COMMENT ON COLUMN "tenant_capacity"."id" IS '主键ID'; COMMENT ON COLUMN "tenant_capacity"."tenant_id" IS 'Tenant ID'; COMMENT ON COLUMN "tenant_capacity"."quota" IS '配额，0表示使用默认值'; @@ -373,8 +369,7 @@ CREATE TABLE "tenant_info" ( "create_source" varchar(32) , "gmt_create" int8 NOT NULL, "gmt_modified" int8 NOT NULL -) -; +); COMMENT ON COLUMN "tenant_info"."id" IS 'id'; COMMENT ON COLUMN "tenant_info"."kp" IS 'kp'; COMMENT ON COLUMN "tenant_info"."tenant_id" IS 'tenant_id'; @@ -403,8 +398,7 @@ CREATE TABLE "users" ( "username" varchar(50) NOT NULL, "password" varchar(500) NOT NULL, "enabled" boolean NOT NULL -) -; +); -- ---------------------------- @@ -414,8 +408,7 @@ DROP TABLE IF EXISTS "roles"; CREATE TABLE "roles" ( "username" varchar(50) NOT NULL, "role" varchar(50) NOT NULL -) -; +); -- ---------------------------- @@ -434,8 +427,7 @@ CREATE TABLE "permissions" ( "role" varchar(50) NOT NULL, "resource" varchar(512) NOT NULL, "action" varchar(8) NOT NULL -) -; +); -- ---------------------------- -- Gitee From 819fcc70564cb682430ff87fcb6c6bfbaeeac018 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Wed, 28 Aug 2024 17:57:09 +0800 Subject: [PATCH 064/159] =?UTF-8?q?+=20=E6=8F=90=E4=BE=9B=20sqlserver=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/mssql/create-schema.sql | 6 + .../resources/sql/mssql/create-tables.sql | 360 ++++++++++++++++++ nacosplugin-datasource/installation.MD | 9 +- 3 files changed, 373 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql index e69de29..0a95548 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-schema.sql @@ -0,0 +1,6 @@ +-- DROP SCHEMA IF EXISTS nacos; + +-- IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name='nacos') EXEC('CREATE SCHEMA [nacos]'); + +DROP DATABASE IF EXISTS nacos; +CREATE DATABASE nacos COLLATE Chinese_PRC_CI_AS ; diff --git a/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql index e69de29..07d2978 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/mssql/create-tables.sql @@ -0,0 +1,360 @@ +USE nacos; + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS "config_info"; +CREATE TABLE "config_info" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) , + "content" ntext NOT NULL, + "md5" varchar(32) , + "gmt_create" datetime NOT NULL, + "gmt_modified" datetime NOT NULL, + "src_user" ntext , + "src_ip" varchar(20) , + "app_name" varchar(128) , + "tenant_id" varchar(128) , + "c_desc" varchar(256) , + "c_use" varchar(64) , + "effect" varchar(64) , + "type" varchar(64) , + "c_schema" ntext , + "encrypted_data_key" ntext +); + + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfo_datagrouptenant" ON "config_info" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE "config_info" ADD CONSTRAINT "config_info_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_aggr"; +CREATE TABLE "config_info_aggr" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "data_id" varchar(255) NOT NULL, + "group_id" varchar(255) NOT NULL, + "datum_id" varchar(255) NOT NULL, + "content" ntext NOT NULL, + "gmt_modified" datetime NOT NULL, + "app_name" varchar(128) , + "tenant_id" varchar(128) +); + + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfoaggr_datagrouptenantdatum" ON "config_info_aggr" ("data_id","group_id","tenant_id","datum_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE "config_info_aggr" ADD CONSTRAINT "config_info_aggr_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_beta"; +CREATE TABLE "config_info_beta" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" ntext NOT NULL, + "beta_ips" varchar(1024) , + "md5" varchar(32) , + "gmt_create" datetime NOT NULL, + "gmt_modified" datetime NOT NULL, + "src_user" ntext , + "src_ip" varchar(20) , + "tenant_id" varchar(128) , + "encrypted_data_key" ntext +); + + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfobeta_datagrouptenant" ON "config_info_beta" ("data_id","group_id","tenant_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE "config_info_beta" ADD CONSTRAINT "config_info_beta_pkey" PRIMARY KEY ("id"); + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS "config_info_tag"; +CREATE TABLE "config_info_tag" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tag_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" ntext NOT NULL, + "md5" varchar(32) , + "gmt_create" datetime NOT NULL, + "gmt_modified" datetime NOT NULL, + "src_user" ntext , + "src_ip" varchar(20) +); + + + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX "uk_configinfotag_datagrouptenanttag" ON "config_info_tag" ("data_id","group_id","tenant_id","tag_id"); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE "config_info_tag" ADD CONSTRAINT "config_info_tag_pkey" PRIMARY KEY ("id"); + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS "config_tags_relation"; +CREATE TABLE "config_tags_relation" ( + "id" BIGINT NOT NULL, + "tag_name" varchar(128) NOT NULL, + "tag_type" varchar(64) , + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "nid" BIGINT NOT NULL IDENTITY(1,1) +); + + + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX "idx_tenant_id" ON "config_tags_relation" ( + "tenant_id" + ); +CREATE UNIQUE INDEX "uk_configtagrelation_configidtag" ON "config_tags_relation" ( + "id", + "tag_name", + "tag_type" + ); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE "config_tags_relation" ADD CONSTRAINT "config_tags_relation_pkey" PRIMARY KEY ("nid"); + + + + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "group_capacity"; +CREATE TABLE "group_capacity" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "group_id" varchar(128) NOT NULL, + "quota" INT NOT NULL, + "usage" INT NOT NULL, + "max_size" INT NOT NULL, + "max_aggr_count" INT NOT NULL, + "max_aggr_size" INT NOT NULL, + "max_history_count" INT NOT NULL, + "gmt_create" datetime NOT NULL, + "gmt_modified" datetime NOT NULL +); + + + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_group_id" ON "group_capacity" ( + "group_id" + ); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE "group_capacity" ADD CONSTRAINT "group_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS "his_config_info"; +CREATE TABLE "his_config_info" ( + "id" BIGINT NOT NULL, + "nid" BIGINT NOT NULL IDENTITY(1,1), + "data_id" varchar(255) NOT NULL, + "group_id" varchar(128) NOT NULL, + "app_name" varchar(128) , + "content" ntext NOT NULL, + "md5" varchar(32) , + "gmt_create" datetime NOT NULL DEFAULT '2010-05-05 00:00:00', + "gmt_modified" datetime NOT NULL, + "src_user" ntext , + "src_ip" varchar(20) , + "op_type" char(10) , + "tenant_id" varchar(128) , + "encrypted_data_key" ntext +); + + + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX "idx_did" ON "his_config_info" ( + "data_id" + ); +CREATE INDEX "idx_gmt_create" ON "his_config_info" ( + "gmt_create" + ); +CREATE INDEX "idx_gmt_modified" ON "his_config_info" ( + "gmt_modified" + ); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE "his_config_info" ADD CONSTRAINT "his_config_info_pkey" PRIMARY KEY ("nid"); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_capacity"; +CREATE TABLE "tenant_capacity" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "tenant_id" varchar(128) NOT NULL, + "quota" INT NOT NULL, + "usage" INT NOT NULL, + "max_size" INT NOT NULL, + "max_aggr_count" INT NOT NULL, + "max_aggr_size" INT NOT NULL, + "max_history_count" INT NOT NULL, + "gmt_create" datetime NOT NULL, + "gmt_modified" datetime NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_id" ON "tenant_capacity" ( + "tenant_id" + ); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE "tenant_capacity" ADD CONSTRAINT "tenant_capacity_pkey" PRIMARY KEY ("id"); + + + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS "tenant_info"; +CREATE TABLE "tenant_info" ( + "id" BIGINT NOT NULL IDENTITY(1,1), + "kp" varchar(128) NOT NULL, + "tenant_id" varchar(128) , + "tenant_name" varchar(128) , + "tenant_desc" varchar(256) , + "create_source" varchar(32) , + "gmt_create" BIGINT NOT NULL, + "gmt_modified" BIGINT NOT NULL +); + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX "uk_tenant_info_kptenantid" ON "tenant_info" ( + "kp", + "tenant_id" + ); + + + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS "users"; +CREATE TABLE "users" ( + "username" varchar(50) NOT NULL, + "password" varchar(500) NOT NULL, + "enabled" BIT NOT NULL +); + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS "roles"; +CREATE TABLE "roles" ( + "username" varchar(50) NOT NULL, + "role" varchar(50) NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX "uk_username_role" ON "roles" ( + "username", + "role" + ); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS "permissions"; +CREATE TABLE "permissions" ( + "role" varchar(50) NOT NULL, + "resource" varchar(512) NOT NULL, + "action" varchar(8) NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX "uk_role_permission" ON "permissions" ( + "role", + "resource", + "action" + ); + + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); + + +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); + diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index def6eeb..1701e28 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -27,7 +27,7 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 --- -## PostgreSQL 测试时，注意事项 +## 支持PostgreSQL 1. postgresql 相关依赖要放全，且要与服务端兼容，建议 >= 42.2.0 版本。 2. 使用Oracle JDK 8，使用 OpenJDK 8可能会遇到 PostgreSQL SCRAM 认证相关问题 3. 驱动[下载地址](https://mvnrepository.com/artifact/org.postgresql/postgresql) @@ -42,7 +42,7 @@ db.password.0=postgresql db.pool.config.driverClassName=org.postgresql.Driver ``` -## DM 测试时，注意事项 +## 支持DM 1. jdbc驱动选择： ```markdown + 在JDK8上运行时，选择：com.dameng:DmJdbcDriver18:8.1.3.140 @@ -72,3 +72,8 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ``` +## 支持SqlServer +1. jdbc 驱动选择： +参考[微软官方说明](https://learn.microsoft.com/zh-cn/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix?view=sql-server-ver16)，建议选择`12.4.1`版本 +2. jdbc 配置 +3. \ No newline at end of file -- Gitee From f942eab11a4221cb2aa9da4a8f6999bde057ee5a Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Wed, 28 Aug 2024 19:57:48 +0800 Subject: [PATCH 065/159] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9B=20order=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/mssql/MssqlDatabaseDialect.java | 9 ++++ .../mapper/BaseConfigInfoMapper.java | 12 +++--- .../mapper/BaseConfigTagRelationMapper.java | 41 +++++++++++-------- .../mapper/BaseGroupCapacityMapper.java | 2 +- .../mapper/BaseTenantCapacityMapper.java | 2 +- 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java index 472119b..57c8475 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java @@ -1,11 +1,20 @@ package com.jn.nacos.plugin.datasource.db.mssql; +import com.jn.langx.util.collection.Maps; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; +import java.util.Map; + public class MssqlDatabaseDialect extends NacosDatabaseDialect { public MssqlDatabaseDialect() { super(DatabaseTypes.MSSQL); } + @Override + protected Map specifiedFunctions() { + Map map = Maps.newHashMap(); + map.put("NOW()", "CURRENT_TIMESTAMP"); + return map; + } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java index e089717..b1078a2 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java @@ -27,7 +27,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ?"; + String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ? order by id asc"; sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(tenantId, appName), rowSelection); @@ -130,7 +130,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI where += " AND gmt_modified <=? "; paramList.add(endTime); } - String sql = sqlFetchRows + where; + String sql = sqlFetchRows + where +" order by id asc"; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); @@ -170,7 +170,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI where += " AND content LIKE ? "; paramList.add(tenant); } - String sql = sqlFetchRows + where; + String sql = sqlFetchRows + where + " order by id asc"; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); @@ -210,7 +210,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI paramList.add(content); } - sql = sql + where; + sql = sql + where + " order by id asc"; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); sql = getDialect().getLimitSql(sql, rowSelection); @@ -222,7 +222,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=?"; + String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=? order by id asc"; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); @@ -263,7 +263,7 @@ public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigI } RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = sqlFetchRows + where; + String sql = sqlFetchRows + where +" order by id asc"; sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java index e92361a..4b8ece5 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java @@ -4,6 +4,7 @@ import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; +import com.jn.langx.util.Objs; import com.jn.langx.util.Strings; import com.jn.sqlhelper.dialect.pagination.RowSelection; @@ -49,18 +50,22 @@ public abstract class BaseConfigTagRelationMapper extends BaseMapper implements where.append(" AND a.content LIKE ? "); paramList.add(content); } - where.append(" AND b.tag_name IN ("); - for (int i = 0; i < tagArr.length; i++) { - if (i != 0) { - where.append(", "); + + if(!Objs.isEmpty(tagArr)) { + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); } - where.append('?'); - paramList.add(tagArr[i]); + where.append(") "); } - where.append(") "); + + String sql = baseSql + where + " order by id asc"; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = baseSql + where; sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); @@ -101,18 +106,22 @@ public abstract class BaseConfigTagRelationMapper extends BaseMapper implements paramList.add(content); } - where.append(" AND b.tag_name IN ("); - for (int i = 0; i < tagArr.length; i++) { - if (i != 0) { - where.append(", "); + if(!Objs.isEmpty(tagArr)) { + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); } - where.append('?'); - paramList.add(tagArr[i]); + where.append(") "); } - where.append(") "); + + String sql = baseSql + where + " order by id asc"; RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = baseSql + where; + sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java index 08aca97..cf9acdd 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java @@ -18,7 +18,7 @@ public abstract class BaseGroupCapacityMapper extends BaseMapper implements Grou @Override public MapperResult selectGroupInfoBySize(MapperContext context) { RowSelection rowSelection = new RowSelection(0, context.getPageSize()); - String sql = "SELECT id, group_id FROM group_capacity WHERE id > ? "; + String sql = "SELECT id, group_id FROM group_capacity WHERE id > ? order by id asc"; sql = getDialect().getLimitSql(sql, rowSelection); List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java index f22640d..aec85fb 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java @@ -19,7 +19,7 @@ public abstract class BaseTenantCapacityMapper extends BaseMapper implements Ten int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); RowSelection rowSelection = new RowSelection(0, pageSize); - String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>? "; + String sql = "SELECT id, tenant_id FROM tenant_capacity WHERE id>? order by id asc"; sql = getDialect().getLimitSql(sql, rowSelection); List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); -- Gitee From a5cd6edb7e0641f562807141dc3309454c7bdf2c Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Wed, 28 Aug 2024 20:12:47 +0800 Subject: [PATCH 066/159] =?UTF-8?q?*=20=E6=8F=90=E4=BE=9B=20sqlserver?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 1701e28..0c45f46 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -75,5 +75,19 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ## 支持SqlServer 1. jdbc 驱动选择： 参考[微软官方说明](https://learn.microsoft.com/zh-cn/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix?view=sql-server-ver16)，建议选择`12.4.1`版本 -2. jdbc 配置 -3. \ No newline at end of file +2. 使用database而不是schema +```markdown +在SqlServer中，每个Database都会默认创建一堆固定的schema，执行sql时，默认就会使用一个名为 dbo的schema。 +虽然也可以通过SQL方式创建 自定义的schema，但无法在session中指定默认schema的，所以不要使用schema，而是使用database。 +``` + +3. jdbc 配置 +```properties +# SqlServer +spring.sql.init.platform=sqlserver +db.num=1 +db.url.0=jdbc:sqlserver://192.168.137.133:1433;databaseName=nacos;encrypt=false +db.user.0=sa +db.password.0=SA123456Pswd +db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver +``` \ No newline at end of file -- Gitee From 51d5d4e1bfc291131adad895c360de6ee23020e2 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 14:45:28 +0800 Subject: [PATCH 067/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0oracle=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/oracle/create-schema.sql | 9 + .../resources/sql/oracle/create-tables.sql | 550 ++++++++++++++++++ 2 files changed, 559 insertions(+) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql index e69de29..b076bc7 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql @@ -0,0 +1,9 @@ +-- execute this scripts using sqlplus + +-- create schema +DROP USER IF EXISTS C##NACOS; +CREATE USER IF NOT EXISTS C##NACOS IDENTIFIED BY NACOS_PASSWORD; +GRANT ALL PRIVILEGES TO C##NACOS; + + +exit \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index e69de29..20b99e8 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -0,0 +1,550 @@ +ALTER SESSION SET CURRENT_SCHEMA=C##NACOS; + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS config_info; +CREATE TABLE config_info ( + id int NOT NULL, + data_id varchar2(255) NOT NULL, + group_id varchar2(255) , + content CLOB NOT NULL, + md5 varchar2(32) , + gmt_create timestamp(6) NOT NULL, + gmt_modified timestamp(6) NOT NULL, + src_user CLOB , + src_ip varchar2(20) , + app_name varchar2(128) , + tenant_id varchar2(128) DEFAULT 'PUBLIC', + c_desc varchar2(256) , + c_use varchar2(64) , + effect varchar2(64) , + type varchar2(64) , + c_schema CLOB , + encrypted_data_key CLOB DEFAULT '' +); + +COMMENT ON COLUMN config_info.id IS 'id'; +COMMENT ON COLUMN config_info.data_id IS 'data_id'; +COMMENT ON COLUMN config_info.content IS 'content'; +COMMENT ON COLUMN config_info.md5 IS 'md5'; +COMMENT ON COLUMN config_info.gmt_create IS '创建时间'; +COMMENT ON COLUMN config_info.gmt_modified IS '修改时间'; +COMMENT ON COLUMN config_info.src_user IS 'source user'; +COMMENT ON COLUMN config_info.src_ip IS 'source ip'; +COMMENT ON COLUMN config_info.tenant_id IS '租户字段'; +COMMENT ON COLUMN config_info.encrypted_data_key IS '秘钥'; +COMMENT ON TABLE config_info IS 'config_info'; + + +DROP SEQUENCE IF EXISTS config_info_id_seq; +create sequence config_info_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger config_info_id_inc +before insert on config_info for each row +begin +select config_info_id_seq.nextval into:new.id from dual; +end; + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS config_info_aggr; +CREATE TABLE config_info_aggr ( + id int NOT NULL, + data_id varchar2(255) NOT NULL, + group_id varchar2(255) NOT NULL, + datum_id varchar2(255) NOT NULL, + content CLOB NOT NULL, + gmt_modified timestamp(6) NOT NULL, + app_name varchar2(128) , + tenant_id varchar2(128) DEFAULT 'PUBLIC' +); +COMMENT ON COLUMN config_info_aggr.id IS 'id'; +COMMENT ON COLUMN config_info_aggr.data_id IS 'data_id'; +COMMENT ON COLUMN config_info_aggr.group_id IS 'group_id'; +COMMENT ON COLUMN config_info_aggr.datum_id IS 'datum_id'; +COMMENT ON COLUMN config_info_aggr.content IS '内容'; +COMMENT ON COLUMN config_info_aggr.gmt_modified IS '修改时间'; +COMMENT ON COLUMN config_info_aggr.tenant_id IS '租户字段'; +COMMENT ON TABLE config_info_aggr IS '增加租户字段'; + + +DROP SEQUENCE IF EXISTS config_info_aggr_id_seq; +create sequence config_info_aggr_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger config_info_aggr_id_inc +before insert on config_info_aggr for each row +begin +select config_info_aggr_id_seq.nextval into:new.id from dual; +end; + + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- + +DROP TABLE IF EXISTS config_info_beta; +CREATE TABLE config_info_beta ( + id int NOT NULL, + data_id varchar2(255) NOT NULL, + group_id varchar2(128) NOT NULL, + app_name varchar2(128) , + content CLOB NOT NULL, + beta_ips varchar2(1024) , + md5 varchar2(32) , + gmt_create timestamp(6) NOT NULL, + gmt_modified timestamp(6) NOT NULL, + src_user CLOB , + src_ip varchar2(20) , + tenant_id varchar2(128) DEFAULT 'PUBLIC', + encrypted_data_key CLOB NOT NULL +); +COMMENT ON COLUMN config_info_beta.id IS 'id'; +COMMENT ON COLUMN config_info_beta.data_id IS 'data_id'; +COMMENT ON COLUMN config_info_beta.group_id IS 'group_id'; +COMMENT ON COLUMN config_info_beta.app_name IS 'app_name'; +COMMENT ON COLUMN config_info_beta.content IS 'content'; +COMMENT ON COLUMN config_info_beta.beta_ips IS 'betaIps'; +COMMENT ON COLUMN config_info_beta.md5 IS 'md5'; +COMMENT ON COLUMN config_info_beta.gmt_create IS '创建时间'; +COMMENT ON COLUMN config_info_beta.gmt_modified IS '修改时间'; +COMMENT ON COLUMN config_info_beta.src_user IS 'source user'; +COMMENT ON COLUMN config_info_beta.src_ip IS 'source ip'; +COMMENT ON COLUMN config_info_beta.tenant_id IS '租户字段'; +COMMENT ON COLUMN config_info_beta.encrypted_data_key IS '秘钥'; +COMMENT ON TABLE config_info_beta IS 'config_info_beta'; + + +DROP SEQUENCE IF EXISTS config_info_beta_id_seq; +create sequence config_info_beta_id_seq + minvalue 1 + increment by 1 + start with 1; + + +create or replace trigger config_info_beta_id_inc +before insert on config_info_beta for each row +begin +select config_info_beta_id_seq.nextval into:new.id from dual; +end; + + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS config_info_tag; +CREATE TABLE config_info_tag ( + id int NOT NULL, + data_id varchar2(255) NOT NULL, + group_id varchar2(128) NOT NULL, + tenant_id varchar2(128) DEFAULT 'PUBLIC', + tag_id varchar2(128) NOT NULL, + app_name varchar2(128) , + content CLOB NOT NULL, + md5 varchar2(32) , + gmt_create timestamp(6) NOT NULL, + gmt_modified timestamp(6) NOT NULL, + src_user CLOB , + src_ip varchar2(20) +); +COMMENT ON COLUMN config_info_tag.id IS 'id'; +COMMENT ON COLUMN config_info_tag.data_id IS 'data_id'; +COMMENT ON COLUMN config_info_tag.group_id IS 'group_id'; +COMMENT ON COLUMN config_info_tag.tenant_id IS 'tenant_id'; +COMMENT ON COLUMN config_info_tag.tag_id IS 'tag_id'; +COMMENT ON COLUMN config_info_tag.app_name IS 'app_name'; +COMMENT ON COLUMN config_info_tag.content IS 'content'; +COMMENT ON COLUMN config_info_tag.md5 IS 'md5'; +COMMENT ON COLUMN config_info_tag.gmt_create IS '创建时间'; +COMMENT ON COLUMN config_info_tag.gmt_modified IS '修改时间'; +COMMENT ON COLUMN config_info_tag.src_user IS 'source user'; +COMMENT ON COLUMN config_info_tag.src_ip IS 'source ip'; +COMMENT ON TABLE config_info_tag IS 'config_info_tag'; + + +DROP SEQUENCE IF EXISTS config_info_tag_id_seq; +create sequence config_info_tag_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger config_info_tag_id_inc +before insert on config_info_tag for each row +begin +select config_info_tag_id_seq.nextval into:new.id from dual; +end; + + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS config_tags_relation; +CREATE TABLE config_tags_relation ( + id int NOT NULL, + tag_name varchar2(128) NOT NULL, + tag_type varchar2(64) , + data_id varchar2(255) NOT NULL, + group_id varchar2(128) NOT NULL, + tenant_id varchar2(128) DEFAULT 'PUBLIC', + nid int NOT NULL +); +COMMENT ON COLUMN config_tags_relation.id IS 'id'; +COMMENT ON COLUMN config_tags_relation.tag_name IS 'tag_name'; +COMMENT ON COLUMN config_tags_relation.tag_type IS 'tag_type'; +COMMENT ON COLUMN config_tags_relation.data_id IS 'data_id'; +COMMENT ON COLUMN config_tags_relation.group_id IS 'group_id'; +COMMENT ON COLUMN config_tags_relation.tenant_id IS 'tenant_id'; +COMMENT ON TABLE config_tags_relation IS 'config_tag_relation'; + + +DROP SEQUENCE IF EXISTS config_tags_relation_id_seq; +create sequence config_tags_relation_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger config_tags_relation_id_inc +before insert on config_tags_relation for each row +begin +select config_tags_relation_id_seq.nextval into:new.id from dual; +end; + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- + +DROP TABLE IF EXISTS group_capacity; +CREATE TABLE group_capacity ( + id int NOT NULL, + group_id varchar2(128) NOT NULL, + quota int NOT NULL, + usage int NOT NULL, + max_size int NOT NULL, + max_aggr_count int NOT NULL, + max_aggr_size int NOT NULL, + max_history_count int NOT NULL, + gmt_create timestamp(6) NOT NULL, + gmt_modified timestamp(6) NOT NULL +); +COMMENT ON COLUMN group_capacity.id IS '主键ID'; +COMMENT ON COLUMN group_capacity.group_id IS 'Group ID，空字符表示整个集群'; +COMMENT ON COLUMN group_capacity.quota IS '配额，0表示使用默认值'; +COMMENT ON COLUMN group_capacity.usage IS '使用量'; +COMMENT ON COLUMN group_capacity.max_size IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN group_capacity.max_aggr_count IS '聚合子配置最大个数，，0表示使用默认值'; +COMMENT ON COLUMN group_capacity.max_aggr_size IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN group_capacity.max_history_count IS '最大变更历史数量'; +COMMENT ON COLUMN group_capacity.gmt_create IS '创建时间'; +COMMENT ON COLUMN group_capacity.gmt_modified IS '修改时间'; +COMMENT ON TABLE group_capacity IS '集群、各Group容量信息表'; + + + +DROP SEQUENCE IF EXISTS group_capacity_id_seq; +create sequence group_capacity_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger group_capacity_id_inc +before insert on group_capacity for each row +begin +select group_capacity_id_seq.nextval into:new.id from dual; +end; + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- + +DROP TABLE IF EXISTS his_config_info; +CREATE TABLE his_config_info ( + id int NOT NULL, + nid int NOT NULL, + data_id varchar2(255) NOT NULL, + group_id varchar2(128) NOT NULL, + app_name varchar2(128) , + content CLOB NOT NULL, + md5 varchar2(32) , + gmt_create timestamp(6) DEFAULT CURRENT_TIMESTAMP, + gmt_modified timestamp(6) NOT NULL, + src_user CLOB , + src_ip varchar2(20) , + op_type char(10) , + tenant_id varchar2(128) DEFAULT 'PUBLIC', + encrypted_data_key CLOB DEFAULT '' +); +COMMENT ON COLUMN his_config_info.app_name IS 'app_name'; +COMMENT ON COLUMN his_config_info.tenant_id IS '租户字段'; +COMMENT ON COLUMN his_config_info.encrypted_data_key IS '秘钥'; +COMMENT ON TABLE his_config_info IS '多租户改造'; + + +DROP SEQUENCE IF EXISTS his_config_info_nid_seq; +create sequence his_config_info_nid_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger his_config_info_nid_inc +before insert on his_config_info for each row +begin +select his_config_info_nid_seq.nextval into:new.nid from dual; +end; + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS permissions; +CREATE TABLE permissions ( + "ROLE" varchar2(50) NOT NULL, + "RESOURCE" varchar2(512) NOT NULL, + "ACTION" varchar2(8) NOT NULL +); + + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS roles; +CREATE TABLE roles ( + "USERNAME" varchar2(50) NOT NULL, + "ROLE" varchar2(50) NOT NULL +); + + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS tenant_capacity; +CREATE TABLE tenant_capacity ( + id int NOT NULL, + tenant_id varchar2(128) NOT NULL, + quota int NOT NULL, + usage int NOT NULL, + max_size int NOT NULL, + max_aggr_count int NOT NULL, + max_aggr_size int NOT NULL, + max_history_count int NOT NULL, + gmt_create timestamp(6) NOT NULL, + gmt_modified timestamp(6) NOT NULL +); +COMMENT ON COLUMN tenant_capacity.id IS '主键ID'; +COMMENT ON COLUMN tenant_capacity.tenant_id IS 'Tenant ID'; +COMMENT ON COLUMN tenant_capacity.quota IS '配额，0表示使用默认值'; +COMMENT ON COLUMN tenant_capacity.usage IS '使用量'; +COMMENT ON COLUMN tenant_capacity.max_size IS '单个配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN tenant_capacity.max_aggr_count IS '聚合子配置最大个数'; +COMMENT ON COLUMN tenant_capacity.max_aggr_size IS '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值'; +COMMENT ON COLUMN tenant_capacity.max_history_count IS '最大变更历史数量'; +COMMENT ON COLUMN tenant_capacity.gmt_create IS '创建时间'; +COMMENT ON COLUMN tenant_capacity.gmt_modified IS '修改时间'; +COMMENT ON TABLE tenant_capacity IS '租户容量信息表'; + + +DROP SEQUENCE IF EXISTS tenant_capacity_id_seq; +create sequence tenant_capacity_id_seq + minvalue 1 + increment by 1 + start with 1; + + +create or replace trigger tenant_capacity_id_inc +before insert on tenant_capacity for each row +begin +select tenant_capacity_id_seq.nextval into:new.id from dual; +end; + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS tenant_info; +CREATE TABLE tenant_info ( + id int NOT NULL, + kp varchar2(128) NOT NULL, + tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_name varchar2(128) , + tenant_desc varchar2(256) , + create_source varchar2(32) , + gmt_create int NOT NULL, + gmt_modified int NOT NULL +); +COMMENT ON COLUMN tenant_info.id IS 'id'; +COMMENT ON COLUMN tenant_info.kp IS 'kp'; +COMMENT ON COLUMN tenant_info.tenant_id IS 'tenant_id'; +COMMENT ON COLUMN tenant_info.tenant_name IS 'tenant_name'; +COMMENT ON COLUMN tenant_info.tenant_desc IS 'tenant_desc'; +COMMENT ON COLUMN tenant_info.create_source IS 'create_source'; +COMMENT ON COLUMN tenant_info.gmt_create IS '创建时间'; +COMMENT ON COLUMN tenant_info.gmt_modified IS '修改时间'; +COMMENT ON TABLE tenant_info IS 'tenant_info'; + +DROP SEQUENCE IF EXISTS tenant_info_id_seq; +create sequence tenant_info_id_seq + minvalue 1 + increment by 1 + start with 1; + +create or replace trigger tenant_info_id_inc +before insert on tenant_info for each row +begin +select tenant_info_id_seq.nextval into:new.id from dual; +end; + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS users; +CREATE TABLE users ( + username varchar2(50) NOT NULL, + password varchar2(500) NOT NULL, + enabled NUMBER(1) NOT NULL +); + + +-- ---------------------------- +-- Indexes structure for table config_info +-- ---------------------------- + +CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfo_datagrouptenant ON config_info (data_id,group_id,tenant_id); + +-- ---------------------------- +-- Primary Key structure for table config_info +-- ---------------------------- +ALTER TABLE config_info ADD CONSTRAINT config_info_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table config_info_aggr +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfoaggr_datagrouptenantdatum ON config_info_aggr (data_id,group_id,tenant_id,datum_id); + +-- ---------------------------- +-- Primary Key structure for table config_info_aggr +-- ---------------------------- +ALTER TABLE config_info_aggr ADD CONSTRAINT config_info_aggr_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table config_info_beta +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfobeta_datagrouptenant ON config_info_beta (data_id,group_id,tenant_id); + +-- ---------------------------- +-- Primary Key structure for table config_info_beta +-- ---------------------------- +ALTER TABLE config_info_beta ADD CONSTRAINT config_info_beta_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table config_info_tag +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfotag_datagrouptenanttag ON config_info_tag (data_id,group_id,tenant_id,tag_id); + +-- ---------------------------- +-- Primary Key structure for table config_info_tag +-- ---------------------------- +ALTER TABLE config_info_tag ADD CONSTRAINT config_info_tag_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table config_tags_relation +-- ---------------------------- +CREATE INDEX IF NOT EXISTS idx_tenant_id ON config_tags_relation ( + tenant_id +); +CREATE UNIQUE INDEX IF NOT EXISTS uk_configtagrelation_configidtag ON config_tags_relation ( + id, + tag_name, + tag_type +); + +-- ---------------------------- +-- Primary Key structure for table config_tags_relation +-- ---------------------------- +ALTER TABLE config_tags_relation ADD CONSTRAINT config_tags_relation_pkey PRIMARY KEY (nid); + +-- ---------------------------- +-- Indexes structure for table group_capacity +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_group_id ON group_capacity ( + group_id +); + +-- ---------------------------- +-- Primary Key structure for table group_capacity +-- ---------------------------- +ALTER TABLE group_capacity ADD CONSTRAINT group_capacity_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table his_config_info +-- ---------------------------- +CREATE INDEX IF NOT EXISTS idx_did ON his_config_info ( + data_id +); +CREATE INDEX IF NOT EXISTS idx_gmt_create ON his_config_info ( + gmt_create +); +CREATE INDEX IF NOT EXISTS idx_gmt_modified ON his_config_info ( + gmt_modified +); + +-- ---------------------------- +-- Primary Key structure for table his_config_info +-- ---------------------------- +ALTER TABLE his_config_info ADD CONSTRAINT his_config_info_pkey PRIMARY KEY (nid); + +-- ---------------------------- +-- Indexes structure for table permissions +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_role_permission ON permissions ( + "ROLE", + "RESOURCE", + "ACTION" +); + +-- ---------------------------- +-- Indexes structure for table roles +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_username_role ON roles ( + "USERNAME", + "ROLE" +); + +-- ---------------------------- +-- Indexes structure for table tenant_capacity +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_id ON tenant_capacity ( + tenant_id +); + +-- ---------------------------- +-- Primary Key structure for table tenant_capacity +-- ---------------------------- +ALTER TABLE tenant_capacity ADD CONSTRAINT tenant_capacity_pkey PRIMARY KEY (id); + +-- ---------------------------- +-- Indexes structure for table tenant_info +-- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_info_kptenantid ON tenant_info ( + kp, + tenant_id +); + + +BEGIN; +-- ---------------------------- +-- Records of roles +-- ---------------------------- + +INSERT INTO roles VALUES ('nacos', 'ROLE_ADMIN'); + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); + + +COMMIT; \ No newline at end of file -- Gitee From ba64c881782da4068c9fab2920900ae604090cef Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 15:09:59 +0800 Subject: [PATCH 068/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0oracle=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/oracle/create-tables.sql | 178 +----------------- nacosplugin-datasource/installation.MD | 11 +- 2 files changed, 20 insertions(+), 169 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index 20b99e8..8f34a39 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -1,8 +1,5 @@ ALTER SESSION SET CURRENT_SCHEMA=C##NACOS; --- ---------------------------- --- Table structure for config_info --- ---------------------------- DROP TABLE IF EXISTS config_info; CREATE TABLE config_info ( id int NOT NULL, @@ -36,7 +33,6 @@ COMMENT ON COLUMN config_info.tenant_id IS '租户字段'; COMMENT ON COLUMN config_info.encrypted_data_key IS '秘钥'; COMMENT ON TABLE config_info IS 'config_info'; - DROP SEQUENCE IF EXISTS config_info_id_seq; create sequence config_info_id_seq minvalue 1 @@ -49,9 +45,6 @@ begin select config_info_id_seq.nextval into:new.id from dual; end; --- ---------------------------- --- Table structure for config_info_aggr --- ---------------------------- DROP TABLE IF EXISTS config_info_aggr; CREATE TABLE config_info_aggr ( id int NOT NULL, @@ -85,11 +78,6 @@ begin select config_info_aggr_id_seq.nextval into:new.id from dual; end; - --- ---------------------------- --- Table structure for config_info_beta --- ---------------------------- - DROP TABLE IF EXISTS config_info_beta; CREATE TABLE config_info_beta ( id int NOT NULL, @@ -135,10 +123,6 @@ begin select config_info_beta_id_seq.nextval into:new.id from dual; end; - --- ---------------------------- --- Table structure for config_info_tag --- ---------------------------- DROP TABLE IF EXISTS config_info_tag; CREATE TABLE config_info_tag ( id int NOT NULL, @@ -181,10 +165,6 @@ begin select config_info_tag_id_seq.nextval into:new.id from dual; end; - --- ---------------------------- --- Table structure for config_tags_relation --- ---------------------------- DROP TABLE IF EXISTS config_tags_relation; CREATE TABLE config_tags_relation ( id int NOT NULL, @@ -216,10 +196,6 @@ begin select config_tags_relation_id_seq.nextval into:new.id from dual; end; --- ---------------------------- --- Table structure for group_capacity --- ---------------------------- - DROP TABLE IF EXISTS group_capacity; CREATE TABLE group_capacity ( id int NOT NULL, @@ -259,10 +235,6 @@ begin select group_capacity_id_seq.nextval into:new.id from dual; end; --- ---------------------------- --- Table structure for his_config_info --- ---------------------------- - DROP TABLE IF EXISTS his_config_info; CREATE TABLE his_config_info ( id int NOT NULL, @@ -298,9 +270,6 @@ begin select his_config_info_nid_seq.nextval into:new.nid from dual; end; --- ---------------------------- --- Table structure for permissions --- ---------------------------- DROP TABLE IF EXISTS permissions; CREATE TABLE permissions ( "ROLE" varchar2(50) NOT NULL, @@ -309,9 +278,6 @@ CREATE TABLE permissions ( ); --- ---------------------------- --- Table structure for roles --- ---------------------------- DROP TABLE IF EXISTS roles; CREATE TABLE roles ( "USERNAME" varchar2(50) NOT NULL, @@ -319,9 +285,6 @@ CREATE TABLE roles ( ); --- ---------------------------- --- Table structure for tenant_capacity --- ---------------------------- DROP TABLE IF EXISTS tenant_capacity; CREATE TABLE tenant_capacity ( id int NOT NULL, @@ -361,9 +324,6 @@ begin select tenant_capacity_id_seq.nextval into:new.id from dual; end; --- ---------------------------- --- Table structure for tenant_info --- ---------------------------- DROP TABLE IF EXISTS tenant_info; CREATE TABLE tenant_info ( id int NOT NULL, @@ -396,10 +356,6 @@ before insert on tenant_info for each row begin select tenant_info_id_seq.nextval into:new.id from dual; end; - --- ---------------------------- --- Table structure for users --- ---------------------------- DROP TABLE IF EXISTS users; CREATE TABLE users ( username varchar2(50) NOT NULL, @@ -407,144 +363,30 @@ CREATE TABLE users ( enabled NUMBER(1) NOT NULL ); - --- ---------------------------- --- Indexes structure for table config_info --- ---------------------------- - CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfo_datagrouptenant ON config_info (data_id,group_id,tenant_id); - --- ---------------------------- --- Primary Key structure for table config_info --- ---------------------------- ALTER TABLE config_info ADD CONSTRAINT config_info_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table config_info_aggr --- ---------------------------- CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfoaggr_datagrouptenantdatum ON config_info_aggr (data_id,group_id,tenant_id,datum_id); - --- ---------------------------- --- Primary Key structure for table config_info_aggr --- ---------------------------- ALTER TABLE config_info_aggr ADD CONSTRAINT config_info_aggr_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table config_info_beta --- ---------------------------- CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfobeta_datagrouptenant ON config_info_beta (data_id,group_id,tenant_id); - --- ---------------------------- --- Primary Key structure for table config_info_beta --- ---------------------------- ALTER TABLE config_info_beta ADD CONSTRAINT config_info_beta_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table config_info_tag --- ---------------------------- CREATE UNIQUE INDEX IF NOT EXISTS uk_configinfotag_datagrouptenanttag ON config_info_tag (data_id,group_id,tenant_id,tag_id); - --- ---------------------------- --- Primary Key structure for table config_info_tag --- ---------------------------- ALTER TABLE config_info_tag ADD CONSTRAINT config_info_tag_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table config_tags_relation --- ---------------------------- -CREATE INDEX IF NOT EXISTS idx_tenant_id ON config_tags_relation ( - tenant_id -); -CREATE UNIQUE INDEX IF NOT EXISTS uk_configtagrelation_configidtag ON config_tags_relation ( - id, - tag_name, - tag_type -); - --- ---------------------------- --- Primary Key structure for table config_tags_relation --- ---------------------------- +CREATE INDEX IF NOT EXISTS idx_tenant_id ON config_tags_relation (tenant_id); +CREATE UNIQUE INDEX IF NOT EXISTS uk_configtagrelation_configidtag ON config_tags_relation (id,tag_name,tag_type); ALTER TABLE config_tags_relation ADD CONSTRAINT config_tags_relation_pkey PRIMARY KEY (nid); - --- ---------------------------- --- Indexes structure for table group_capacity --- ---------------------------- -CREATE UNIQUE INDEX IF NOT EXISTS uk_group_id ON group_capacity ( - group_id -); - --- ---------------------------- --- Primary Key structure for table group_capacity --- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_group_id ON group_capacity (group_id); ALTER TABLE group_capacity ADD CONSTRAINT group_capacity_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table his_config_info --- ---------------------------- -CREATE INDEX IF NOT EXISTS idx_did ON his_config_info ( - data_id -); -CREATE INDEX IF NOT EXISTS idx_gmt_create ON his_config_info ( - gmt_create -); -CREATE INDEX IF NOT EXISTS idx_gmt_modified ON his_config_info ( - gmt_modified -); - --- ---------------------------- --- Primary Key structure for table his_config_info --- ---------------------------- +CREATE INDEX IF NOT EXISTS idx_did ON his_config_info (data_id); +CREATE INDEX IF NOT EXISTS idx_gmt_create ON his_config_info (gmt_create); +CREATE INDEX IF NOT EXISTS idx_gmt_modified ON his_config_info (gmt_modified); ALTER TABLE his_config_info ADD CONSTRAINT his_config_info_pkey PRIMARY KEY (nid); - --- ---------------------------- --- Indexes structure for table permissions --- ---------------------------- -CREATE UNIQUE INDEX IF NOT EXISTS uk_role_permission ON permissions ( - "ROLE", - "RESOURCE", - "ACTION" -); - --- ---------------------------- --- Indexes structure for table roles --- ---------------------------- -CREATE UNIQUE INDEX IF NOT EXISTS uk_username_role ON roles ( - "USERNAME", - "ROLE" -); - --- ---------------------------- --- Indexes structure for table tenant_capacity --- ---------------------------- -CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_id ON tenant_capacity ( - tenant_id -); - --- ---------------------------- --- Primary Key structure for table tenant_capacity --- ---------------------------- +CREATE UNIQUE INDEX IF NOT EXISTS uk_role_permission ON permissions ("ROLE","RESOURCE","ACTION"); +CREATE UNIQUE INDEX IF NOT EXISTS uk_username_role ON roles ("USERNAME", "ROLE"); +CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_id ON tenant_capacity (tenant_id); ALTER TABLE tenant_capacity ADD CONSTRAINT tenant_capacity_pkey PRIMARY KEY (id); - --- ---------------------------- --- Indexes structure for table tenant_info --- ---------------------------- -CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_info_kptenantid ON tenant_info ( - kp, - tenant_id -); - +CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_info_kptenantid ON tenant_info (kp, tenant_id); BEGIN; --- ---------------------------- --- Records of roles --- ---------------------------- - INSERT INTO roles VALUES ('nacos', 'ROLE_ADMIN'); - --- ---------------------------- --- Records of users --- ---------------------------- INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); - - COMMIT; \ No newline at end of file diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 0c45f46..e6617d3 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -90,4 +90,13 @@ db.url.0=jdbc:sqlserver://192.168.137.133:1433;databaseName=nacos;encrypt=false db.user.0=sa db.password.0=SA123456Pswd db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver -``` \ No newline at end of file +``` + +## 支持Oracle +1. 脚本执行 +```shell +sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-schema.sql +sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-tables.sql +``` +2. + -- Gitee From a89e28b59ecb6e815dc8dd2a624b1a67ffe0a7ea Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 16:51:51 +0800 Subject: [PATCH 069/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0oracle=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/oracle/create-schema.sql | 2 +- .../resources/sql/oracle/create-tables.sql | 27 ++++++++++++++----- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql index b076bc7..66fda0b 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-schema.sql @@ -1,7 +1,7 @@ -- execute this scripts using sqlplus -- create schema -DROP USER IF EXISTS C##NACOS; +DROP USER IF EXISTS C##NACOS CASCADE; CREATE USER IF NOT EXISTS C##NACOS IDENTIFIED BY NACOS_PASSWORD; GRANT ALL PRIVILEGES TO C##NACOS; diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index 8f34a39..76338fe 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -1,3 +1,6 @@ +SET ECHO ON; +SET FEEDBACK ON; + ALTER SESSION SET CURRENT_SCHEMA=C##NACOS; DROP TABLE IF EXISTS config_info; @@ -44,6 +47,7 @@ before insert on config_info for each row begin select config_info_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS config_info_aggr; CREATE TABLE config_info_aggr ( @@ -77,6 +81,7 @@ before insert on config_info_aggr for each row begin select config_info_aggr_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS config_info_beta; CREATE TABLE config_info_beta ( @@ -122,6 +127,7 @@ before insert on config_info_beta for each row begin select config_info_beta_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS config_info_tag; CREATE TABLE config_info_tag ( @@ -164,6 +170,7 @@ before insert on config_info_tag for each row begin select config_info_tag_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS config_tags_relation; CREATE TABLE config_tags_relation ( @@ -195,6 +202,7 @@ before insert on config_tags_relation for each row begin select config_tags_relation_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS group_capacity; CREATE TABLE group_capacity ( @@ -234,6 +242,7 @@ before insert on group_capacity for each row begin select group_capacity_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS his_config_info; CREATE TABLE his_config_info ( @@ -269,19 +278,20 @@ before insert on his_config_info for each row begin select his_config_info_nid_seq.nextval into:new.nid from dual; end; +/ DROP TABLE IF EXISTS permissions; CREATE TABLE permissions ( - "ROLE" varchar2(50) NOT NULL, - "RESOURCE" varchar2(512) NOT NULL, - "ACTION" varchar2(8) NOT NULL + ROLE varchar2(50) NOT NULL, + RESOURCE varchar2(512) NOT NULL, + ACTION varchar2(8) NOT NULL ); DROP TABLE IF EXISTS roles; CREATE TABLE roles ( - "USERNAME" varchar2(50) NOT NULL, - "ROLE" varchar2(50) NOT NULL + USERNAME varchar2(50) NOT NULL, + ROLE varchar2(50) NOT NULL ); @@ -323,6 +333,7 @@ before insert on tenant_capacity for each row begin select tenant_capacity_id_seq.nextval into:new.id from dual; end; +/ DROP TABLE IF EXISTS tenant_info; CREATE TABLE tenant_info ( @@ -356,6 +367,8 @@ before insert on tenant_info for each row begin select tenant_info_id_seq.nextval into:new.id from dual; end; +/ + DROP TABLE IF EXISTS users; CREATE TABLE users ( username varchar2(50) NOT NULL, @@ -386,7 +399,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_id ON tenant_capacity (tenant_id); ALTER TABLE tenant_capacity ADD CONSTRAINT tenant_capacity_pkey PRIMARY KEY (id); CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_info_kptenantid ON tenant_info (kp, tenant_id); -BEGIN; + INSERT INTO roles VALUES ('nacos', 'ROLE_ADMIN'); -INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); +INSERT INTO users VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); COMMIT; \ No newline at end of file -- Gitee From c66649cb800a15e14f393f2fbc0b88a7b117bd30 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:08:02 +0800 Subject: [PATCH 070/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../resources/sql/oracle/create-tables.sql | 4 +++- nacosplugin-datasource/installation.MD | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c1224bb..03e21cf 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ + OpenGauss （高斯） + Oracle(8, 9, 10, 11, 12 ... ) + oscar （神通） + + PostgreSQL #### 软件架构 作为nacos的插件使用 diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index 76338fe..c95978b 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -402,4 +402,6 @@ CREATE UNIQUE INDEX IF NOT EXISTS uk_tenant_info_kptenantid ON tenant_info (kp, INSERT INTO roles VALUES ('nacos', 'ROLE_ADMIN'); INSERT INTO users VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); -COMMIT; \ No newline at end of file +COMMIT; + +exit \ No newline at end of file diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index e6617d3..34cd8ef 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -95,8 +95,10 @@ db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver ## 支持Oracle 1. 脚本执行 ```shell +# 先用 system 创建 C##NACOS用户 sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-schema.sql -sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-tables.sql +# 再用 C##NACOS用户创建表 +sqlplus C##NACOS/NACOS_PASSWORD@localhost:1521/FREE @./create-tables.sql ``` 2. -- Gitee From 783d2fc9694b275f555faaafe33cce050d389ad2 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:12:30 +0800 Subject: [PATCH 071/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 34cd8ef..4569c6c 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -100,5 +100,19 @@ sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-schema.sql # 再用 C##NACOS用户创建表 sqlplus C##NACOS/NACOS_PASSWORD@localhost:1521/FREE @./create-tables.sql ``` -2. +2. jdbc配置 +```properties + +# Oracle +spring.sql.init.platform=oracle +db.num=1 +# 在oracle中，schema就是用户名，所以不需要另外指定schema +db.url.0=jdbc:oracle:thin:@//192.168.137.133:1521/FREE +db.user.0=C##NACOS +db.password.0=NACOS_PASSWORD +db.pool.config.driverClassName=oracle.jdbc.OracleDriver + +``` +3. 目前使用Oracle的问题 + + 目前nacos 适配Oracle已完毕，但在启动过程中，nacos.log中会有报错。原因是 nacos 启动是会判定 config_info_tag, config_info_beta表是否存在。 这个方法是直接定死的使用了limit 1，没有通过插件的方式。这个属于 nacos 的Bug，已在 github 上提交了相关问题。 \ No newline at end of file -- Gitee From 63b2e973188a109af503edc90b83acf5a2e4f4fc Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:16:57 +0800 Subject: [PATCH 072/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 4569c6c..c64388e 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -115,4 +115,7 @@ db.pool.config.driverClassName=oracle.jdbc.OracleDriver ``` 3. 目前使用Oracle的问题 - + 目前nacos 适配Oracle已完毕，但在启动过程中，nacos.log中会有报错。原因是 nacos 启动是会判定 config_info_tag, config_info_beta表是否存在。 这个方法是直接定死的使用了limit 1，没有通过插件的方式。这个属于 nacos 的Bug，已在 github 上提交了相关问题。 \ No newline at end of file + + 目前nacos 适配Oracle已完毕，但在启动过程中，nacos.log中会有报错。 + + 问题原因：是 nacos 启动是会判定 config_info_tag, config_info_beta表是否存在。 这个方法是直接定死的使用了limit 1，没有通过插件的方式。 + + 问题归属：这个属于 nacos 的Bug，已在 github 上提交了相关问题。 + + 影响范围：只会影响到dump接口，功能不受影响 \ No newline at end of file -- Gitee From 26ac100f27d25bbf5d6758c804d8f8cc35e3b9a7 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:17:32 +0800 Subject: [PATCH 073/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index c64388e..3effcc2 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -118,4 +118,5 @@ db.pool.config.driverClassName=oracle.jdbc.OracleDriver + 目前nacos 适配Oracle已完毕，但在启动过程中，nacos.log中会有报错。 + 问题原因：是 nacos 启动是会判定 config_info_tag, config_info_beta表是否存在。 这个方法是直接定死的使用了limit 1，没有通过插件的方式。 + 问题归属：这个属于 nacos 的Bug，已在 github 上提交了相关问题。 + + 问题版本：<=2.4.1 + 影响范围：只会影响到dump接口，功能不受影响 \ No newline at end of file -- Gitee From 93b48ad59508d88ed1188795e1ab2b68c980077c Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:18:34 +0800 Subject: [PATCH 074/159] =?UTF-8?q?*=20=E6=B7=BB=E5=8A=A0=20github?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 3effcc2..a5a05da 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -117,6 +117,6 @@ db.pool.config.driverClassName=oracle.jdbc.OracleDriver 3. 目前使用Oracle的问题 + 目前nacos 适配Oracle已完毕，但在启动过程中，nacos.log中会有报错。 + 问题原因：是 nacos 启动是会判定 config_info_tag, config_info_beta表是否存在。 这个方法是直接定死的使用了limit 1，没有通过插件的方式。 - + 问题归属：这个属于 nacos 的Bug，已在 github 上提交了相关问题。 + + 问题归属：这个属于 nacos 的Bug，已在 [github 上提交了相关问题](https://github.com/alibaba/nacos/issues/12569)。 + 问题版本：<=2.4.1 + 影响范围：只会影响到dump接口，功能不受影响 \ No newline at end of file -- Gitee From 95abca1fc8b6c6037add0070bf9f69cad7ee7c14 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:41:12 +0800 Subject: [PATCH 075/159] =?UTF-8?q?*=20=E6=B7=BB=E5=8A=A0magicdata=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index a5a05da..0576362 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -72,6 +72,22 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ``` +## 支持Kingbase + + +## 支持magicdata + +1. jdbc配置 +```properties +spring.sql.init.platform=magicdata +db.num=1 +db.url.0=jdbc:magicdata://192.168.137.133:3660/theDb?currentSchema=nacos&clientEncoding=utf8 +db.user.0=username +db.password.0=thePassword +db.pool.config.driverClassName=com.bes.magicdata.Driver +``` + + ## 支持SqlServer 1. jdbc 驱动选择： 参考[微软官方说明](https://learn.microsoft.com/zh-cn/sql/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix?view=sql-server-ver16)，建议选择`12.4.1`版本 -- Gitee From ef632f38d35d6d8be28f092677a7c2a28a6cb3c8 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 30 Aug 2024 18:42:50 +0800 Subject: [PATCH 076/159] =?UTF-8?q?*=20=E6=B7=BB=E5=8A=A0=20kingbase=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 0576362..feb73ad 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -73,7 +73,15 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ``` ## 支持Kingbase - +1. jdbc配置 +```properties +spring.sql.init.platform=kingbase +db.num=1 +db.url.0=jdbc:kingbase8://192.168.137.133:5432/theDb?currentSchema=nacos&clientEncoding=utf8 +db.user.0=username +db.password.0=thePassword +db.pool.config.driverClassName=com.kingbase8.Driver +``` ## 支持magicdata -- Gitee From 1f69107e26e619709920a35f8b6192dab4fcc64a Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 30 Aug 2024 19:40:16 +0800 Subject: [PATCH 077/159] =?UTF-8?q?%=20=E5=8F=91=E5=B8=831.0.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 182 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ba81298..757768f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ ${project.groupId}:${project.artifactId}:${project.version} - nacos plugins + nacos plugins: datasource plugin (postgresql, oracle, sqlserver etc) nacosplugin-datasource @@ -31,6 +31,37 @@ 5.0.2 + https://gitee.com/coderjn/nacos-plugins + + + coderjn + coderjn + + + + + sonatype_oss + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype_oss + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + ${project.version} + scm:git:https://gitee.com/coderjn/nacos-plugins.git + https://gitee.com/coderjn/nacos-plugins.git + https://gitee.com/coderjn/nacos-plugins.git + + + + MulanPSL2 + https://gitee.com/coderjn/nacos-plugins/blob/master/LICENSE + manual + + + @@ -164,4 +195,154 @@ + + + + envHome + + D:/Program Files (x86)/GnuPG/bin/gpg + C:/Users/Administrator/AppData/Roaming/gnupg + + + + + + envCompany + + D:/Program Files (x86)/GNU/GnuPG/gpg2.exe + C:/Users/Administrator/AppData/Roaming/gnupg + + + + + + deploy + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + deploy + deploy + + deploy + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + sonatype_oss + https://s01.oss.sonatype.org + true + true + 5 + 5 + false + true + true + + + + org.apache.maven.plugins + maven-scm-plugin + 1.10.0 + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + false + false + true + false + + + + org.apache.maven.plugins + maven-scm-plugin + 1.10.0 + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.1.0 + + + attach-sources + verify + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + true + UTF-8 + UTF-8 + UTF-8 + -Xdoclint:none + false + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file -- Gitee From e0317c53c437072047aa82cbf40b9ee357c5d58b Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 30 Aug 2024 19:43:32 +0800 Subject: [PATCH 078/159] =?UTF-8?q?%=20=E5=8F=91=E5=B8=831.0.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jn/nacos/plugin/JnNacosPlugin.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 nacosplugin-all/src/main/java/com/jn/nacos/plugin/JnNacosPlugin.java diff --git a/nacosplugin-all/src/main/java/com/jn/nacos/plugin/JnNacosPlugin.java b/nacosplugin-all/src/main/java/com/jn/nacos/plugin/JnNacosPlugin.java new file mode 100644 index 0000000..9785176 --- /dev/null +++ b/nacosplugin-all/src/main/java/com/jn/nacos/plugin/JnNacosPlugin.java @@ -0,0 +1,5 @@ +package com.jn.nacos.plugin; + +public class JnNacosPlugin { + private JnNacosPlugin(){} +} -- Gitee From 0fc3ac02bbddc469132af89d79e2fa193408bf52 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 11:40:54 +0800 Subject: [PATCH 079/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/pom.xml | 9 +++- .../plugin/datasource/DatabaseTypes.java | 2 + .../DefaultNacosDatabaseDialect.java | 7 +++ .../NacosDatabaseDialectManager.java | 2 +- .../db/dm/mapper/ConfigInfoAggrMapper.java | 10 ---- .../db/dm/mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/dm/mapper/ConfigInfoMapper.java | 10 ---- .../db/dm/mapper/ConfigInfoTagMapper.java | 10 ---- .../db/dm/mapper/ConfigTagRelationMapper.java | 10 ---- .../db/dm/mapper/GroupCapacityMapper.java | 10 ---- .../db/dm/mapper/HistoryConfigInfoMapper.java | 10 ---- .../db/dm/mapper/TenantCapacityMapper.java | 10 ---- .../db/dm/mapper/TenantInfoMapper.java | 10 ---- .../kingbase/mapper/ConfigInfoAggrMapper.java | 10 ---- .../kingbase/mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/kingbase/mapper/ConfigInfoMapper.java | 10 ---- .../kingbase/mapper/ConfigInfoTagMapper.java | 10 ---- .../mapper/ConfigTagRelationMapper.java | 10 ---- .../kingbase/mapper/GroupCapacityMapper.java | 10 ---- .../mapper/HistoryConfigInfoMapper.java | 10 ---- .../kingbase/mapper/TenantCapacityMapper.java | 10 ---- .../db/kingbase/mapper/TenantInfoMapper.java | 10 ---- .../mapper/ConfigInfoAggrMapper.java | 10 ---- .../mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/magicdata/mapper/ConfigInfoMapper.java | 10 ---- .../magicdata/mapper/ConfigInfoTagMapper.java | 10 ---- .../mapper/ConfigTagRelationMapper.java | 10 ---- .../magicdata/mapper/GroupCapacityMapper.java | 10 ---- .../mapper/HistoryConfigInfoMapper.java | 10 ---- .../mapper/TenantCapacityMapper.java | 10 ---- .../db/magicdata/mapper/TenantInfoMapper.java | 10 ---- .../db/mssql/mapper/ConfigInfoAggrMapper.java | 10 ---- .../db/mssql/mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/mssql/mapper/ConfigInfoMapper.java | 10 ---- .../db/mssql/mapper/ConfigInfoTagMapper.java | 10 ---- .../mssql/mapper/ConfigTagRelationMapper.java | 10 ---- .../db/mssql/mapper/GroupCapacityMapper.java | 10 ---- .../mssql/mapper/HistoryConfigInfoMapper.java | 10 ---- .../db/mssql/mapper/TenantCapacityMapper.java | 10 ---- .../db/mssql/mapper/TenantInfoMapper.java | 10 ---- .../mapper/ConfigInfoAggrMapper.java | 10 ---- .../mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/opengauss/mapper/ConfigInfoMapper.java | 10 ---- .../opengauss/mapper/ConfigInfoTagMapper.java | 10 ---- .../mapper/ConfigTagRelationMapper.java | 10 ---- .../opengauss/mapper/GroupCapacityMapper.java | 10 ---- .../mapper/HistoryConfigInfoMapper.java | 10 ---- .../mapper/TenantCapacityMapper.java | 10 ---- .../db/opengauss/mapper/TenantInfoMapper.java | 10 ---- .../oracle/mapper/ConfigInfoAggrMapper.java | 10 ---- .../oracle/mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/oracle/mapper/ConfigInfoMapper.java | 10 ---- .../db/oracle/mapper/ConfigInfoTagMapper.java | 10 ---- .../mapper/ConfigTagRelationMapper.java | 10 ---- .../db/oracle/mapper/GroupCapacityMapper.java | 10 ---- .../mapper/HistoryConfigInfoMapper.java | 10 ---- .../oracle/mapper/TenantCapacityMapper.java | 10 ---- .../db/oracle/mapper/TenantInfoMapper.java | 10 ---- .../db/oscar/mapper/ConfigInfoAggrMapper.java | 10 ---- .../db/oscar/mapper/ConfigInfoBetaMapper.java | 10 ---- .../db/oscar/mapper/ConfigInfoMapper.java | 10 ---- .../db/oscar/mapper/ConfigInfoTagMapper.java | 10 ---- .../oscar/mapper/ConfigTagRelationMapper.java | 10 ---- .../db/oscar/mapper/GroupCapacityMapper.java | 10 ---- .../oscar/mapper/HistoryConfigInfoMapper.java | 10 ---- .../db/oscar/mapper/TenantCapacityMapper.java | 10 ---- .../db/oscar/mapper/TenantInfoMapper.java | 10 ---- .../mapper/ConfigInfoAggrMapper.java | 10 ---- .../mapper/ConfigInfoBetaMapper.java | 10 ---- .../postgresql/mapper/ConfigInfoMapper.java | 10 ---- .../mapper/ConfigInfoTagMapper.java | 10 ---- .../mapper/ConfigTagRelationMapper.java | 10 ---- .../mapper/GroupCapacityMapper.java | 10 ---- .../mapper/HistoryConfigInfoMapper.java | 10 ---- .../mapper/TenantCapacityMapper.java | 10 ---- .../postgresql/mapper/TenantInfoMapper.java | 10 ---- .../plugin/datasource/mapper/BaseMapper.java | 31 ++++++++++-- ...r.java => CommonConfigInfoAggrMapper.java} | 5 +- ...r.java => CommonConfigInfoBetaMapper.java} | 5 +- ...apper.java => CommonConfigInfoMapper.java} | 5 +- ...er.java => CommonConfigInfoTagMapper.java} | 5 +- ...ava => CommonConfigTagRelationMapper.java} | 5 +- ...er.java => CommonGroupCapacityMapper.java} | 5 +- ...ava => CommonHistoryConfigInfoMapper.java} | 5 +- ...r.java => CommonTenantCapacityMapper.java} | 5 +- ...apper.java => CommonTenantInfoMapper.java} | 5 +- pom.xml | 50 +++++++++++++++++++ 87 files changed, 105 insertions(+), 761 deletions(-) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseConfigInfoAggrMapper.java => CommonConfigInfoAggrMapper.java} (88%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseConfigInfoBetaMapper.java => CommonConfigInfoBetaMapper.java} (85%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseConfigInfoMapper.java => CommonConfigInfoMapper.java} (98%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseConfigInfoTagMapper.java => CommonConfigInfoTagMapper.java} (84%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseConfigTagRelationMapper.java => CommonConfigTagRelationMapper.java} (96%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseGroupCapacityMapper.java => CommonGroupCapacityMapper.java} (84%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseHistoryConfigInfoMapper.java => CommonHistoryConfigInfoMapper.java} (93%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseTenantCapacityMapper.java => CommonTenantCapacityMapper.java} (84%) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/{BaseTenantInfoMapper.java => CommonTenantInfoMapper.java} (39%) diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 58f8c74..bda2b28 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -33,7 +33,14 @@ - + + com.alibaba.nacos + nacos-sys + + + org.springframework + spring-core + \ No newline at end of file diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index 902c625..d037abc 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -11,4 +11,6 @@ public class DatabaseTypes extends DataSourceConstant { public static final String MSSQL = "sqlserver"; public static final String POSTGRESQL = "postgresql"; public static final String OSCAR = "oscar"; + + public static final String UNSUPPORTED = "unsupported"; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java new file mode 100644 index 0000000..0559556 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java @@ -0,0 +1,7 @@ +package com.jn.nacos.plugin.datasource; + +public class DefaultNacosDatabaseDialect extends NacosDatabaseDialect{ + public DefaultNacosDatabaseDialect(String name) { + super(name); + } +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java index a2260ef..34e806e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java @@ -28,7 +28,7 @@ public class NacosDatabaseDialectManager { public NacosDatabaseDialect getDialect(String databaseType){ NacosDatabaseDialect dialect = this.dialectMap.get(databaseType); if(dialect==null){ - throw new RuntimeException("unsupported database dialect: " + databaseType); + dialect = new DefaultNacosDatabaseDialect(databaseType); } return dialect; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 8ec3855..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index dfe07ff..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java deleted file mode 100644 index a9cd0aa..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index 86aada5..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index b3ee2b1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java deleted file mode 100644 index 353ac1f..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index e54fcaa..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java deleted file mode 100644 index 5db4922..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java deleted file mode 100644 index a8784ac..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.DAMENG); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 4ef0b9e..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index 1a87e5f..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java deleted file mode 100644 index 27a937a..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index d4f9929..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 1d742b6..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java deleted file mode 100644 index 202fa30..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 9a4db34..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java deleted file mode 100644 index 8bccd7f..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java deleted file mode 100644 index 0d2a6eb..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 68118ea..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index 8b64672..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java deleted file mode 100644 index 8b071fc..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index 1865438..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 4b23944..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java deleted file mode 100644 index d97a7c8..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index fa022d5..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java deleted file mode 100644 index 5ec1f0d..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java deleted file mode 100644 index 3c6eccb..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 5c2c18f..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index 024b099..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java deleted file mode 100644 index b60a3f7..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index ad6014c..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 087f4db..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java deleted file mode 100644 index 108478c..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 13c7965..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java deleted file mode 100644 index ccbf1a3..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java deleted file mode 100644 index e763989..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.mssql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.MSSQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index ca0155f..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index 15b10a7..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java deleted file mode 100644 index aaa76c7..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index 6c15315..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 4eb4e70..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java deleted file mode 100644 index c99fb90..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 7cda7fe..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java deleted file mode 100644 index 6172815..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java deleted file mode 100644 index fb4bdc7..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 087511b..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index 49e6ee7..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java deleted file mode 100644 index 5dd1ac3..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index 0656f99..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 9d2a021..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java deleted file mode 100644 index deae608..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 3e2edb9..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java deleted file mode 100644 index f441945..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java deleted file mode 100644 index 148c1e6..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 5a1baab..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index da13a75..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java deleted file mode 100644 index 8fa5992..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index 44724eb..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 96e1e81..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java deleted file mode 100644 index f25d4b4..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 07bcc4d..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java deleted file mode 100644 index ff1fb87..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java deleted file mode 100644 index 7fd306e..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java deleted file mode 100644 index 02bf79e..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoAggrMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoAggrMapper; - -public class ConfigInfoAggrMapper extends BaseConfigInfoAggrMapper { - public ConfigInfoAggrMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java deleted file mode 100644 index cf737fb..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoBetaMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoBetaMapper; - -public class ConfigInfoBetaMapper extends BaseConfigInfoBetaMapper { - public ConfigInfoBetaMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java deleted file mode 100644 index af29901..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoMapper; - -public class ConfigInfoMapper extends BaseConfigInfoMapper { - public ConfigInfoMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java deleted file mode 100644 index c8dc004..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigInfoTagMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigInfoTagMapper; - -public class ConfigInfoTagMapper extends BaseConfigInfoTagMapper { - public ConfigInfoTagMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java deleted file mode 100644 index 60ceaae..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/ConfigTagRelationMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseConfigTagRelationMapper; - -public class ConfigTagRelationMapper extends BaseConfigTagRelationMapper { - public ConfigTagRelationMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java deleted file mode 100644 index 61b7015..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/GroupCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseGroupCapacityMapper; - -public class GroupCapacityMapper extends BaseGroupCapacityMapper { - public GroupCapacityMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java deleted file mode 100644 index 086d1ff..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/HistoryConfigInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseHistoryConfigInfoMapper; - -public class HistoryConfigInfoMapper extends BaseHistoryConfigInfoMapper { - public HistoryConfigInfoMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java deleted file mode 100644 index ff3354a..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantCapacityMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantCapacityMapper; - -public class TenantCapacityMapper extends BaseTenantCapacityMapper { - public TenantCapacityMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java deleted file mode 100644 index 19095b1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/mapper/TenantInfoMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql.mapper; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.mapper.BaseTenantInfoMapper; - -public class TenantInfoMapper extends BaseTenantInfoMapper { - public TenantInfoMapper() { - super(DatabaseTypes.POSTGRESQL); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 129fb34..a64e49e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -1,20 +1,45 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; +import com.alibaba.nacos.sys.env.EnvUtil; +import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; +import com.jn.langx.util.Strings; +import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; +import com.jn.sqlhelper.dialect.Dialect; +import com.jn.sqlhelper.dialect.DialectRegistry; public abstract class BaseMapper extends AbstractMapper { private final String databaseId; protected NacosDatabaseDialect dialect; - protected BaseMapper(String databaseId) { - Preconditions.checkNotEmpty(databaseId, "database id is empty"); - this.databaseId = databaseId; + protected BaseMapper() { + this.databaseId = getConfiguredDatabaseId(); + Preconditions.checkArgument(Objs.equals(DatabaseTypes.UNSUPPORTED, databaseId), "database {} is unsupported"); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } + private String getConfiguredDatabaseId(){ + String databaseId = EnvUtil.getProperty("spring.sql.init.platform"); + if(Strings.isBlank(databaseId)){ + // 内嵌数据库 derby + if (EnvUtil.getStandaloneMode()){ + databaseId = DatabaseTypes.DERBY; + } + else{ // 默认数据库 MySQL + databaseId = DatabaseTypes.MSSQL; + } + }else{ + Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseId); + if(dialect==null){ + databaseId = DatabaseTypes.UNSUPPORTED; + } + } + return databaseId; + } + @Override public String getDataSource() { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java similarity index 88% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java index fb3e926..3f09833 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java @@ -9,10 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public abstract class BaseConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { - protected BaseConfigInfoAggrMapper(String databaseId) { - super(databaseId); - } +public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { @Override public MapperResult findConfigInfoAggrByPageFetchRows(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java similarity index 85% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index af4ffd0..d7869ef 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -8,10 +8,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public abstract class BaseConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { - protected BaseConfigInfoBetaMapper(String databaseId) { - super(databaseId); - } +public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { @Override public MapperResult findAllConfigInfoBetaForDumpAllFetchRows(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java similarity index 98% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index b1078a2..4143b44 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -15,11 +15,8 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -public abstract class BaseConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { +public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { - protected BaseConfigInfoMapper(String databaseId) { - super(databaseId); - } @Override public MapperResult findConfigInfoByAppFetchRows(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java similarity index 84% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index a7f759e..832b5a6 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -8,10 +8,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public abstract class BaseConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { - protected BaseConfigInfoTagMapper(String databaseId) { - super(databaseId); - } +public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { @Override public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java similarity index 96% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java index 4b8ece5..2854fd5 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java @@ -11,10 +11,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.ArrayList; import java.util.List; -public abstract class BaseConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { - protected BaseConfigTagRelationMapper(String databaseId) { - super(databaseId); - } +public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonGroupCapacityMapper.java similarity index 84% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonGroupCapacityMapper.java index cf9acdd..2feadde 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseGroupCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonGroupCapacityMapper.java @@ -10,10 +10,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @SuppressWarnings("all") -public abstract class BaseGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { - protected BaseGroupCapacityMapper(String databaseId) { - super(databaseId); - } +public class CommonGroupCapacityMapper extends BaseMapper implements GroupCapacityMapper { @Override public MapperResult selectGroupInfoBySize(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java similarity index 93% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index b9bb225..f6b6d2d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -9,10 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public abstract class BaseHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { - protected BaseHistoryConfigInfoMapper(String databaseId) { - super(databaseId); - } +public class CommonHistoryConfigInfoMapper extends BaseMapper implements HistoryConfigInfoMapper { @Override public MapperResult removeConfigHistory(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java similarity index 84% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java index aec85fb..1b663c8 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java @@ -9,10 +9,7 @@ import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; -public abstract class BaseTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { - protected BaseTenantCapacityMapper(String databaseId) { - super(databaseId); - } +public class CommonTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { @Override public MapperResult getCapacityList4CorrectUsage(MapperContext context) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantInfoMapper.java similarity index 39% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantInfoMapper.java index 43eb17e..bb8906e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseTenantInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantInfoMapper.java @@ -2,8 +2,5 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.plugin.datasource.mapper.TenantInfoMapper; -public abstract class BaseTenantInfoMapper extends BaseMapper implements TenantInfoMapper { - protected BaseTenantInfoMapper(String databaseId) { - super(databaseId); - } +public class CommonTenantInfoMapper extends BaseMapper implements TenantInfoMapper { } diff --git a/pom.xml b/pom.xml index 757768f..1fefc0f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ 5.4.4 1.17.0 2.4.1 + 5.3.34 5.0.2 @@ -122,6 +123,38 @@ + + com.alibaba.nacos + nacos-sys + 2.2.4.3.alpha-4 + provided + + + org.springframework.boot + spring-boot-starter + + + org.springframework + spring-test + + + org.springframework.boot + spring-boot-test + + + com.alibaba.nacos + nacos-common + + + org.codehaus.jackson + jackson-core-asl + + + com.alibaba.nacos + nacos-custom-environment-plugin + + + commons-codec commons-codec @@ -133,9 +166,26 @@ sqlhelper-dialect ${sqlhelper.version} + + org.springframework + spring-core + ${spring.version} + provided + + + + Volcengine + Volcengine( used for nacos-sys ) + https://artifact.bytedance.com/repository/Volcengine/ + + true + + + + org.openjdk.jmh -- Gitee From 863c1a8a3310f72dfc9da647197bf43e272ba7d5 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 11:42:39 +0800 Subject: [PATCH 080/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DefaultNacosDatabaseDialect.java | 2 +- ...baba.nacos.plugin.datasource.mapper.Mapper | 97 ++----------------- 2 files changed, 10 insertions(+), 89 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java index 0559556..9c7d37a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DefaultNacosDatabaseDialect.java @@ -1,6 +1,6 @@ package com.jn.nacos.plugin.datasource; -public class DefaultNacosDatabaseDialect extends NacosDatabaseDialect{ +class DefaultNacosDatabaseDialect extends NacosDatabaseDialect{ public DefaultNacosDatabaseDialect(String name) { super(name); } diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper b/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper index defd257..81db9c0 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.alibaba.nacos.plugin.datasource.mapper.Mapper @@ -1,88 +1,9 @@ -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoAggrMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoAggrMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoBetaMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoBetaMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigInfoTagMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigInfoTagMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.ConfigTagRelationMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.ConfigTagRelationMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.GroupCapacityMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.GroupCapacityMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.HistoryConfigInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.HistoryConfigInfoMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantCapacityMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantCapacityMapper - - -com.jn.nacos.plugin.datasource.db.dm.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.kingbase.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.magicdata.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.mssql.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.opengauss.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.oracle.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.oscar.mapper.TenantInfoMapper -com.jn.nacos.plugin.datasource.db.postgresql.mapper.TenantInfoMapper +com.jn.nacos.plugin.datasource.mapper.CommonConfigInfoAggrMapper +com.jn.nacos.plugin.datasource.mapper.CommonConfigInfoBetaMapper +com.jn.nacos.plugin.datasource.mapper.CommonConfigInfoMapper +com.jn.nacos.plugin.datasource.mapper.CommonConfigInfoTagMapper +com.jn.nacos.plugin.datasource.mapper.CommonConfigTagRelationMapper +com.jn.nacos.plugin.datasource.mapper.CommonGroupCapacityMapper +com.jn.nacos.plugin.datasource.mapper.CommonHistoryConfigInfoMapper +com.jn.nacos.plugin.datasource.mapper.CommonTenantCapacityMapper +com.jn.nacos.plugin.datasource.mapper.CommonTenantInfoMapper -- Gitee From 0f2630f8f3ee73cff89bdd720e6e908f795351f9 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 11:44:33 +0800 Subject: [PATCH 081/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/db/dm/DmDatabaseDialect.java | 12 ------------ .../db/kingbase/KingbaseDatabaseDialect.java | 10 ---------- .../db/magicdata/MagicDataDatabaseDialect.java | 10 ---------- .../db/opengauss/OpenGaussDatabaseDialect.java | 10 ---------- .../db/oracle/OracleDatabaseDialect.java | 10 ---------- .../datasource/db/oscar/OscarDatabaseDialect.java | 10 ---------- .../db/postgresql/PostgresqlDatabaseDialect.java | 14 -------------- 7 files changed, 76 deletions(-) delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java deleted file mode 100644 index b30e8d3..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - - -public class DmDatabaseDialect extends NacosDatabaseDialect { - public DmDatabaseDialect() { - super(DatabaseTypes.DAMENG); - } - -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java deleted file mode 100644 index 9f7dde1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class KingbaseDatabaseDialect extends NacosDatabaseDialect { - public KingbaseDatabaseDialect() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java deleted file mode 100644 index ac6291e..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class MagicDataDatabaseDialect extends NacosDatabaseDialect { - public MagicDataDatabaseDialect() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java deleted file mode 100644 index 1b2b5d1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OpenGaussDatabaseDialect extends NacosDatabaseDialect { - public OpenGaussDatabaseDialect(){ - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java deleted file mode 100644 index b366d14..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OracleDatabaseDialect extends NacosDatabaseDialect { - public OracleDatabaseDialect() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java deleted file mode 100644 index da798bd..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OscarDatabaseDialect extends NacosDatabaseDialect { - public OscarDatabaseDialect(){ - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java deleted file mode 100644 index 798f995..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql; - -import com.jn.langx.util.collection.Maps; -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -import java.util.Map; - -public class PostgresqlDatabaseDialect extends NacosDatabaseDialect { - public PostgresqlDatabaseDialect(){ - super(DatabaseTypes.POSTGRESQL); - } - -} -- Gitee From 3d01419970b078c6ed0c9f5be18ebadf64889be3 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 11:44:33 +0800 Subject: [PATCH 082/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/db/dm/DmDatabaseDialect.java | 12 ------------ .../db/kingbase/KingbaseDatabaseDialect.java | 10 ---------- .../db/magicdata/MagicDataDatabaseDialect.java | 10 ---------- .../db/opengauss/OpenGaussDatabaseDialect.java | 10 ---------- .../db/oracle/OracleDatabaseDialect.java | 10 ---------- .../datasource/db/oscar/OscarDatabaseDialect.java | 10 ---------- .../db/postgresql/PostgresqlDatabaseDialect.java | 14 -------------- 7 files changed, 76 deletions(-) delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java delete mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java deleted file mode 100644 index b30e8d3..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/dm/DmDatabaseDialect.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.dm; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - - -public class DmDatabaseDialect extends NacosDatabaseDialect { - public DmDatabaseDialect() { - super(DatabaseTypes.DAMENG); - } - -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java deleted file mode 100644 index 9f7dde1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.kingbase; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class KingbaseDatabaseDialect extends NacosDatabaseDialect { - public KingbaseDatabaseDialect() { - super(DatabaseTypes.KINGBASE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java deleted file mode 100644 index ac6291e..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDataDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.magicdata; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class MagicDataDatabaseDialect extends NacosDatabaseDialect { - public MagicDataDatabaseDialect() { - super(DatabaseTypes.MAGICDATA); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java deleted file mode 100644 index 1b2b5d1..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/opengauss/OpenGaussDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.opengauss; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OpenGaussDatabaseDialect extends NacosDatabaseDialect { - public OpenGaussDatabaseDialect(){ - super(DatabaseTypes.OPENGAUSS); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java deleted file mode 100644 index b366d14..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oracle; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OracleDatabaseDialect extends NacosDatabaseDialect { - public OracleDatabaseDialect() { - super(DatabaseTypes.ORACLE); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java deleted file mode 100644 index da798bd..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oscar/OscarDatabaseDialect.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.oscar; - -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -public class OscarDatabaseDialect extends NacosDatabaseDialect { - public OscarDatabaseDialect(){ - super(DatabaseTypes.OSCAR); - } -} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java deleted file mode 100644 index 798f995..0000000 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresqlDatabaseDialect.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jn.nacos.plugin.datasource.db.postgresql; - -import com.jn.langx.util.collection.Maps; -import com.jn.nacos.plugin.datasource.DatabaseTypes; -import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; - -import java.util.Map; - -public class PostgresqlDatabaseDialect extends NacosDatabaseDialect { - public PostgresqlDatabaseDialect(){ - super(DatabaseTypes.POSTGRESQL); - } - -} -- Gitee From 9b10862b2328ed154ae9e59c2ad929666df0489a Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 14:07:12 +0800 Subject: [PATCH 083/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jn/nacos/plugin/datasource/mapper/BaseMapper.java | 2 +- .../com.jn.nacos.plugin.datasource.NacosDatabaseDialect | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index a64e49e..7dc38ad 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -17,7 +17,7 @@ public abstract class BaseMapper extends AbstractMapper { protected BaseMapper() { this.databaseId = getConfiguredDatabaseId(); - Preconditions.checkArgument(Objs.equals(DatabaseTypes.UNSUPPORTED, databaseId), "database {} is unsupported"); + Preconditions.checkTrue(!Objs.equals(DatabaseTypes.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect index 0f3071c..97fa807 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect @@ -1,8 +1 @@ -com.jn.nacos.plugin.datasource.db.dm.DmDatabaseDialect -com.jn.nacos.plugin.datasource.db.kingbase.KingbaseDatabaseDialect -com.jn.nacos.plugin.datasource.db.magicdata.MagicDataDatabaseDialect -com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect -com.jn.nacos.plugin.datasource.db.opengauss.OpenGaussDatabaseDialect -com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect -com.jn.nacos.plugin.datasource.db.oscar.OscarDatabaseDialect -com.jn.nacos.plugin.datasource.db.postgresql.PostgresqlDatabaseDialect \ No newline at end of file +com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect \ No newline at end of file -- Gitee From 2b46949b3cb72a5af0b4a3a7ce4ea1f7a4dc2423 Mon Sep 17 00:00:00 2001 From: coderjn Date: Sat, 31 Aug 2024 14:20:44 +0800 Subject: [PATCH 084/159] =?UTF-8?q?%=20=E5=87=86=E5=A4=872.0.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 424a62d..ce1b6a5 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 1.0.0 + 2.0.0 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index aaf6589..1e309c9 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 1.0.0 + 2.0.0 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index bda2b28..0defaaa 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 1.0.0 + 2.0.0 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index 1fefc0f..816ca7b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 1.0.0 + 2.0.0 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From 2a0556ed7847a102bbc3675ea0823b803f756ed5 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 14:56:29 +0800 Subject: [PATCH 085/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 22 ++++++++++++++++++- .../db/derby/DerbyDatabaseDialect.java | 16 ++++++++++++++ .../db/mysql/MysqlDatabaseDialect.java | 17 ++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index feb73ad..ef8bc2a 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -116,9 +116,29 @@ db.password.0=SA123456Pswd db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver ``` +## MySQL + +1. schema初始化 +```shell +mysql --password=root_password --host=localhost --port=3306 --user root < create_schema.sql +mysql --password=root_password --host=localhost --port=3306 --user root < create_tables.sql +``` +2. JDBC配置 +```properties +# MySQL +spring.sql.init.platform=mysql +db.num=1 +db.url.0=jdbc:mysql://192.168.137.133:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=30000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.user.0=root +db.password.0=root_password +db.pool.config.driverClassName=com.mysql.cj.jdbc.Driver +``` + + + ## 支持Oracle 1. 脚本执行 -```shell +:q:q```shell # 先用 system 创建 C##NACOS用户 sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-schema.sql # 再用 C##NACOS用户创建表 diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java new file mode 100644 index 0000000..01b822b --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java @@ -0,0 +1,16 @@ +package com.jn.nacos.plugin.datasource.db.derby; + +import com.alibaba.nacos.plugin.datasource.enums.derby.TrustedDerbylFunctionEnum; +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class DerbyDatabaseDialect extends NacosDatabaseDialect { + public DerbyDatabaseDialect() { + super(DatabaseTypes.DERBY); + } + + @Override + public String getFunction(String functionName) { + return TrustedDerbylFunctionEnum.getFunctionByName(functionName); + } +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java new file mode 100644 index 0000000..062c2f8 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java @@ -0,0 +1,17 @@ +package com.jn.nacos.plugin.datasource.db.mysql; + +import com.alibaba.nacos.plugin.datasource.enums.mysql.TrustedMysqlFunctionEnum; +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + + +public class MysqlDatabaseDialect extends NacosDatabaseDialect { + protected MysqlDatabaseDialect() { + super(DatabaseTypes.MYSQL); + } + + @Override + public String getFunction(String functionName) { + return TrustedMysqlFunctionEnum.getFunctionByName(functionName); + } +} -- Gitee From 9c79db335c245dabb94f59a4810a48a195131dc2 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 14:57:47 +0800 Subject: [PATCH 086/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.1=20=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index ce1b6a5..615242f 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.0 + 2.0.1 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index 1e309c9..05751ae 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.0 + 2.0.1 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 0defaaa..c535bca 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.0 + 2.0.1 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index 816ca7b..06d8fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.0 + 2.0.1 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From 3118fb026636270dd3d062642b105bf42e9a28ce Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 15:08:53 +0800 Subject: [PATCH 087/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=20mapper=20?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/DatabaseTypes.java | 7 +++++++ .../jn/nacos/plugin/datasource/mapper/BaseMapper.java | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java index d037abc..2aea55d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java @@ -12,5 +12,12 @@ public class DatabaseTypes extends DataSourceConstant { public static final String POSTGRESQL = "postgresql"; public static final String OSCAR = "oscar"; + /** + * 当 spring.sql.init.platform 配置没有配置，或者配置了 derby, mysql 时，都会将 自定义的插件设置为 undefined + */ + public static final String UNDEFINED = "undefined"; + /** + * 当spring.sql.init.platform 配置了一个没有支持的数据库时，则会被命名为 unsupported + */ public static final String UNSUPPORTED = "unsupported"; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 7dc38ad..939d0b9 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -23,6 +23,10 @@ public abstract class BaseMapper extends AbstractMapper { private String getConfiguredDatabaseId(){ String databaseId = EnvUtil.getProperty("spring.sql.init.platform"); + if(Strings.isBlank(databaseId)){ + // 这个是 nacos 中更早的配置 datasource 类型的方式 + databaseId = EnvUtil.getProperty("spring.datasource.platform"); + } if(Strings.isBlank(databaseId)){ // 内嵌数据库 derby if (EnvUtil.getStandaloneMode()){ @@ -37,6 +41,11 @@ public abstract class BaseMapper extends AbstractMapper { databaseId = DatabaseTypes.UNSUPPORTED; } } + + // 因为 mysql 不支持 在子查询中 的limit，所以 不使用自定义的SQL，而使用官方的插件 + if(Strings.isBlank(databaseId) || Objs.equals(DatabaseTypes.DERBY, databaseId) || Objs.equals(DatabaseTypes.MYSQL, databaseId)){ + databaseId=DatabaseTypes.UNDEFINED; + } return databaseId; } -- Gitee From 941d91f94df7e739f22664b3af527d15e9c7a61d Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 15:20:51 +0800 Subject: [PATCH 088/159] =?UTF-8?q?*=20=E5=B0=BD=E9=87=8F=E9=81=BF?= =?UTF-8?q?=E5=85=8Dsubquery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mapper/CommonHistoryConfigInfoMapper.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index f6b6d2d..ad9dfdf 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -17,10 +17,7 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); RowSelection rowSelection = new RowSelection(0, pageSize); - String subquery = "SELECT id FROM his_config_info WHERE gmt_modified < ? "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - - String sql = "DELETE FROM his_config_info WHERE id IN( " + pagedSubquery + ")"; + String sql = "DELETE FROM his_config_info WHERE gmt_modified < ?"; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); -- Gitee From 47f2649a7ab6a5556ddab7e7258943a12f1224e8 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 16:40:20 +0800 Subject: [PATCH 089/159] =?UTF-8?q?Revert=20"*=20=E5=B0=BD=E9=87=8F?= =?UTF-8?q?=E9=81=BF=E5=85=8Dsubquery"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 941d91f94df7e739f22664b3af527d15e9c7a61d. --- .../datasource/mapper/CommonHistoryConfigInfoMapper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index ad9dfdf..f6b6d2d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -17,7 +17,10 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); RowSelection rowSelection = new RowSelection(0, pageSize); - String sql = "DELETE FROM his_config_info WHERE gmt_modified < ?"; + String subquery = "SELECT id FROM his_config_info WHERE gmt_modified < ? "; + String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + + String sql = "DELETE FROM his_config_info WHERE id IN( " + pagedSubquery + ")"; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME)); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); -- Gitee From 23f9c9c69fd64d3233fa71b8fa8aae1357c22888 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 18:03:38 +0800 Subject: [PATCH 090/159] =?UTF-8?q?*=20=E5=AF=B9=E5=AD=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84SQL=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/NacosDatabaseDialect.java | 9 +++++++++ .../mapper/CommonConfigInfoBetaMapper.java | 7 ++++--- .../mapper/CommonConfigInfoMapper.java | 16 ++++++++-------- .../mapper/CommonConfigInfoTagMapper.java | 4 ++-- .../mapper/CommonHistoryConfigInfoMapper.java | 11 ++++------- pom.xml | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 5998224..07d4c8a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -94,10 +94,19 @@ public abstract class NacosDatabaseDialect { return this.delegate.getLimitSql(sql, rowSelection); } + public String getLimitSql(String sql, boolean subQuery, RowSelection rowSelection){ + return this.delegate.getLimitSql(sql, subQuery, rowSelection); + } + public List rebuildParameters(List queryParams, RowSelection selection){ return this.delegate.rebuildParameters(selection, queryParams); } + public List rebuildParameters(boolean subquery, List queryParams, RowSelection selection){ + return this.delegate.rebuildParameters(subquery,selection, queryParams); + } + + public String getName() { return name; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index d7869ef..7f0f1cb 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -6,6 +6,7 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; +import java.util.ArrayList; import java.util.List; public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { @@ -17,13 +18,13 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo RowSelection rowSelection = new RowSelection(startRow, pageSize); String subquery = "SELECT id FROM config_info_beta ORDER BY id "; - subquery = getDialect().getLimitSql(subquery, rowSelection); + subquery = getDialect().getLimitSql(subquery, true, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + " FROM ( " + subquery + " )" + " g, config_info_beta t WHERE g.id = t.id"; List paramList = Lists.newArrayList(); - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(true,paramList, rowSelection); - return new MapperResult(sql, paramList); + return new MapperResult(sql, pagedParams); } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 4143b44..e17f916 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -53,11 +53,11 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigKey(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery, true, rowSelection); String sql = " SELECT data_id,group_id,app_name FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID)); - List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, queryParams, rowSelection); return new MapperResult(sql, pagedParams); } @@ -65,9 +65,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); String sql = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; - List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -139,10 +139,10 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -270,11 +270,11 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigInfoFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), context.getPageSize()); - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index 832b5a6..9778a7e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -14,9 +14,9 @@ public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoT public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = " SELECT id FROM config_info_tag ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery, true, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info_tag t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index f6b6d2d..8b840ac 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -15,14 +15,11 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History public MapperResult removeConfigHistory(MapperContext context) { int pageSize = Integer.parseInt(context.getWhereParameter(FieldConstant.LIMIT_SIZE).toString()); - RowSelection rowSelection = new RowSelection(0, pageSize); - - String subquery = "SELECT id FROM his_config_info WHERE gmt_modified < ? "; - String pagedSubquery = getDialect().getLimitSql(subquery, rowSelection); - - String sql = "DELETE FROM his_config_info WHERE id IN( " + pagedSubquery + ")"; - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME)); + RowSelection rowSelection = new RowSelection(0, pageSize); + String sql = "DELETE FROM his_config_info WHERE gmt_modified < ? "; + sql = getDialect().getLimitSql(sql, rowSelection); + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), pageSize); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/pom.xml b/pom.xml index 06d8fd2..acde4fa 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 1.17.0 2.4.1 5.3.34 - 5.0.2 + 5.0.4 https://gitee.com/coderjn/nacos-plugins -- Gitee From e8521de348c9364199f3e1e8a074cf4d0834d384 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 2 Sep 2024 18:31:57 +0800 Subject: [PATCH 091/159] =?UTF-8?q?*=20=E5=AF=B9=E5=AD=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84SQL=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mapper/CommonConfigInfoMapper.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index e17f916..8c9ad01 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -49,6 +49,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * unused + */ @Override public MapperResult findAllConfigKey(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); @@ -61,6 +64,10 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + /** + * unused + */ @Override public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); @@ -135,6 +142,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * unused + */ @Override public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); @@ -266,6 +276,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * unused + */ @Override public MapperResult findAllConfigInfoFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); -- Gitee From 60cdd88eb82882d14adec0bbc888005fd9045018 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 3 Sep 2024 10:52:24 +0800 Subject: [PATCH 092/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/NacosDatabaseDialect.java | 9 ++++----- .../mapper/CommonConfigInfoBetaMapper.java | 4 ++-- .../mapper/CommonConfigInfoMapper.java | 16 ++++++++-------- .../mapper/CommonConfigInfoTagMapper.java | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 07d4c8a..fe671a8 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -94,19 +94,18 @@ public abstract class NacosDatabaseDialect { return this.delegate.getLimitSql(sql, rowSelection); } - public String getLimitSql(String sql, boolean subQuery, RowSelection rowSelection){ + public String getLimitSql(String sql, boolean subQuery, boolean useLimitVariable, RowSelection rowSelection){ return this.delegate.getLimitSql(sql, subQuery, rowSelection); } public List rebuildParameters(List queryParams, RowSelection selection){ - return this.delegate.rebuildParameters(selection, queryParams); + return rebuildParameters(false, true, queryParams, selection); } - public List rebuildParameters(boolean subquery, List queryParams, RowSelection selection){ - return this.delegate.rebuildParameters(subquery,selection, queryParams); + public List rebuildParameters(boolean subquery, boolean useLimitVariable, List queryParams, RowSelection selection){ + return this.delegate.rebuildParameters(subquery,useLimitVariable, selection, queryParams); } - public String getName() { return name; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index 7f0f1cb..d1a1145 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -18,12 +18,12 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo RowSelection rowSelection = new RowSelection(startRow, pageSize); String subquery = "SELECT id FROM config_info_beta ORDER BY id "; - subquery = getDialect().getLimitSql(subquery, true, rowSelection); + subquery = getDialect().getLimitSql(subquery, true, true, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + " FROM ( " + subquery + " )" + " g, config_info_beta t WHERE g.id = t.id"; List paramList = Lists.newArrayList(); - List pagedParams = getDialect().rebuildParameters(true,paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true, paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 8c9ad01..9e07ad7 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -56,11 +56,11 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigKey(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery, true,true, rowSelection); String sql = " SELECT data_id,group_id,app_name FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID)); - List pagedParams = getDialect().rebuildParameters(true, queryParams, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true, queryParams, rowSelection); return new MapperResult(sql, pagedParams); } @@ -72,9 +72,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); String sql = "SELECT t.id,data_id,group_id,content,md5 " + " FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; - List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -149,10 +149,10 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } @@ -283,11 +283,11 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findAllConfigInfoFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery,true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), context.getPageSize()); - List pagedParams = getDialect().rebuildParameters(true, paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(true,true, paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index 9778a7e..fdbc10b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -14,9 +14,9 @@ public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoT public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = " SELECT id FROM config_info_tag ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery, true,true, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info_tag t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(true, Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true,Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } -- Gitee From afd14da2f1d0a0dc650820b32890cfebdc320e8c Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 3 Sep 2024 11:18:39 +0800 Subject: [PATCH 093/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mapper/CommonConfigInfoAggrMapper.java | 4 ++-- .../datasource/mapper/CommonConfigInfoBetaMapper.java | 7 +++++-- .../datasource/mapper/CommonConfigInfoTagMapper.java | 7 +++++-- .../datasource/mapper/CommonHistoryConfigInfoMapper.java | 7 +++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java index 3f09833..a5226cd 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java @@ -23,9 +23,9 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo String sql = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? ORDER BY datum_id "; List paramList = Lists.newArrayList(dataId, groupId, tenantId); - sql = getDialect().getLimitSql(sql, rowSelection); + sql = getDialect().getLimitSql(sql, false, true, rowSelection); - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(false, true,paramList, rowSelection); return new MapperResult(sql, pagedParams); } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index d1a1145..6181794 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -11,6 +11,9 @@ import java.util.List; public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { + /** + * 当前nacos版本，不能使用 ? 用作 limit, offset 参数 + */ @Override public MapperResult findAllConfigInfoBetaForDumpAllFetchRows(MapperContext context) { int startRow = context.getStartRow(); @@ -18,12 +21,12 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo RowSelection rowSelection = new RowSelection(startRow, pageSize); String subquery = "SELECT id FROM config_info_beta ORDER BY id "; - subquery = getDialect().getLimitSql(subquery, true, true, rowSelection); + subquery = getDialect().getLimitSql(subquery, true, false, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + " FROM ( " + subquery + " )" + " g, config_info_beta t WHERE g.id = t.id"; List paramList = Lists.newArrayList(); - List pagedParams = getDialect().rebuildParameters(true, true, paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, false, paramList, rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index fdbc10b..22566cb 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -10,13 +10,16 @@ import java.util.List; public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoTagMapper { + /** + * 当前nacos版本，不能使用 ? 用作 limit, offset 参数 + */ @Override public MapperResult findAllConfigInfoTagForDumpAllFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = " SELECT id FROM config_info_tag ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery, true,true, rowSelection); + String pagedSubquery = getDialect().getLimitSql(subquery, true,false, rowSelection); String sql = "SELECT t.id,data_id,group_id,tenant_id,tag_id,app_name,content,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info_tag t WHERE g.id = t.id"; - List pagedParams = getDialect().rebuildParameters(true, true,Collects.emptyArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(true, false,Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index 8b840ac..9500bf9 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -24,6 +24,9 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History return new MapperResult(sql, pagedParams); } + /** + * 当前nacos版本，不能使用 ? 用作 limit, offset 参数 + */ @Override public MapperResult pageFindConfigHistoryFetchRows(MapperContext context) { @@ -32,12 +35,12 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History "SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info " + "WHERE data_id = ? AND group_id = ? AND tenant_id = ? ORDER BY nid DESC "; - sql = getDialect().getLimitSql(sql, rowSelection); + sql = getDialect().getLimitSql(sql, false, false, rowSelection); List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.DATA_ID), context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(false, false,paramList, rowSelection); return new MapperResult(sql, pagedParams); } -- Gitee From c9eb65cb3cd3076ea1fe670b2feb1cc3aac7d858 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 3 Sep 2024 11:36:21 +0800 Subject: [PATCH 094/159] =?UTF-8?q?*=20=E6=A0=87=E6=B3=A8=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=A2=AB=E8=B0=83=E7=94=A8=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 9e07ad7..1a596d7 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -18,6 +18,9 @@ import java.util.List; public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { + /** + * 该方法没有被调用 + */ @Override public MapperResult findConfigInfoByAppFetchRows(MapperContext context) { final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); @@ -50,7 +53,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp } /** - * unused + * 该方法没有被调用 */ @Override public MapperResult findAllConfigKey(MapperContext context) { @@ -66,7 +69,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp /** - * unused + * 该方法没有被调用 */ @Override public MapperResult findAllConfigInfoBaseFetchRows(MapperContext context) { @@ -92,6 +95,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * 该方法没有被调用 + */ @Override public MapperResult findChangeConfigFetchRows(MapperContext context) { final String tenant = (String) context.getWhereParameter(FieldConstant.TENANT); @@ -143,7 +149,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp } /** - * unused + * 该方法没有被调用 */ @Override public MapperResult listGroupKeyMd5ByPageFetchRows(MapperContext context) { @@ -156,6 +162,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * 该方法没有被调用 + */ @Override public MapperResult findConfigInfoBaseLikeFetchRows(MapperContext context) { final String tenant = (String) context.getWhereParameter(FieldConstant.TENANT); @@ -225,6 +234,9 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** + * 该方法没有被调用 + */ @Override public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { @@ -277,7 +289,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp } /** - * unused + * 该方法没有被调用 */ @Override public MapperResult findAllConfigInfoFetchRows(MapperContext context) { -- Gitee From 5cbc2be8f53f3ecc918731952da1204a7bbf54f7 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 3 Sep 2024 11:49:02 +0800 Subject: [PATCH 095/159] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index fe671a8..5a29132 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -95,7 +95,7 @@ public abstract class NacosDatabaseDialect { } public String getLimitSql(String sql, boolean subQuery, boolean useLimitVariable, RowSelection rowSelection){ - return this.delegate.getLimitSql(sql, subQuery, rowSelection); + return this.delegate.getLimitSql(sql,useLimitVariable, subQuery, rowSelection); } public List rebuildParameters(List queryParams, RowSelection selection){ -- Gitee From 2fcaf71c57567f8c75c957f54ac1afb571cfc1a5 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 3 Sep 2024 14:58:28 +0800 Subject: [PATCH 096/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index ef8bc2a..99f1b57 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -116,7 +116,7 @@ db.password.0=SA123456Pswd db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver ``` -## MySQL +## 支持MySQL 1. schema初始化 ```shell @@ -138,7 +138,7 @@ db.pool.config.driverClassName=com.mysql.cj.jdbc.Driver ## 支持Oracle 1. 脚本执行 -:q:q```shell +```shell # 先用 system 创建 C##NACOS用户 sqlplus system/Oracle123_Pswd@localhost:1521/FREE @./create-schema.sql # 再用 C##NACOS用户创建表 -- Gitee From a11791ff372c56c999b29cee7c739399f0359313 Mon Sep 17 00:00:00 2001 From: coderjn Date: Wed, 4 Sep 2024 20:26:24 +0800 Subject: [PATCH 097/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.2=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 615242f..0819ff6 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.1 + 2.0.2 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index 05751ae..f70cc35 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.1 + 2.0.2 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index c535bca..14d1c54 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.1 + 2.0.2 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index acde4fa..9db165d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.1 + 2.0.2 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From 4e8cf1706c869534cbb838ab854a00007b7db40c Mon Sep 17 00:00:00 2001 From: coderjn Date: Wed, 4 Sep 2024 21:06:18 +0800 Subject: [PATCH 098/159] =?UTF-8?q?*=20=E5=AF=B9=E5=88=97=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=8E=BB=E5=BC=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 24 +++++++++++++++ .../plugin/datasource/mapper/BaseMapper.java | 30 +++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 5a29132..7255b32 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -5,6 +5,8 @@ import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Maps; +import com.jn.langx.util.collection.Pipeline; +import com.jn.langx.util.function.Function; import com.jn.langx.util.reflect.Reflects; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; @@ -106,6 +108,28 @@ public abstract class NacosDatabaseDialect { return this.delegate.rebuildParameters(subquery,useLimitVariable, selection, queryParams); } + private static String IDENTIFIER_BEFORE_QUOTES="\"'`["; + private static String IDENTIFIER_AFTER_QUOTES="\"'`]"; + + + public List removeQuote(List identifiers){ + return Pipeline.of(identifiers).map(new Function() { + @Override + public String apply(String identifier) { + return removeQuote(identifier); + } + }).asList(); + } + + private static String removeQuote(String identifier){ + if(Strings.isBlank(identifier)){ + return identifier; + } + identifier=Strings.stripStart(identifier, IDENTIFIER_BEFORE_QUOTES); + identifier=Strings.stripEnd(identifier, IDENTIFIER_AFTER_QUOTES); + return identifier; + } + public String getName() { return name; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 939d0b9..d31bbdd 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -11,6 +11,8 @@ import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; +import java.util.List; + public abstract class BaseMapper extends AbstractMapper { private final String databaseId; protected NacosDatabaseDialect dialect; @@ -63,4 +65,32 @@ public abstract class BaseMapper extends AbstractMapper { public String getFunction(String functionName) { return this.dialect.getFunction(functionName); } + + /*************************************************************************** + * 接下来是重写的父类的函数 + ***************************************************************************/ + + /** + * + * @param columns The columns + * @param where The where params + * @return + */ + @Override + public String select(List columns, List where) { + List unwrapQuoteColumns = this.dialect.removeQuote(columns); + return super.select(unwrapQuoteColumns, where); + } + + @Override + public String insert(List columns) { + List unwrapQuoteColumns = this.dialect.removeQuote(columns); + return super.insert(unwrapQuoteColumns); + } + + @Override + public String update(List columns, List where) { + List unwrapQuoteColumns = this.dialect.removeQuote(columns); + return super.update(unwrapQuoteColumns,where); + } } -- Gitee From 04bd8e1b49c44b744f20c03ef44b38ad322e83cb Mon Sep 17 00:00:00 2001 From: coderjn Date: Wed, 4 Sep 2024 21:36:49 +0800 Subject: [PATCH 099/159] =?UTF-8?q?*=20=E4=BF=AE=E6=AD=A3oracle=E8=A1=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BASQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/oracle/create-tables.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index c95978b..43f053f 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -282,9 +282,9 @@ end; DROP TABLE IF EXISTS permissions; CREATE TABLE permissions ( - ROLE varchar2(50) NOT NULL, - RESOURCE varchar2(512) NOT NULL, - ACTION varchar2(8) NOT NULL + "ROLE" varchar2(50) NOT NULL, + "RESOURCE" varchar2(512) NOT NULL, + "ACTION" varchar2(8) NOT NULL ); -- Gitee From 7bc2baccd0fb98f418030e055b091e77a93c7448 Mon Sep 17 00:00:00 2001 From: coderjn Date: Wed, 4 Sep 2024 21:56:00 +0800 Subject: [PATCH 100/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86=20RELEASE=20LOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RELEASE-LOG.MD | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 RELEASE-LOG.MD diff --git a/RELEASE-LOG.MD b/RELEASE-LOG.MD new file mode 100644 index 0000000..7493d2f --- /dev/null +++ b/RELEASE-LOG.MD @@ -0,0 +1,21 @@ +## 2.0.2 +1. 兼容nacos中的不合理SQL，对应nacos [github上的bug](https://github.com/alibaba/nacos/issues/12598) +2. 完善 oracle 的sql 脚本 + +## 2.0.1 +1. derby, mysql 仍然使用官方的 +2. 兼容nacos中的不合理设计，对于部分sql不使用?替换（nacos设计有问题），对应nacos [github上的bug](https://github.com/alibaba/nacos/issues/12585) + +## 2.0.0 +1. 代码重构，用一套代码即可实现数据库的支持 + +## 1.0.0 ++ 新特性： + + 提供nacos 数据源插件， nacos-plugin-datasource， 支持多种数据库： + + DM (达梦) + + Kingbase （金仓） + + MagicData + + MSSQL (SQLServer) + + OpenGauss （高斯） + + Oracle(8, 9, 10, 11, 12 ... ) + + PostgreSQL \ No newline at end of file -- Gitee From 15a5da8f07a230364409489a342d47881def60c3 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Thu, 5 Sep 2024 20:29:51 +0800 Subject: [PATCH 101/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 9 ++ .../db/oracle/OracleDatabaseDialect.java | 20 +++ .../plugin/datasource/mapper/BaseMapper.java | 145 ++++++++++++++++-- ...cos.plugin.datasource.NacosDatabaseDialect | 3 +- 4 files changed, 165 insertions(+), 12 deletions(-) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 7255b32..4e7b8ce 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource; +import com.jn.langx.annotation.Nullable; import com.jn.langx.text.StringTemplates; import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; @@ -130,6 +131,14 @@ public abstract class NacosDatabaseDialect { return identifier; } + public boolean isAutoCastEmptyStringToNull(){ + return false; + } + + public String castNullToDefault(String expressionOrIdentifier,@Nullable String defaultValue){ + return expressionOrIdentifier; + } + public String getName() { return name; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java new file mode 100644 index 0000000..0b52d41 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -0,0 +1,20 @@ +package com.jn.nacos.plugin.datasource.db.oracle; + +import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class OracleDatabaseDialect extends NacosDatabaseDialect { + public OracleDatabaseDialect(){ + super(DatabaseTypes.ORACLE); + } + + @Override + public boolean isAutoCastEmptyStringToNull() { + return true; + } + + @Override + public String castNullToDefault(String expressionOrIdentifier, String defaultValue) { + return "NVL("+expressionOrIdentifier+", '"+defaultValue+"')"; + } +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index d31bbdd..cba2153 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.alibaba.nacos.sys.env.EnvUtil; import com.jn.langx.util.Objs; @@ -72,25 +73,147 @@ public abstract class BaseMapper extends AbstractMapper { /** * - * @param columns The columns + * @param quotedColumns The columns * @param where The where params - * @return */ @Override - public String select(List columns, List where) { - List unwrapQuoteColumns = this.dialect.removeQuote(columns); - return super.select(unwrapQuoteColumns, where); + public String select(List quotedColumns, List where) { + List columns = this.dialect.removeQuote(quotedColumns); + StringBuilder sql = new StringBuilder(); + String method = "SELECT "; + sql.append(method); + for (int i = 0; i < columns.size(); i++) { + sql.append(columns.get(i)); + if (i == columns.size() - 1) { + sql.append(" "); + } else { + sql.append(","); + } + } + sql.append("FROM "); + sql.append(getTableName()); + sql.append(" "); + + if (CollectionUtils.isEmpty(where)) { + return sql.toString(); + } + + appendWhereClause(where, sql); + return sql.toString(); } @Override - public String insert(List columns) { - List unwrapQuoteColumns = this.dialect.removeQuote(columns); - return super.insert(unwrapQuoteColumns); + public String insert(List quotedColumns) { + List columns = this.dialect.removeQuote(quotedColumns); + StringBuilder sql = new StringBuilder(); + String method = "INSERT INTO "; + sql.append(method); + sql.append(getTableName()); + + int size = columns.size(); + sql.append("("); + for (int i = 0; i < size; i++) { + sql.append(columns.get(i).split("@")[0]); + if (i != columns.size() - 1) { + sql.append(", "); + } + } + sql.append(") "); + + sql.append("VALUES"); + sql.append("("); + for (int i = 0; i < size; i++) { + String[] parts = columns.get(i).split("@"); + if (parts.length == 2) { + sql.append(getFunction(parts[1])); + } else { + sql.append("?"); + } + if (i != columns.size() - 1) { + sql.append(","); + } + } + sql.append(")"); + return sql.toString(); } @Override - public String update(List columns, List where) { - List unwrapQuoteColumns = this.dialect.removeQuote(columns); - return super.update(unwrapQuoteColumns,where); + public String update(List quotedColumns, List where) { + List columns = this.dialect.removeQuote(quotedColumns); + StringBuilder sql = new StringBuilder(); + String method = "UPDATE "; + sql.append(method); + sql.append(getTableName()).append(" ").append("SET "); + + for (int i = 0; i < columns.size(); i++) { + String[] parts = columns.get(i).split("@"); + String column = parts[0]; + if (parts.length == 2) { + sql.append(column).append(" = ").append(getFunction(parts[1])); + } else { + sql.append(column).append(" = ").append("?"); + } + if (i != columns.size() - 1) { + sql.append(","); + } + } + + if (Objs.isEmpty(where)) { + return sql.toString(); + } + + sql.append(" "); + appendWhereClause(where, sql); + + return sql.toString(); + } + + + @Override + public String delete(List params) { + StringBuilder sql = new StringBuilder(); + String method = "DELETE "; + sql.append(method).append("FROM ").append(getTableName()).append(" ").append("WHERE "); + for (int i = 0; i < params.size(); i++) { + sql.append(params.get(i)).append(" ").append("=").append(" ? "); + if (i != params.size() - 1) { + sql.append("AND "); + } + } + + return sql.toString(); + } + + @Override + public String count(List where) { + StringBuilder sql = new StringBuilder(); + String method = "SELECT "; + sql.append(method); + sql.append("COUNT(*) FROM "); + sql.append(getTableName()); + sql.append(" "); + + if (null == where || where.size() == 0) { + return sql.toString(); + } + + appendWhereClause(where, sql); + + return sql.toString(); + } + + @Override + public String[] getPrimaryKeyGeneratedKeys() { + return new String[]{"id"}; + } + + private void appendWhereClause(List where, StringBuilder sql) { + sql.append("WHERE "); + for (int i = 0; i < where.size(); i++) { + sql.append(where.get(i)).append(" = ").append("?"); + if (i != where.size() - 1) { + sql.append(" AND "); + } + } } } diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect index 97fa807..8af4dd3 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect @@ -1 +1,2 @@ -com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect \ No newline at end of file +com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect +com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect \ No newline at end of file -- Gitee From 6eb20822809d8655ca6257e691dc4563cfcc6e1f Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 07:18:53 +0800 Subject: [PATCH 102/159] =?UTF-8?q?*=20=E9=87=8D=E5=86=99=20insert,=20upda?= =?UTF-8?q?te,=20delete,=20count?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 2 +- .../db/oracle/OracleDatabaseDialect.java | 2 +- .../plugin/datasource/mapper/BaseMapper.java | 60 +++++++++++++------ ...cos.plugin.datasource.NacosDatabaseDialect | 4 +- 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 4e7b8ce..6d3d893 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -135,7 +135,7 @@ public abstract class NacosDatabaseDialect { return false; } - public String castNullToDefault(String expressionOrIdentifier,@Nullable String defaultValue){ + public String genCastNullToDefaultExpression(String expressionOrIdentifier,@Nullable String defaultValue){ return expressionOrIdentifier; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index 0b52d41..e7a6e56 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -14,7 +14,7 @@ public class OracleDatabaseDialect extends NacosDatabaseDialect { } @Override - public String castNullToDefault(String expressionOrIdentifier, String defaultValue) { + public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { return "NVL("+expressionOrIdentifier+", '"+defaultValue+"')"; } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index cba2153..727996e 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -1,11 +1,12 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.common.utils.NamespaceUtil; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.alibaba.nacos.sys.env.EnvUtil; import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; +import com.jn.langx.util.collection.Pipeline; import com.jn.nacos.plugin.datasource.DatabaseTypes; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; @@ -79,6 +80,9 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String select(List quotedColumns, List where) { List columns = this.dialect.removeQuote(quotedColumns); + return generateSelectSql(columns, where); + } + private String generateSelectSql(List columns, List where){ StringBuilder sql = new StringBuilder(); String method = "SELECT "; sql.append(method); @@ -94,7 +98,9 @@ public abstract class BaseMapper extends AbstractMapper { sql.append(getTableName()); sql.append(" "); - if (CollectionUtils.isEmpty(where)) { + where = Pipeline.of(where).clearEmptys().asList(); + + if (Objs.isEmpty(where)) { return sql.toString(); } @@ -105,6 +111,9 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String insert(List quotedColumns) { List columns = this.dialect.removeQuote(quotedColumns); + return genInsertSql(columns); + } + public String genInsertSql(List columns) { StringBuilder sql = new StringBuilder(); String method = "INSERT INTO "; sql.append(method); @@ -140,6 +149,11 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String update(List quotedColumns, List where) { List columns = this.dialect.removeQuote(quotedColumns); + return genUpdateSql(columns, where); + } + + public String genUpdateSql(List columns, List where) { + StringBuilder sql = new StringBuilder(); String method = "UPDATE "; sql.append(method); @@ -158,6 +172,7 @@ public abstract class BaseMapper extends AbstractMapper { } } + where = Pipeline.of(where).clearEmptys().asList(); if (Objs.isEmpty(where)) { return sql.toString(); } @@ -170,22 +185,27 @@ public abstract class BaseMapper extends AbstractMapper { @Override - public String delete(List params) { + public String delete(List where) { + return genDeleteSql(where); + } + public String genDeleteSql(List where) { StringBuilder sql = new StringBuilder(); String method = "DELETE "; - sql.append(method).append("FROM ").append(getTableName()).append(" ").append("WHERE "); - for (int i = 0; i < params.size(); i++) { - sql.append(params.get(i)).append(" ").append("=").append(" ? "); - if (i != params.size() - 1) { - sql.append("AND "); - } + sql.append(method).append("FROM ").append(getTableName()).append(" "); + where = Pipeline.of(where).clearEmptys().asList(); + if (Objs.isEmpty(where)) { + return sql.toString(); } - + appendWhereClause(where, sql); return sql.toString(); } + @Override public String count(List where) { + return genCountSql(where); + } + public String genCountSql(List where) { StringBuilder sql = new StringBuilder(); String method = "SELECT "; sql.append(method); @@ -193,7 +213,8 @@ public abstract class BaseMapper extends AbstractMapper { sql.append(getTableName()); sql.append(" "); - if (null == where || where.size() == 0) { + where = Pipeline.of(where).clearEmptys().asList(); + if (Objs.isEmpty(where)) { return sql.toString(); } @@ -202,15 +223,18 @@ public abstract class BaseMapper extends AbstractMapper { return sql.toString(); } - @Override - public String[] getPrimaryKeyGeneratedKeys() { - return new String[]{"id"}; - } - - private void appendWhereClause(List where, StringBuilder sql) { + protected final void appendWhereClause(List where, StringBuilder sql) { sql.append("WHERE "); for (int i = 0; i < where.size(); i++) { - sql.append(where.get(i)).append(" = ").append("?"); + String condition = where.get(i); + + if(Strings.equalsIgnoreCase(condition, "tenant_id") && getDialect().isAutoCastEmptyStringToNull()){ + String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); + sql.append("tenant_id = ").append(castNullToDefaultExpression); + }else{ + sql.append(condition).append(" = ").append("?"); + } + if (i != where.size() - 1) { sql.append(" AND "); } diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect index 8af4dd3..f3df91b 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect @@ -1,2 +1,4 @@ com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect -com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect \ No newline at end of file +com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect +com.jn.nacos.plugin.datasource.db.derby.DerbyDatabaseDialect +com.jn.nacos.plugin.datasource.db.mysql.MysqlDatabaseDialect \ No newline at end of file -- Gitee From eb5ecdde3f84a7cc7ab71a5a92d3eef378d928b6 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 08:38:04 +0800 Subject: [PATCH 103/159] =?UTF-8?q?*=20=E9=87=8D=E5=86=99=20ConfigInfoAggr?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/BaseMapper.java | 4 +- .../mapper/CommonConfigInfoAggrMapper.java | 71 ++++++++++++++++++- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 727996e..ebc5c04 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -188,7 +188,7 @@ public abstract class BaseMapper extends AbstractMapper { public String delete(List where) { return genDeleteSql(where); } - public String genDeleteSql(List where) { + private String genDeleteSql(List where) { StringBuilder sql = new StringBuilder(); String method = "DELETE "; sql.append(method).append("FROM ").append(getTableName()).append(" "); @@ -205,7 +205,7 @@ public abstract class BaseMapper extends AbstractMapper { public String count(List where) { return genCountSql(where); } - public String genCountSql(List where) { + private String genCountSql(List where) { StringBuilder sql = new StringBuilder(); String method = "SELECT "; sql.append(method); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java index a5226cd..0cc0745 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -7,6 +8,7 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; +import java.util.ArrayList; import java.util.List; public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { @@ -20,7 +22,9 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(startRow, pageSize); - String sql = "SELECT data_id,group_id,tenant_id,datum_id,app_name,content FROM config_info_aggr WHERE data_id=? AND group_id=? AND tenant_id=? ORDER BY datum_id "; + List columns = Lists.newArrayList("data_id","group_id","tenant_id","datum_id","app_name","content"); + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + String sql = select(columns, where) + " ORDER BY datum_id "; List paramList = Lists.newArrayList(dataId, groupId, tenantId); sql = getDialect().getLimitSql(sql, false, true, rowSelection); @@ -28,4 +32,69 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo List pagedParams = getDialect().rebuildParameters(false, true,paramList, rowSelection); return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult batchRemoveAggr(MapperContext context) { + final List datumList = (List) context.getWhereParameter(FieldConstant.DATUM_ID); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String tenantTmp = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + List paramList = new ArrayList<>(); + paramList.add(dataId); + paramList.add(group); + paramList.add(tenantTmp); + + final StringBuilder placeholderString = new StringBuilder(); + for (int i = 0; i < datumList.size(); i++) { + if (i != 0) { + placeholderString.append(", "); + } + placeholderString.append('?'); + paramList.add(datumList.get(i)); + } + + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + String sql = delete(where) +" AND datum_id IN (" + placeholderString + ")"; + return new MapperResult(sql, paramList); + } + + @Override + public MapperResult aggrConfigInfoCount(MapperContext context) { + final List datumIds = (List) context.getWhereParameter(FieldConstant.DATUM_ID); + final Boolean isIn = (Boolean) context.getWhereParameter(FieldConstant.IS_IN); + String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + String tenantTmp = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + List paramList = CollectionUtils.list(dataId, group, tenantTmp); + + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + StringBuilder sql = new StringBuilder(count(where)).append(" AND datum_id ").append(isIn? "": " NOT ").append(" IN ( "); + for (int i = 0; i < datumIds.size(); i++) { + if (i > 0) { + sql.append(", "); + } + sql.append('?'); + paramList.add(datumIds.get(i)); + } + sql.append(')'); + + return new MapperResult(sql.toString(), paramList); + } + + @Override + public MapperResult findConfigInfoAggrIsOrdered(MapperContext context) { + String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + String groupId = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + List selectedColumns = Lists.newArrayList("data_id","group_id","tenant_id","datum_id","app_name","content"); + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + String sql = select(selectedColumns, where) + " ORDER BY datum_id"; + List paramList = CollectionUtils.list(dataId, groupId, tenantId); + + return new MapperResult(sql, paramList); + } + } -- Gitee From 978f8773a16330c3b28a6755a1cf6bab8172bc47 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 08:43:10 +0800 Subject: [PATCH 104/159] =?UTF-8?q?*=20=E6=98=AF=E5=90=A6=E6=9C=89=20Encry?= =?UTF-8?q?ptedDataKeyColumn=20=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index ebc5c04..2e7758b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -1,6 +1,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.NamespaceUtil; +import com.alibaba.nacos.common.utils.VersionUtils; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; import com.alibaba.nacos.sys.env.EnvUtil; import com.jn.langx.util.Objs; @@ -240,4 +241,9 @@ public abstract class BaseMapper extends AbstractMapper { } } } + + protected boolean hasEncryptedDataKeyColumn(){ + String currentVersion = VersionUtils.getFullClientVersion(); + return VersionUtils.compareVersion(currentVersion, "2.1.0")>=0; + } } -- Gitee From c98c96d03f6604f90e197f4855f3fabe2b85db44 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 08:52:19 +0800 Subject: [PATCH 105/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoBeta?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/BaseMapper.java | 14 ++++----- .../mapper/CommonConfigInfoBetaMapper.java | 29 ++++++++++++++++++- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 2e7758b..0654795 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -105,7 +105,7 @@ public abstract class BaseMapper extends AbstractMapper { return sql.toString(); } - appendWhereClause(where, sql); + sql.append(genWhereClause(where)); return sql.toString(); } @@ -179,7 +179,7 @@ public abstract class BaseMapper extends AbstractMapper { } sql.append(" "); - appendWhereClause(where, sql); + sql.append(genWhereClause(where)); return sql.toString(); } @@ -197,7 +197,7 @@ public abstract class BaseMapper extends AbstractMapper { if (Objs.isEmpty(where)) { return sql.toString(); } - appendWhereClause(where, sql); + sql.append(genWhereClause(where)); return sql.toString(); } @@ -219,13 +219,12 @@ public abstract class BaseMapper extends AbstractMapper { return sql.toString(); } - appendWhereClause(where, sql); - + sql.append(genWhereClause(where)); return sql.toString(); } - protected final void appendWhereClause(List where, StringBuilder sql) { - sql.append("WHERE "); + protected final String genWhereClause(List where) { + StringBuilder sql = new StringBuilder(" WHERE "); for (int i = 0; i < where.size(); i++) { String condition = where.get(i); @@ -240,6 +239,7 @@ public abstract class BaseMapper extends AbstractMapper { sql.append(" AND "); } } + return sql.toString(); } protected boolean hasEncryptedDataKeyColumn(){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index 6181794..46aff87 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; @@ -22,7 +23,7 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo RowSelection rowSelection = new RowSelection(startRow, pageSize); String subquery = "SELECT id FROM config_info_beta ORDER BY id "; subquery = getDialect().getLimitSql(subquery, true, false, rowSelection); - String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5,gmt_modified,beta_ips " + (hasEncryptedDataKeyColumn() ? ", encrypted_data_key ":"") + " FROM ( " + subquery + " )" + " g, config_info_beta t WHERE g.id = t.id"; List paramList = Lists.newArrayList(); @@ -30,4 +31,30 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult updateConfigInfo4BetaCas(MapperContext context) { + + List where = Lists.newArrayList("data_id", "group_id", "tenant_id",) + final String sql = "UPDATE config_info_beta SET content = ?,md5 = ?,beta_ips = ?,src_ip = ?,src_user = ?,gmt_modified = " + + getFunction("NOW()") + + ",app_name = ? " + genWhereClause(where) + + " AND (md5 = ? OR md5 is null OR md5 = '')"; + + List paramList = new ArrayList<>(); + + paramList.add(context.getUpdateParameter(FieldConstant.CONTENT)); + paramList.add(context.getUpdateParameter(FieldConstant.MD5)); + paramList.add(context.getUpdateParameter(FieldConstant.BETA_IPS)); + paramList.add(context.getUpdateParameter(FieldConstant.SRC_IP)); + paramList.add(context.getUpdateParameter(FieldConstant.SRC_USER)); + paramList.add(context.getUpdateParameter(FieldConstant.APP_NAME)); + + paramList.add(context.getWhereParameter(FieldConstant.DATA_ID)); + paramList.add(context.getWhereParameter(FieldConstant.GROUP_ID)); + paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); + paramList.add(context.getWhereParameter(FieldConstant.MD5)); + + return new MapperResult(sql, paramList); + } } -- Gitee From e93e9c32964b3bc12c7f8c2b21647997331a6347 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 08:56:27 +0800 Subject: [PATCH 106/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoTagM?= =?UTF-8?q?apper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoBetaMapper.java | 2 +- .../mapper/CommonConfigInfoTagMapper.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index 46aff87..3054165 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -35,7 +35,7 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo @Override public MapperResult updateConfigInfo4BetaCas(MapperContext context) { - List where = Lists.newArrayList("data_id", "group_id", "tenant_id",) + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); final String sql = "UPDATE config_info_beta SET content = ?,md5 = ?,beta_ips = ?,src_ip = ?,src_user = ?,gmt_modified = " + getFunction("NOW()") + ",app_name = ? " + genWhereClause(where) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index 22566cb..a8f3f06 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -1,9 +1,12 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Collects; +import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; @@ -23,4 +26,27 @@ public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoT return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult updateConfigInfo4TagCas(MapperContext context) { + Object content = context.getUpdateParameter(FieldConstant.CONTENT); + Object md5 = context.getUpdateParameter(FieldConstant.MD5); + Object srcIp = context.getUpdateParameter(FieldConstant.SRC_IP); + Object srcUser = context.getUpdateParameter(FieldConstant.SRC_USER); + Object gmtModified = context.getUpdateParameter(FieldConstant.GMT_MODIFIED); + Object appName = context.getUpdateParameter(FieldConstant.APP_NAME); + + Object dataId = context.getWhereParameter(FieldConstant.DATA_ID); + Object groupId = context.getWhereParameter(FieldConstant.GROUP_ID); + Object tenantId = context.getWhereParameter(FieldConstant.TENANT_ID); + Object tagId = context.getWhereParameter(FieldConstant.TAG_ID); + Object oldMd5 = context.getWhereParameter(FieldConstant.MD5); + + List updatedColumns = Lists.newArrayList("content", "md5", "src_ip", "src_user", "gmt_modified", "app_name"); + List where = Lists.newArrayList("data_id", "group_id", "tenant_id", "tag_id"); + String sql = update(updatedColumns, where)+ " AND (md5 = ? OR md5 IS NULL OR md5 = '')"; + return new MapperResult(sql, + CollectionUtils.list(content, md5, srcIp, srcUser, gmtModified, appName, dataId, groupId, tenantId, + tagId, oldMd5)); + } } -- Gitee From 7d78678f549e31df327887336fc5cb7dd76b3ba7 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 09:44:40 +0800 Subject: [PATCH 107/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0ConfigTagRelation?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/oracle/OracleDatabaseDialect.java | 2 +- .../mapper/CommonConfigTagRelationMapper.java | 113 +++++++++++++++++- 2 files changed, 108 insertions(+), 7 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index e7a6e56..a67abbe 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -15,6 +15,6 @@ public class OracleDatabaseDialect extends NacosDatabaseDialect { @Override public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { - return "NVL("+expressionOrIdentifier+", '"+defaultValue+"')"; + return " NVL("+expressionOrIdentifier+", '"+defaultValue+"') "; } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java index 2854fd5..c31e5b3 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java @@ -1,5 +1,7 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.NamespaceUtil; +import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -13,6 +15,99 @@ import java.util.List; public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigTagsRelationMapper { + @Override + public MapperResult findConfigInfo4PageCountRows(MapperContext context) { + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); + + List paramList = new ArrayList<>(); + StringBuilder where = new StringBuilder(" WHERE "); + final String sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id"; + + where.append(" a.tenant_id=" + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); + paramList.add(tenantId); + if (StringUtils.isNotBlank(dataId)) { + where.append(" AND a.data_id=? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND a.group_id=? "); + paramList.add(group); + } + if (StringUtils.isNotBlank(appName)) { + where.append(" AND a.app_name=? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND a.content LIKE ? "); + paramList.add(content); + } + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); + + } + where.append(") "); + return new MapperResult(sqlCount + where, paramList); + } + + @Override + public MapperResult findConfigInfoLike4PageCountRows(MapperContext context) { + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); + + List paramList = new ArrayList<>(); + StringBuilder where = new StringBuilder(" WHERE "); + final String sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id "; + + if(Strings.isBlank(tenantId)){ + where.append(" a.tenant_id ='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + where.append(" a.tenant_id LIKE ? "); + paramList.add(tenantId); + } + + if (!StringUtils.isBlank(dataId)) { + where.append(" AND a.data_id LIKE ? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND a.group_id LIKE ? "); + paramList.add(group); + } + if (StringUtils.isNotBlank(appName)) { + where.append(" AND a.app_name = ? "); + paramList.add(appName); + } + if (StringUtils.isNotBlank(content)) { + where.append(" AND a.content LIKE ? "); + paramList.add(content); + } + + where.append(" AND b.tag_name IN ("); + for (int i = 0; i < tagArr.length; i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(tagArr[i]); + } + where.append(") "); + return new MapperResult(sqlCount + where, paramList); + } + @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); @@ -23,12 +118,13 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); List paramList = new ArrayList<>(); + + final String baseSql = "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content " + +" FROM config_info a LEFT JOIN " + + "config_tags_relation b ON a.id=b.id"; StringBuilder where = new StringBuilder(" WHERE "); - final String baseSql = - "SELECT a.id,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " - + "config_tags_relation b ON a.id=b.id"; - where.append(" a.tenant_id=? "); + where.append(" a.tenant_id=" + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); paramList.add(tenantId); if (Strings.isNotBlank(dataId)) { @@ -83,8 +179,12 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT "SELECT a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + "config_tags_relation b ON a.id=b.id "; - where.append(" a.tenant_id LIKE ? "); - paramList.add(tenantId); + if(Strings.isBlank(tenantId)){ + where.append(" a.tenant_id ='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + where.append(" a.tenant_id LIKE ? "); + paramList.add(tenantId); + } if (!Strings.isBlank(dataId)) { where.append(" AND a.data_id LIKE ? "); @@ -124,4 +224,5 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT return new MapperResult(sql, pagedParams); } + } -- Gitee From d84a900f2c88a86a7d7981a756950119ddec703a Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 09:59:30 +0800 Subject: [PATCH 108/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0HistoryConfigInfo?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonHistoryConfigInfoMapper.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index 9500bf9..6d5736d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -1,5 +1,6 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -31,9 +32,10 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History public MapperResult pageFindConfigHistoryFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = - "SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info " - + "WHERE data_id = ? AND group_id = ? AND tenant_id = ? ORDER BY nid DESC "; + + List selectedColumns = Lists.newArrayList("nid","data_id","group_id","tenant_id","app_name","src_ip","src_user","op_type","gmt_create","gmt_modified"); + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + String sql = select(selectedColumns, where)+ " ORDER BY nid DESC "; sql = getDialect().getLimitSql(sql, false, false, rowSelection); @@ -60,4 +62,17 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult findConfigHistoryFetchRows(MapperContext context) { + + List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); + StringBuilder sql = new StringBuilder("SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info ") + .append(genWhereClause(where)) + .append(" ORDER BY nid DESC"); + return new MapperResult(sql.toString(), + CollectionUtils.list(context.getWhereParameter(FieldConstant.DATA_ID), + context.getWhereParameter(FieldConstant.GROUP_ID), + context.getWhereParameter(FieldConstant.TENANT_ID))); + } } -- Gitee From bc128475b9a4e59a8421fb56bac79f2f97732d98 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:10:38 +0800 Subject: [PATCH 109/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20TenantCapacity?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonTenantCapacityMapper.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java index 1b663c8..8a32d39 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java @@ -1,5 +1,7 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; +import com.alibaba.nacos.common.utils.NamespaceUtil; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -7,6 +9,7 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; +import java.util.ArrayList; import java.util.List; public class CommonTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { @@ -23,4 +26,63 @@ public class CommonTenantCapacityMapper extends BaseMapper implements TenantCapa List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult incrementUsageWithDefaultQuotaLimit(MapperContext context) { + String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = "+ getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage < ? AND quota = 0"; + return new MapperResult( sql, + CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), + context.getWhereParameter(FieldConstant.TENANT_ID), + context.getWhereParameter(FieldConstant.USAGE))); + } + + @Override + public MapperResult incrementUsageWithQuotaLimit(MapperContext context) { + String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage < quota AND quota != 0"; + return new MapperResult(sql, + CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), + context.getWhereParameter(FieldConstant.TENANT_ID))); + } + + @Override + public MapperResult incrementUsage(MapperContext context) { + String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); + return new MapperResult(sql, + CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), + context.getWhereParameter(FieldConstant.TENANT_ID))); + } + + @Override + public MapperResult decrementUsage(MapperContext context) { + String sql = "UPDATE tenant_capacity SET usage = usage - 1, gmt_modified = ? WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage > 0"; + return new MapperResult(sql , + CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), + context.getWhereParameter(FieldConstant.TENANT_ID))); + } + + @Override + public MapperResult insertTenantCapacity(MapperContext context) { + List paramList = new ArrayList<>(); + paramList.add(context.getUpdateParameter(FieldConstant.TENANT_ID)); + paramList.add(context.getUpdateParameter(FieldConstant.QUOTA)); + paramList.add(context.getUpdateParameter(FieldConstant.MAX_SIZE)); + paramList.add(context.getUpdateParameter(FieldConstant.MAX_AGGR_COUNT)); + paramList.add(context.getUpdateParameter(FieldConstant.MAX_AGGR_SIZE)); + paramList.add(context.getUpdateParameter(FieldConstant.GMT_CREATE)); + paramList.add(context.getUpdateParameter(FieldConstant.GMT_MODIFIED)); + paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); + + String sql = "INSERT INTO tenant_capacity (tenant_id, quota, usage, max_size, max_aggr_count, max_aggr_size, " + + "gmt_create, gmt_modified) SELECT ?, ?, count(*), ?, ?, ?, ?, ? FROM config_info WHERE tenant_id= " + getDialect().genCastNullToDefaultExpression("?",NamespaceUtil.getNamespaceDefaultId()); + return new MapperResult(sql, paramList); + } + + @Override + public MapperResult correctUsage(MapperContext context) { + String sql= "UPDATE tenant_capacity SET usage = (SELECT count(*) FROM config_info WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+"), gmt_modified = ? WHERE tenant_id = " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); + return new MapperResult(sql, + CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID), + context.getUpdateParameter(FieldConstant.GMT_MODIFIED), + context.getWhereParameter(FieldConstant.TENANT_ID))); + } } -- Gitee From 9bbda5042a967525122e670ec06fa74e476ec081 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:26:29 +0800 Subject: [PATCH 110/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 1a596d7..ed65fe7 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -249,6 +249,24 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + @Override + public MapperResult findChangeConfig(MapperContext context) { + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " + + "gmt_modified >= ? and id > ? order by id "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID), + context.getWhereParameter(FieldConstant.PAGE_SIZE)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); + } + + @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { @@ -258,12 +276,17 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - List paramList = new ArrayList<>(); + List paramList = Lists.newArrayList(); final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,encrypted_data_key FROM config_info"; StringBuilder where = new StringBuilder(" WHERE "); - where.append(" tenant_id LIKE ? "); - paramList.add(tenantId); + + if(Strings.isBlank(tenantId)){ + where.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + where.append(" tenant_id LIKE ? "); + paramList.add(tenantId); + } if (!Strings.isBlank(dataId)) { where.append(" AND data_id LIKE ? "); paramList.add(dataId); @@ -288,35 +311,34 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** * 该方法没有被调用 */ @Override public MapperResult findAllConfigInfoFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); - String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID), context.getStartRow(), - context.getPageSize()); - List pagedParams = getDialect().rebuildParameters(true,true, paramList, rowSelection); - return new MapperResult(sql, pagedParams); - } + String tenantId =(String) context.getWhereParameter(FieldConstant.TENANT_ID); - @Override - public MapperResult findChangeConfig(MapperContext context) { - RowSelection rowSelection = new RowSelection(0, context.getPageSize()); - String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " - + "gmt_modified >= ? and id > ? order by id "; + List paramList = Lists.newArrayList(); - sql = getDialect().getLimitSql(sql, rowSelection); + StringBuilder subqueryBuilder = new StringBuilder("SELECT id FROM config_info WHERE "); + if(Strings.isBlank(tenantId)){ + subqueryBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + subqueryBuilder.append("tenant_id LIKE ?"); + paramList.add(tenantId); + } - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), - context.getWhereParameter(FieldConstant.LAST_MAX_ID), - context.getWhereParameter(FieldConstant.PAGE_SIZE)); + String subquery = subqueryBuilder.append(" ORDER BY id ").toString(); + String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + + List pagedParams = getDialect().rebuildParameters(true,true, paramList, rowSelection); + + String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,content,md5 FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; return new MapperResult(sql, pagedParams); } + } -- Gitee From 1d3e414076a94cc87b390b4a4444550f065f334b Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:31:17 +0800 Subject: [PATCH 111/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index ed65fe7..31da910 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -148,6 +148,25 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + + + @Override + public MapperResult findChangeConfig(MapperContext context) { + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " + + "gmt_modified >= ? and id > ? order by id "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID), + context.getWhereParameter(FieldConstant.PAGE_SIZE)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); + } + /** * 该方法没有被调用 */ @@ -162,6 +181,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + /** * 该方法没有被调用 */ @@ -194,6 +214,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); @@ -206,7 +227,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type FROM config_info"; StringBuilder where = new StringBuilder(" WHERE "); - where.append(" tenant_id=? "); + where.append(" tenant_id= " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); paramList.add(tenantId); if (Strings.isNotBlank(dataId)) { where.append(" AND data_id=? "); @@ -234,6 +255,8 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + /** * 该方法没有被调用 */ @@ -241,7 +264,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=? order by id asc"; + String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id="+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" order by id asc"; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.GROUP_ID), context.getWhereParameter(FieldConstant.TENANT_ID)); @@ -250,23 +273,6 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp } - @Override - public MapperResult findChangeConfig(MapperContext context) { - RowSelection rowSelection = new RowSelection(0, context.getPageSize()); - String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " - + "gmt_modified >= ? and id > ? order by id "; - - sql = getDialect().getLimitSql(sql, rowSelection); - - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), - context.getWhereParameter(FieldConstant.LAST_MAX_ID), - context.getWhereParameter(FieldConstant.PAGE_SIZE)); - - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); - return new MapperResult(sql, pagedParams); - } - - @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { -- Gitee From 57191793f4a73a927e348b5d2046d576826916ea Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:33:53 +0800 Subject: [PATCH 112/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 45 ++++++++++--------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 31da910..3a7ba2d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -81,6 +81,27 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + + + + + @Override + public MapperResult findChangeConfig(MapperContext context) { + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " + + "gmt_modified >= ? and id > ? order by id "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID), + context.getWhereParameter(FieldConstant.PAGE_SIZE)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); + } + @Override public MapperResult findAllConfigInfoFragment(MapperContext context) { String contextParameter = context.getContextParameter(ContextConstant.NEED_CONTENT); @@ -88,13 +109,16 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String sql = "SELECT id,data_id,group_id,tenant_id,app_name," + (needContent ? "content," : "") - + "md5,gmt_modified,type FROM config_info WHERE id > ? " + "ORDER BY id ASC "; + + "md5,gmt_modified,type "+ (hasEncryptedDataKeyColumn()? ",encrypted_data_key":"") + +" FROM config_info WHERE id > ? " + "ORDER BY id ASC "; sql = getDialect().getLimitSql(sql, rowSelection); List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.ID)); List pagedParams = getDialect().rebuildParameters(queryParams, rowSelection); return new MapperResult(sql, pagedParams); } + + /** * 该方法没有被调用 */ @@ -148,25 +172,6 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } - - - - @Override - public MapperResult findChangeConfig(MapperContext context) { - RowSelection rowSelection = new RowSelection(0, context.getPageSize()); - String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " - + "gmt_modified >= ? and id > ? order by id "; - - sql = getDialect().getLimitSql(sql, rowSelection); - - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), - context.getWhereParameter(FieldConstant.LAST_MAX_ID), - context.getWhereParameter(FieldConstant.PAGE_SIZE)); - - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); - return new MapperResult(sql, pagedParams); - } - /** * 该方法没有被调用 */ -- Gitee From 9cacfcb157cb4eff25b56d89d475699b03951e51 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:42:10 +0800 Subject: [PATCH 113/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 82 +++++++++++++------ 1 file changed, 58 insertions(+), 24 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 3a7ba2d..3faf4c8 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -18,6 +18,29 @@ import java.util.List; public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapper { + + + + + + + + @Override + public MapperResult findChangeConfig(MapperContext context) { + RowSelection rowSelection = new RowSelection(0, context.getPageSize()); + String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " + + "gmt_modified >= ? and id > ? order by id "; + + sql = getDialect().getLimitSql(sql, rowSelection); + + List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), + context.getWhereParameter(FieldConstant.LAST_MAX_ID), + context.getWhereParameter(FieldConstant.PAGE_SIZE)); + + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); + return new MapperResult(sql, pagedParams); + } + /** * 该方法没有被调用 */ @@ -27,13 +50,27 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ? order by id asc"; + + + List paramList = Lists.newArrayList(); + + StringBuilder sqlBuilder = new StringBuilder("SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "); + if(Strings.isBlank(tenantId)){ + sqlBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + sqlBuilder.append(" tenant_id LIKE ?"); + paramList.add(tenantId); + } + String sql = sqlBuilder.append(" AND app_name = ? order by id asc").toString(); + paramList.add(appName); sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(tenantId, appName), rowSelection); + List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } + + @Override public MapperResult getTenantIdList(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); @@ -43,6 +80,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + @Override public MapperResult getGroupIdList(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); @@ -52,18 +90,33 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + + /** * 该方法没有被调用 */ @Override public MapperResult findAllConfigKey(MapperContext context) { RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; + + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); + + List paramList = Lists.newArrayList(); + + StringBuilder subqueryBuilder = new StringBuilder("SELECT id FROM config_info WHERE "); + if(Strings.isBlank(tenantId)){ + subqueryBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + subqueryBuilder.append("tenant_id LIKE ?"); + paramList.add(tenantId); + } + + String subquery = subqueryBuilder.append("ORDER BY id ").toString(); + String pagedSubquery = getDialect().getLimitSql(subquery, true,true, rowSelection); String sql = " SELECT data_id,group_id,app_name FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; - List queryParams = Lists.newArrayList(context.getWhereParameter(FieldConstant.TENANT_ID)); - List pagedParams = getDialect().rebuildParameters(true, true, queryParams, rowSelection); + List pagedParams = getDialect().rebuildParameters(true, true, paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -83,25 +136,6 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp - - - - @Override - public MapperResult findChangeConfig(MapperContext context) { - RowSelection rowSelection = new RowSelection(0, context.getPageSize()); - String sql = "SELECT id, data_id, group_id, tenant_id, app_name, content, gmt_modified, encrypted_data_key FROM config_info WHERE " - + "gmt_modified >= ? and id > ? order by id "; - - sql = getDialect().getLimitSql(sql, rowSelection); - - List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.START_TIME), - context.getWhereParameter(FieldConstant.LAST_MAX_ID), - context.getWhereParameter(FieldConstant.PAGE_SIZE)); - - List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); - return new MapperResult(sql, pagedParams); - } - @Override public MapperResult findAllConfigInfoFragment(MapperContext context) { String contextParameter = context.getContextParameter(ContextConstant.NEED_CONTENT); -- Gitee From 5c37b1741c93f574b060893ee9a7049f43bd7570 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 10:57:27 +0800 Subject: [PATCH 114/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 215 +++++++++++++++++- 1 file changed, 209 insertions(+), 6 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 3faf4c8..108341a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -1,6 +1,8 @@ package com.jn.nacos.plugin.datasource.mapper; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.NamespaceUtil; +import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.ContextConstant; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; @@ -19,12 +21,6 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp - - - - - - @Override public MapperResult findChangeConfig(MapperContext context) { RowSelection rowSelection = new RowSelection(0, context.getPageSize()); @@ -41,6 +37,213 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp return new MapperResult(sql, pagedParams); } + @Override + public MapperResult findConfigInfoByAppCountRows(MapperContext context) { + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); + String appName = (String)context.getWhereParameter(FieldConstant.APP_NAME); + + StringBuilder sqlBuilder = new StringBuilder("SELECT count(*) FROM config_info WHERE "); + List paramList = Lists.newArrayList(); + if(Strings.isBlank(tenantId)){ + sqlBuilder.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + sqlBuilder.append(" tenant_id LIKE ?"); + paramList.add(tenantId); + } + String sql = sqlBuilder.append(" AND app_name = ?").toString(); + paramList.add(appName); + return new MapperResult(sql, paramList); + } + + @Override + public MapperResult configInfoLikeTenantCount(MapperContext context) { + String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + List paramList = Lists.newArrayList(); + StringBuilder sqlBuilder= new StringBuilder("SELECT count(*) FROM config_info WHERE "); + if(Strings.isBlank(tenantId)){ + sqlBuilder.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + sqlBuilder.append(" tenant_id LIKE ?"); + paramList.add(tenantId); + } + String sql = sqlBuilder.toString(); + return new MapperResult(sql, paramList); + } + + @Override + public MapperResult findAllConfigInfo4Export(MapperContext context) { + List ids = (List) context.getWhereParameter(FieldConstant.IDS); + + String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_create,gmt_modified," + + "src_user,src_ip,c_desc,c_use,effect,c_schema,encrypted_data_key FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); + + List paramList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(ids)) { + where.append(" id IN ("); + for (int i = 0; i < ids.size(); i++) { + if (i != 0) { + where.append(", "); + } + where.append('?'); + paramList.add(ids.get(i)); + } + where.append(") "); + } else { + + + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); + String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + + where.append(" tenant_id = "+ getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); + paramList.add(tenantId); + + if (StringUtils.isNotBlank(dataId)) { + where.append(" AND data_id LIKE ? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND group_id= ? "); + paramList.add(group); + } + if (StringUtils.isNotBlank(appName)) { + where.append(" AND app_name= ? "); + paramList.add(appName); + } + } + return new MapperResult(sql + where, paramList); + } + + @Override + public MapperResult findConfigInfoBaseLikeCountRows(MapperContext context) { + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + + final List paramList = new ArrayList<>(); + final String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; + String where = "tenant_id='" + NamespaceUtil.getNamespaceDefaultId() + "' "; + + if (!StringUtils.isBlank(dataId)) { + where += " AND data_id LIKE ? "; + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where += " AND group_id LIKE ? "; + paramList.add(group); + } + if (!StringUtils.isBlank(content)) { + where += " AND content LIKE ? "; + paramList.add(content); + } + return new MapperResult(sqlCountRows + where, paramList); + } + + @Override + public MapperResult findConfigInfo4PageCountRows(MapperContext context) { + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + final List paramList = new ArrayList<>(); + + final String sqlCount = "SELECT count(*) FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); + where.append(" tenant_id= " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); + paramList.add(tenantId); + if (StringUtils.isNotBlank(dataId)) { + where.append(" AND data_id=? "); + paramList.add(dataId); + } + if (StringUtils.isNotBlank(group)) { + where.append(" AND group_id=? "); + paramList.add(group); + } + if (StringUtils.isNotBlank(appName)) { + where.append(" AND app_name=? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND content LIKE ? "); + paramList.add(content); + } + return new MapperResult(sqlCount + where, paramList); + } + + @Override + public MapperResult findConfigInfoLike4PageCountRows(MapperContext context) { + final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); + final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); + final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); + final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); + + final List paramList = new ArrayList<>(); + + final String sqlCountRows = "SELECT count(*) FROM config_info"; + StringBuilder where = new StringBuilder(" WHERE "); + + if(Strings.isBlank(tenantId)){ + where.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); + }else{ + where.append(" tenant_id LIKE ? "); + paramList.add(tenantId); + } + + + if (!StringUtils.isBlank(dataId)) { + where.append(" AND data_id LIKE ? "); + paramList.add(dataId); + } + if (!StringUtils.isBlank(group)) { + where.append(" AND group_id LIKE ? "); + paramList.add(group); + } + if (!StringUtils.isBlank(appName)) { + where.append(" AND app_name = ? "); + paramList.add(appName); + } + if (!StringUtils.isBlank(content)) { + where.append(" AND content LIKE ? "); + paramList.add(content); + } + return new MapperResult(sqlCountRows + where, paramList); + } + + @Override + public MapperResult updateConfigInfoAtomicCas(MapperContext context) { + List paramList = new ArrayList<>(); + + paramList.add(context.getUpdateParameter(FieldConstant.CONTENT)); + paramList.add(context.getUpdateParameter(FieldConstant.MD5)); + paramList.add(context.getUpdateParameter(FieldConstant.SRC_IP)); + paramList.add(context.getUpdateParameter(FieldConstant.SRC_USER)); + paramList.add(context.getUpdateParameter(FieldConstant.APP_NAME)); + paramList.add(context.getUpdateParameter(FieldConstant.C_DESC)); + paramList.add(context.getUpdateParameter(FieldConstant.C_USE)); + paramList.add(context.getUpdateParameter(FieldConstant.EFFECT)); + paramList.add(context.getUpdateParameter(FieldConstant.TYPE)); + paramList.add(context.getUpdateParameter(FieldConstant.C_SCHEMA)); + if(hasEncryptedDataKeyColumn()) { + paramList.add(context.getUpdateParameter(FieldConstant.ENCRYPTED_DATA_KEY)); + } + paramList.add(context.getWhereParameter(FieldConstant.DATA_ID)); + paramList.add(context.getWhereParameter(FieldConstant.GROUP_ID)); + paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); + paramList.add(context.getWhereParameter(FieldConstant.MD5)); + String sql = "UPDATE config_info SET " + "content=?, md5=?, src_ip=?, src_user=?, gmt_modified=" + + getFunction("NOW()") + + ", app_name=?, c_desc=?, c_use=?, effect=?, type=?, c_schema=?" + + (hasEncryptedDataKeyColumn()? ", encrypted_data_key=? ":"") + + "WHERE data_id=? AND group_id=? AND tenant_id="+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()) + +" AND (md5=? OR md5 IS NULL OR md5='')"; + return new MapperResult(sql, paramList); + } + /** * 该方法没有被调用 */ -- Gitee From 682ffb5f846ae97fff36dbc277480eacb8ea8e55 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 14:03:18 +0800 Subject: [PATCH 115/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoAggr?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/mysql/MysqlDatabaseDialect.java | 2 +- .../plugin/datasource/mapper/BaseMapper.java | 23 ++++++- .../mapper/CommonConfigInfoAggrMapper.java | 64 +++---------------- 3 files changed, 31 insertions(+), 58 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java index 062c2f8..249506c 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java @@ -6,7 +6,7 @@ import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class MysqlDatabaseDialect extends NacosDatabaseDialect { - protected MysqlDatabaseDialect() { + public MysqlDatabaseDialect() { super(DatabaseTypes.MYSQL); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 0654795..7c5298f 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -2,7 +2,9 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.NamespaceUtil; import com.alibaba.nacos.common.utils.VersionUtils; +import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.AbstractMapper; +import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.sys.env.EnvUtil; import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; @@ -229,7 +231,7 @@ public abstract class BaseMapper extends AbstractMapper { String condition = where.get(i); if(Strings.equalsIgnoreCase(condition, "tenant_id") && getDialect().isAutoCastEmptyStringToNull()){ - String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); + String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", useDefaultTenantIdIfBlank(NamespaceUtil.getNamespaceDefaultId())); sql.append("tenant_id = ").append(castNullToDefaultExpression); }else{ sql.append(condition).append(" = ").append("?"); @@ -246,4 +248,23 @@ public abstract class BaseMapper extends AbstractMapper { String currentVersion = VersionUtils.getFullClientVersion(); return VersionUtils.compareVersion(currentVersion, "2.1.0")>=0; } + private static final String NAMESPACE_PUBLIC_KEY = "public"; + protected String getDefaultTenantId(){ + if(getDialect().isAutoCastEmptyStringToNull()){ + return NAMESPACE_PUBLIC_KEY; + } + return NamespaceUtil.getNamespaceDefaultId(); + } + protected String useDefaultTenantIdIfBlank(String tenantId){ + return Strings.useValueIfBlank(tenantId, getDefaultTenantId()); + } + + protected void useDefaultTenantIdWithWhereParameter(MapperContext context){ + Object tenantIdObj= context.getWhereParameter(FieldConstant.TENANT_ID); + String tenantId=null; + if(tenantIdObj!=null){ + tenantId = (String)tenantIdObj; + } + context.putWhereParameter(FieldConstant.TENANT_ID, useDefaultTenantIdIfBlank(tenantId)); + } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java index 0cc0745..5867693 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java @@ -1,6 +1,5 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoAggrMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -8,7 +7,6 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; -import java.util.ArrayList; import java.util.List; public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfoAggrMapper { @@ -25,76 +23,30 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo List columns = Lists.newArrayList("data_id","group_id","tenant_id","datum_id","app_name","content"); List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); String sql = select(columns, where) + " ORDER BY datum_id "; - List paramList = Lists.newArrayList(dataId, groupId, tenantId); + List paramList = Lists.newArrayList(dataId, groupId, useDefaultTenantIdIfBlank(tenantId)); sql = getDialect().getLimitSql(sql, false, true, rowSelection); - List pagedParams = getDialect().rebuildParameters(false, true,paramList, rowSelection); + List pagedParams = getDialect().rebuildParameters(false, true, paramList, rowSelection); return new MapperResult(sql, pagedParams); } @Override public MapperResult batchRemoveAggr(MapperContext context) { - final List datumList = (List) context.getWhereParameter(FieldConstant.DATUM_ID); - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String tenantTmp = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - - List paramList = new ArrayList<>(); - paramList.add(dataId); - paramList.add(group); - paramList.add(tenantTmp); - - final StringBuilder placeholderString = new StringBuilder(); - for (int i = 0; i < datumList.size(); i++) { - if (i != 0) { - placeholderString.append(", "); - } - placeholderString.append('?'); - paramList.add(datumList.get(i)); - } - - List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); - String sql = delete(where) +" AND datum_id IN (" + placeholderString + ")"; - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoAggrMapper.super.batchRemoveAggr(context); } @Override public MapperResult aggrConfigInfoCount(MapperContext context) { - final List datumIds = (List) context.getWhereParameter(FieldConstant.DATUM_ID); - final Boolean isIn = (Boolean) context.getWhereParameter(FieldConstant.IS_IN); - String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - String tenantTmp = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - - List paramList = CollectionUtils.list(dataId, group, tenantTmp); - - List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); - StringBuilder sql = new StringBuilder(count(where)).append(" AND datum_id ").append(isIn? "": " NOT ").append(" IN ( "); - for (int i = 0; i < datumIds.size(); i++) { - if (i > 0) { - sql.append(", "); - } - sql.append('?'); - paramList.add(datumIds.get(i)); - } - sql.append(')'); - - return new MapperResult(sql.toString(), paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoAggrMapper.super.aggrConfigInfoCount(context); } @Override public MapperResult findConfigInfoAggrIsOrdered(MapperContext context) { - String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - String groupId = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - - List selectedColumns = Lists.newArrayList("data_id","group_id","tenant_id","datum_id","app_name","content"); - List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); - String sql = select(selectedColumns, where) + " ORDER BY datum_id"; - List paramList = CollectionUtils.list(dataId, groupId, tenantId); - - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoAggrMapper.super.findConfigInfoAggrIsOrdered(context); } } -- Gitee From 49bace19c658972ae669f86f83b72c13fdf9f904 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 14:04:53 +0800 Subject: [PATCH 116/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoBeta?= =?UTF-8?q?Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoBetaMapper.java | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java index 3054165..3140d54 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoBetaMapper.java @@ -1,13 +1,11 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoBetaMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; -import java.util.ArrayList; import java.util.List; public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfoBetaMapper { @@ -34,27 +32,7 @@ public class CommonConfigInfoBetaMapper extends BaseMapper implements ConfigInfo @Override public MapperResult updateConfigInfo4BetaCas(MapperContext context) { - - List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); - final String sql = "UPDATE config_info_beta SET content = ?,md5 = ?,beta_ips = ?,src_ip = ?,src_user = ?,gmt_modified = " - + getFunction("NOW()") - + ",app_name = ? " + genWhereClause(where) - + " AND (md5 = ? OR md5 is null OR md5 = '')"; - - List paramList = new ArrayList<>(); - - paramList.add(context.getUpdateParameter(FieldConstant.CONTENT)); - paramList.add(context.getUpdateParameter(FieldConstant.MD5)); - paramList.add(context.getUpdateParameter(FieldConstant.BETA_IPS)); - paramList.add(context.getUpdateParameter(FieldConstant.SRC_IP)); - paramList.add(context.getUpdateParameter(FieldConstant.SRC_USER)); - paramList.add(context.getUpdateParameter(FieldConstant.APP_NAME)); - - paramList.add(context.getWhereParameter(FieldConstant.DATA_ID)); - paramList.add(context.getWhereParameter(FieldConstant.GROUP_ID)); - paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); - paramList.add(context.getWhereParameter(FieldConstant.MD5)); - - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoBetaMapper.super.updateConfigInfo4BetaCas(context); } } -- Gitee From 548362819452279e51ef7ffd4c7fab9adf25b4eb Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 14:11:26 +0800 Subject: [PATCH 117/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 193 ++---------------- 1 file changed, 14 insertions(+), 179 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index 108341a..a54186a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -39,209 +39,44 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp @Override public MapperResult findConfigInfoByAppCountRows(MapperContext context) { - String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); - String appName = (String)context.getWhereParameter(FieldConstant.APP_NAME); - - StringBuilder sqlBuilder = new StringBuilder("SELECT count(*) FROM config_info WHERE "); - List paramList = Lists.newArrayList(); - if(Strings.isBlank(tenantId)){ - sqlBuilder.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - sqlBuilder.append(" tenant_id LIKE ?"); - paramList.add(tenantId); - } - String sql = sqlBuilder.append(" AND app_name = ?").toString(); - paramList.add(appName); - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.findConfigInfoByAppCountRows(context); } @Override public MapperResult configInfoLikeTenantCount(MapperContext context) { - String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - - List paramList = Lists.newArrayList(); - StringBuilder sqlBuilder= new StringBuilder("SELECT count(*) FROM config_info WHERE "); - if(Strings.isBlank(tenantId)){ - sqlBuilder.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - sqlBuilder.append(" tenant_id LIKE ?"); - paramList.add(tenantId); - } - String sql = sqlBuilder.toString(); - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.configInfoLikeTenantCount(context); } @Override public MapperResult findAllConfigInfo4Export(MapperContext context) { - List ids = (List) context.getWhereParameter(FieldConstant.IDS); - - String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type,md5,gmt_create,gmt_modified," - + "src_user,src_ip,c_desc,c_use,effect,c_schema,encrypted_data_key FROM config_info"; - StringBuilder where = new StringBuilder(" WHERE "); - - List paramList = new ArrayList<>(); - if (!CollectionUtils.isEmpty(ids)) { - where.append(" id IN ("); - for (int i = 0; i < ids.size(); i++) { - if (i != 0) { - where.append(", "); - } - where.append('?'); - paramList.add(ids.get(i)); - } - where.append(") "); - } else { - - - String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); - String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); - - where.append(" tenant_id = "+ getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); - paramList.add(tenantId); - - if (StringUtils.isNotBlank(dataId)) { - where.append(" AND data_id LIKE ? "); - paramList.add(dataId); - } - if (StringUtils.isNotBlank(group)) { - where.append(" AND group_id= ? "); - paramList.add(group); - } - if (StringUtils.isNotBlank(appName)) { - where.append(" AND app_name= ? "); - paramList.add(appName); - } - } - return new MapperResult(sql + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.findAllConfigInfo4Export(context); } @Override public MapperResult findConfigInfoBaseLikeCountRows(MapperContext context) { - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - - final List paramList = new ArrayList<>(); - final String sqlCountRows = "SELECT count(*) FROM config_info WHERE "; - String where = "tenant_id='" + NamespaceUtil.getNamespaceDefaultId() + "' "; - - if (!StringUtils.isBlank(dataId)) { - where += " AND data_id LIKE ? "; - paramList.add(dataId); - } - if (!StringUtils.isBlank(group)) { - where += " AND group_id LIKE ? "; - paramList.add(group); - } - if (!StringUtils.isBlank(content)) { - where += " AND content LIKE ? "; - paramList.add(content); - } - return new MapperResult(sqlCountRows + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.findConfigInfoBaseLikeCountRows(context); } @Override public MapperResult findConfigInfo4PageCountRows(MapperContext context) { - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); - final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - final List paramList = new ArrayList<>(); - - final String sqlCount = "SELECT count(*) FROM config_info"; - StringBuilder where = new StringBuilder(" WHERE "); - where.append(" tenant_id= " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); - paramList.add(tenantId); - if (StringUtils.isNotBlank(dataId)) { - where.append(" AND data_id=? "); - paramList.add(dataId); - } - if (StringUtils.isNotBlank(group)) { - where.append(" AND group_id=? "); - paramList.add(group); - } - if (StringUtils.isNotBlank(appName)) { - where.append(" AND app_name=? "); - paramList.add(appName); - } - if (!StringUtils.isBlank(content)) { - where.append(" AND content LIKE ? "); - paramList.add(content); - } - return new MapperResult(sqlCount + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.findConfigInfo4PageCountRows(context); } @Override public MapperResult findConfigInfoLike4PageCountRows(MapperContext context) { - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); - final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - - final List paramList = new ArrayList<>(); - - final String sqlCountRows = "SELECT count(*) FROM config_info"; - StringBuilder where = new StringBuilder(" WHERE "); - - if(Strings.isBlank(tenantId)){ - where.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - where.append(" tenant_id LIKE ? "); - paramList.add(tenantId); - } - - - if (!StringUtils.isBlank(dataId)) { - where.append(" AND data_id LIKE ? "); - paramList.add(dataId); - } - if (!StringUtils.isBlank(group)) { - where.append(" AND group_id LIKE ? "); - paramList.add(group); - } - if (!StringUtils.isBlank(appName)) { - where.append(" AND app_name = ? "); - paramList.add(appName); - } - if (!StringUtils.isBlank(content)) { - where.append(" AND content LIKE ? "); - paramList.add(content); - } - return new MapperResult(sqlCountRows + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.findConfigInfoLike4PageCountRows(context); } @Override public MapperResult updateConfigInfoAtomicCas(MapperContext context) { - List paramList = new ArrayList<>(); - - paramList.add(context.getUpdateParameter(FieldConstant.CONTENT)); - paramList.add(context.getUpdateParameter(FieldConstant.MD5)); - paramList.add(context.getUpdateParameter(FieldConstant.SRC_IP)); - paramList.add(context.getUpdateParameter(FieldConstant.SRC_USER)); - paramList.add(context.getUpdateParameter(FieldConstant.APP_NAME)); - paramList.add(context.getUpdateParameter(FieldConstant.C_DESC)); - paramList.add(context.getUpdateParameter(FieldConstant.C_USE)); - paramList.add(context.getUpdateParameter(FieldConstant.EFFECT)); - paramList.add(context.getUpdateParameter(FieldConstant.TYPE)); - paramList.add(context.getUpdateParameter(FieldConstant.C_SCHEMA)); - if(hasEncryptedDataKeyColumn()) { - paramList.add(context.getUpdateParameter(FieldConstant.ENCRYPTED_DATA_KEY)); - } - paramList.add(context.getWhereParameter(FieldConstant.DATA_ID)); - paramList.add(context.getWhereParameter(FieldConstant.GROUP_ID)); - paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); - paramList.add(context.getWhereParameter(FieldConstant.MD5)); - String sql = "UPDATE config_info SET " + "content=?, md5=?, src_ip=?, src_user=?, gmt_modified=" - + getFunction("NOW()") - + ", app_name=?, c_desc=?, c_use=?, effect=?, type=?, c_schema=?" - + (hasEncryptedDataKeyColumn()? ", encrypted_data_key=? ":"") - + "WHERE data_id=? AND group_id=? AND tenant_id="+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()) - +" AND (md5=? OR md5 IS NULL OR md5='')"; - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoMapper.super.updateConfigInfoAtomicCas(context); } /** -- Gitee From 0f144b5cb64725e60ec114825de46d64234b76f9 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 14:32:54 +0800 Subject: [PATCH 118/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20ConfigInfoMapp?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoMapper.java | 83 +++++++------------ 1 file changed, 32 insertions(+), 51 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index a54186a..c2cdefa 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -84,24 +84,18 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp */ @Override public MapperResult findConfigInfoByAppFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); + final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - List paramList = Lists.newArrayList(); - StringBuilder sqlBuilder = new StringBuilder("SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE "); - if(Strings.isBlank(tenantId)){ - sqlBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - sqlBuilder.append(" tenant_id LIKE ?"); - paramList.add(tenantId); - } - String sql = sqlBuilder.append(" AND app_name = ? order by id asc").toString(); + String sql= "SELECT ID,data_id,group_id,tenant_id,app_name,content FROM config_info WHERE tenant_id LIKE ? AND app_name = ? order by id asc"; + paramList.add(tenantId); paramList.add(appName); - sql = getDialect().getLimitSql(sql, rowSelection); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); @@ -111,46 +105,40 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp @Override public MapperResult getTenantIdList(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != '" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY tenant_id "; + String sql = "SELECT tenant_id FROM config_info WHERE tenant_id != ? GROUP BY tenant_id "; sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(tenantId), rowSelection); return new MapperResult(sql, pagedParams); } @Override public MapperResult getGroupIdList(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT group_id FROM config_info WHERE tenant_id ='" + NamespaceUtil.getNamespaceDefaultId() + "' GROUP BY group_id "; + String sql = "SELECT group_id FROM config_info WHERE tenant_id = ? GROUP BY group_id "; sql = getDialect().getLimitSql(sql, rowSelection); - List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(), rowSelection); + List pagedParams = getDialect().rebuildParameters(Lists.newArrayList(tenantId), rowSelection); return new MapperResult(sql, pagedParams); } - - /** * 该方法没有被调用 */ @Override public MapperResult findAllConfigKey(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); - List paramList = Lists.newArrayList(); - StringBuilder subqueryBuilder = new StringBuilder("SELECT id FROM config_info WHERE "); - if(Strings.isBlank(tenantId)){ - subqueryBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - subqueryBuilder.append("tenant_id LIKE ?"); - paramList.add(tenantId); - } - - String subquery = subqueryBuilder.append("ORDER BY id ").toString(); - + String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; + paramList.add(tenantId); String pagedSubquery = getDialect().getLimitSql(subquery, true,true, rowSelection); String sql = " SELECT data_id,group_id,app_name FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id "; @@ -190,7 +178,6 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp } - /** * 该方法没有被调用 */ @@ -252,7 +239,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String subquery = "SELECT id FROM config_info ORDER BY id "; String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); - String sql = " SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id"; + String sql = "SELECT t.id,data_id,group_id,tenant_id,app_name,type,md5,gmt_modified FROM ( " + pagedSubquery + " ) g, config_info t WHERE g.id = t.id"; List pagedParams = getDialect().rebuildParameters(true, true, Collects.emptyArrayList(), rowSelection); return new MapperResult(sql, pagedParams); @@ -264,13 +251,16 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp */ @Override public MapperResult findConfigInfoBaseLikeFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); + final String tenant = (String) context.getWhereParameter(FieldConstant.TENANT); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); List paramList = new ArrayList<>(); final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,content FROM config_info WHERE "; - String where = " tenant_id='" + NamespaceUtil.getNamespaceDefaultId() + "' "; + String where = " tenant_id= ? "; + paramList.add(tenant); if (!Strings.isBlank(dataId)) { where += " AND data_id LIKE ? "; paramList.add(dataId); @@ -294,6 +284,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); @@ -304,7 +295,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp String sql = "SELECT id,data_id,group_id,tenant_id,app_name,content,type FROM config_info"; StringBuilder where = new StringBuilder(" WHERE "); - where.append(" tenant_id= " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); + where.append(" tenant_id= ?" ); paramList.add(tenantId); if (Strings.isNotBlank(dataId)) { where.append(" AND data_id=? "); @@ -339,12 +330,13 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp */ @Override public MapperResult findConfigInfoBaseByGroupFetchRows(MapperContext context) { - + useDefaultTenantIdWithWhereParameter(context); + String tenantId = (String)context.getWhereParameter(FieldConstant.TENANT_ID); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); - String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id="+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" order by id asc"; + String sql = "SELECT id,data_id,group_id,content FROM config_info WHERE group_id=? AND tenant_id=? order by id asc"; List paramList = Lists.newArrayList(context.getWhereParameter(FieldConstant.GROUP_ID), - context.getWhereParameter(FieldConstant.TENANT_ID)); + context.getWhereParameter(FieldConstant.TENANT_ID), tenantId); List pagedParams = getDialect().rebuildParameters(paramList, rowSelection); return new MapperResult(sql, pagedParams); } @@ -352,7 +344,7 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { - + useDefaultTenantIdWithWhereParameter(context); final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); @@ -364,12 +356,8 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp final String sqlFetchRows = "SELECT id,data_id,group_id,tenant_id,app_name,content,encrypted_data_key FROM config_info"; StringBuilder where = new StringBuilder(" WHERE "); - if(Strings.isBlank(tenantId)){ - where.append(" tenant_id='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - where.append(" tenant_id LIKE ? "); - paramList.add(tenantId); - } + where.append(" tenant_id LIKE ? "); + paramList.add(tenantId); if (!Strings.isBlank(dataId)) { where.append(" AND data_id LIKE ? "); paramList.add(dataId); @@ -400,23 +388,16 @@ public class CommonConfigInfoMapper extends BaseMapper implements ConfigInfoMapp */ @Override public MapperResult findAllConfigInfoFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); String tenantId =(String) context.getWhereParameter(FieldConstant.TENANT_ID); List paramList = Lists.newArrayList(); + String subquery = "SELECT id FROM config_info WHERE tenant_id LIKE ? ORDER BY id "; - StringBuilder subqueryBuilder = new StringBuilder("SELECT id FROM config_info WHERE "); - if(Strings.isBlank(tenantId)){ - subqueryBuilder.append(" tenant_id= '").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - subqueryBuilder.append("tenant_id LIKE ?"); - paramList.add(tenantId); - } - - String subquery = subqueryBuilder.append(" ORDER BY id ").toString(); String pagedSubquery = getDialect().getLimitSql(subquery,true,true, rowSelection); - + paramList.add(tenantId); List pagedParams = getDialect().rebuildParameters(true,true, paramList, rowSelection); -- Gitee From d7a1f9056680bf9be749b3cee6fdbd05279f677f Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 15:04:08 +0800 Subject: [PATCH 119/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20Mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CommonConfigInfoAggrMapper.java | 3 +- .../mapper/CommonConfigInfoTagMapper.java | 22 +--- .../mapper/CommonConfigTagRelationMapper.java | 103 ++---------------- .../mapper/CommonHistoryConfigInfoMapper.java | 13 +-- .../mapper/CommonTenantCapacityMapper.java | 50 ++------- 5 files changed, 29 insertions(+), 162 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java index 5867693..951d451 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoAggrMapper.java @@ -13,6 +13,7 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo @Override public MapperResult findConfigInfoAggrByPageFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); final int startRow = context.getStartRow(); final int pageSize = context.getPageSize(); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); @@ -23,7 +24,7 @@ public class CommonConfigInfoAggrMapper extends BaseMapper implements ConfigInfo List columns = Lists.newArrayList("data_id","group_id","tenant_id","datum_id","app_name","content"); List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); String sql = select(columns, where) + " ORDER BY datum_id "; - List paramList = Lists.newArrayList(dataId, groupId, useDefaultTenantIdIfBlank(tenantId)); + List paramList = Lists.newArrayList(dataId, groupId, tenantId); sql = getDialect().getLimitSql(sql, false, true, rowSelection); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index a8f3f06..451c704 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -2,6 +2,7 @@ package com.jn.nacos.plugin.datasource.mapper; import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; +import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; @@ -29,24 +30,7 @@ public class CommonConfigInfoTagMapper extends BaseMapper implements ConfigInfoT @Override public MapperResult updateConfigInfo4TagCas(MapperContext context) { - Object content = context.getUpdateParameter(FieldConstant.CONTENT); - Object md5 = context.getUpdateParameter(FieldConstant.MD5); - Object srcIp = context.getUpdateParameter(FieldConstant.SRC_IP); - Object srcUser = context.getUpdateParameter(FieldConstant.SRC_USER); - Object gmtModified = context.getUpdateParameter(FieldConstant.GMT_MODIFIED); - Object appName = context.getUpdateParameter(FieldConstant.APP_NAME); - - Object dataId = context.getWhereParameter(FieldConstant.DATA_ID); - Object groupId = context.getWhereParameter(FieldConstant.GROUP_ID); - Object tenantId = context.getWhereParameter(FieldConstant.TENANT_ID); - Object tagId = context.getWhereParameter(FieldConstant.TAG_ID); - Object oldMd5 = context.getWhereParameter(FieldConstant.MD5); - - List updatedColumns = Lists.newArrayList("content", "md5", "src_ip", "src_user", "gmt_modified", "app_name"); - List where = Lists.newArrayList("data_id", "group_id", "tenant_id", "tag_id"); - String sql = update(updatedColumns, where)+ " AND (md5 = ? OR md5 IS NULL OR md5 = '')"; - return new MapperResult(sql, - CollectionUtils.list(content, md5, srcIp, srcUser, gmtModified, appName, dataId, groupId, tenantId, - tagId, oldMd5)); + useDefaultTenantIdWithWhereParameter(context); + return ConfigInfoTagMapper.super.updateConfigInfo4TagCas(context); } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java index c31e5b3..2bf087b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigTagRelationMapper.java @@ -1,7 +1,5 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.NamespaceUtil; -import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigTagsRelationMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -17,99 +15,19 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT @Override public MapperResult findConfigInfo4PageCountRows(MapperContext context) { - final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); - final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); - - List paramList = new ArrayList<>(); - StringBuilder where = new StringBuilder(" WHERE "); - final String sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id"; - - where.append(" a.tenant_id=" + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); - paramList.add(tenantId); - if (StringUtils.isNotBlank(dataId)) { - where.append(" AND a.data_id=? "); - paramList.add(dataId); - } - if (StringUtils.isNotBlank(group)) { - where.append(" AND a.group_id=? "); - paramList.add(group); - } - if (StringUtils.isNotBlank(appName)) { - where.append(" AND a.app_name=? "); - paramList.add(appName); - } - if (!StringUtils.isBlank(content)) { - where.append(" AND a.content LIKE ? "); - paramList.add(content); - } - where.append(" AND b.tag_name IN ("); - for (int i = 0; i < tagArr.length; i++) { - if (i != 0) { - where.append(", "); - } - where.append('?'); - paramList.add(tagArr[i]); - - } - where.append(") "); - return new MapperResult(sqlCount + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigTagsRelationMapper.super.findConfigInfo4PageCountRows(context); } @Override public MapperResult findConfigInfoLike4PageCountRows(MapperContext context) { - final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); - final String tenantId = (String) context.getWhereParameter(FieldConstant.TENANT_ID); - final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); - final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); - final String content = (String) context.getWhereParameter(FieldConstant.CONTENT); - final String[] tagArr = (String[]) context.getWhereParameter(FieldConstant.TAG_ARR); - - List paramList = new ArrayList<>(); - StringBuilder where = new StringBuilder(" WHERE "); - final String sqlCount = "SELECT count(*) FROM config_info a LEFT JOIN config_tags_relation b ON a.id=b.id "; - - if(Strings.isBlank(tenantId)){ - where.append(" a.tenant_id ='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - where.append(" a.tenant_id LIKE ? "); - paramList.add(tenantId); - } - - if (!StringUtils.isBlank(dataId)) { - where.append(" AND a.data_id LIKE ? "); - paramList.add(dataId); - } - if (StringUtils.isNotBlank(group)) { - where.append(" AND a.group_id LIKE ? "); - paramList.add(group); - } - if (StringUtils.isNotBlank(appName)) { - where.append(" AND a.app_name = ? "); - paramList.add(appName); - } - if (StringUtils.isNotBlank(content)) { - where.append(" AND a.content LIKE ? "); - paramList.add(content); - } - - where.append(" AND b.tag_name IN ("); - for (int i = 0; i < tagArr.length; i++) { - if (i != 0) { - where.append(", "); - } - where.append('?'); - paramList.add(tagArr[i]); - } - where.append(") "); - return new MapperResult(sqlCount + where, paramList); + useDefaultTenantIdWithWhereParameter(context); + return ConfigTagsRelationMapper.super.findConfigInfoLike4PageCountRows(context); } @Override public MapperResult findConfigInfo4PageFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); @@ -124,7 +42,7 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT + "config_tags_relation b ON a.id=b.id"; StringBuilder where = new StringBuilder(" WHERE "); - where.append(" a.tenant_id=" + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())); + where.append(" a.tenant_id=? "); paramList.add(tenantId); if (Strings.isNotBlank(dataId)) { @@ -166,6 +84,7 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT @Override public MapperResult findConfigInfoLike4PageFetchRows(MapperContext context) { + useDefaultTenantIdWithWhereParameter(context); final String appName = (String) context.getWhereParameter(FieldConstant.APP_NAME); final String dataId = (String) context.getWhereParameter(FieldConstant.DATA_ID); final String group = (String) context.getWhereParameter(FieldConstant.GROUP_ID); @@ -179,12 +98,8 @@ public class CommonConfigTagRelationMapper extends BaseMapper implements ConfigT "SELECT a.ID,a.data_id,a.group_id,a.tenant_id,a.app_name,a.content FROM config_info a LEFT JOIN " + "config_tags_relation b ON a.id=b.id "; - if(Strings.isBlank(tenantId)){ - where.append(" a.tenant_id ='").append(NamespaceUtil.getNamespaceDefaultId()).append("' "); - }else{ - where.append(" a.tenant_id LIKE ? "); - paramList.add(tenantId); - } + where.append(" a.tenant_id LIKE ? "); + paramList.add(tenantId); if (!Strings.isBlank(dataId)) { where.append(" AND a.data_id LIKE ? "); diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index 6d5736d..66a6a23 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -30,7 +30,7 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History */ @Override public MapperResult pageFindConfigHistoryFetchRows(MapperContext context) { - + useDefaultTenantIdWithWhereParameter(context); RowSelection rowSelection = new RowSelection(context.getStartRow(), context.getPageSize()); List selectedColumns = Lists.newArrayList("nid","data_id","group_id","tenant_id","app_name","src_ip","src_user","op_type","gmt_create","gmt_modified"); @@ -65,14 +65,7 @@ public class CommonHistoryConfigInfoMapper extends BaseMapper implements History @Override public MapperResult findConfigHistoryFetchRows(MapperContext context) { - - List where = Lists.newArrayList("data_id", "group_id", "tenant_id"); - StringBuilder sql = new StringBuilder("SELECT nid,data_id,group_id,tenant_id,app_name,src_ip,src_user,op_type,gmt_create,gmt_modified FROM his_config_info ") - .append(genWhereClause(where)) - .append(" ORDER BY nid DESC"); - return new MapperResult(sql.toString(), - CollectionUtils.list(context.getWhereParameter(FieldConstant.DATA_ID), - context.getWhereParameter(FieldConstant.GROUP_ID), - context.getWhereParameter(FieldConstant.TENANT_ID))); + useDefaultTenantIdWithWhereParameter(context); + return HistoryConfigInfoMapper.super.findConfigHistoryFetchRows(context); } } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java index 8a32d39..829ac59 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonTenantCapacityMapper.java @@ -1,7 +1,5 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; -import com.alibaba.nacos.common.utils.NamespaceUtil; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.TenantCapacityMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; @@ -9,7 +7,6 @@ import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; -import java.util.ArrayList; import java.util.List; public class CommonTenantCapacityMapper extends BaseMapper implements TenantCapacityMapper { @@ -29,60 +26,37 @@ public class CommonTenantCapacityMapper extends BaseMapper implements TenantCapa @Override public MapperResult incrementUsageWithDefaultQuotaLimit(MapperContext context) { - String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = "+ getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage < ? AND quota = 0"; - return new MapperResult( sql, - CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), - context.getWhereParameter(FieldConstant.TENANT_ID), - context.getWhereParameter(FieldConstant.USAGE))); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.incrementUsageWithDefaultQuotaLimit(context); } @Override public MapperResult incrementUsageWithQuotaLimit(MapperContext context) { - String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage < quota AND quota != 0"; - return new MapperResult(sql, - CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), - context.getWhereParameter(FieldConstant.TENANT_ID))); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.incrementUsageWithQuotaLimit(context); } @Override public MapperResult incrementUsage(MapperContext context) { - String sql = "UPDATE tenant_capacity SET usage = usage + 1, gmt_modified = ? WHERE tenant_id = " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); - return new MapperResult(sql, - CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), - context.getWhereParameter(FieldConstant.TENANT_ID))); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.incrementUsage(context); } @Override public MapperResult decrementUsage(MapperContext context) { - String sql = "UPDATE tenant_capacity SET usage = usage - 1, gmt_modified = ? WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+" AND usage > 0"; - return new MapperResult(sql , - CollectionUtils.list(context.getUpdateParameter(FieldConstant.GMT_MODIFIED), - context.getWhereParameter(FieldConstant.TENANT_ID))); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.decrementUsage(context); } @Override public MapperResult insertTenantCapacity(MapperContext context) { - List paramList = new ArrayList<>(); - paramList.add(context.getUpdateParameter(FieldConstant.TENANT_ID)); - paramList.add(context.getUpdateParameter(FieldConstant.QUOTA)); - paramList.add(context.getUpdateParameter(FieldConstant.MAX_SIZE)); - paramList.add(context.getUpdateParameter(FieldConstant.MAX_AGGR_COUNT)); - paramList.add(context.getUpdateParameter(FieldConstant.MAX_AGGR_SIZE)); - paramList.add(context.getUpdateParameter(FieldConstant.GMT_CREATE)); - paramList.add(context.getUpdateParameter(FieldConstant.GMT_MODIFIED)); - paramList.add(context.getWhereParameter(FieldConstant.TENANT_ID)); - - String sql = "INSERT INTO tenant_capacity (tenant_id, quota, usage, max_size, max_aggr_count, max_aggr_size, " - + "gmt_create, gmt_modified) SELECT ?, ?, count(*), ?, ?, ?, ?, ? FROM config_info WHERE tenant_id= " + getDialect().genCastNullToDefaultExpression("?",NamespaceUtil.getNamespaceDefaultId()); - return new MapperResult(sql, paramList); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.insertTenantCapacity(context); } @Override public MapperResult correctUsage(MapperContext context) { - String sql= "UPDATE tenant_capacity SET usage = (SELECT count(*) FROM config_info WHERE tenant_id = "+getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId())+"), gmt_modified = ? WHERE tenant_id = " + getDialect().genCastNullToDefaultExpression("?", NamespaceUtil.getNamespaceDefaultId()); - return new MapperResult(sql, - CollectionUtils.list(context.getWhereParameter(FieldConstant.TENANT_ID), - context.getUpdateParameter(FieldConstant.GMT_MODIFIED), - context.getWhereParameter(FieldConstant.TENANT_ID))); + useDefaultTenantIdWithWhereParameter(context); + return TenantCapacityMapper.super.correctUsage(context); } } -- Gitee From adfe90eb6fb6dd2258edbfcc5fb9779f652c33ee Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 15:12:03 +0800 Subject: [PATCH 120/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/CommonConfigInfoMapper.java | 3 --- .../plugin/datasource/mapper/CommonConfigInfoTagMapper.java | 4 ---- .../datasource/mapper/CommonHistoryConfigInfoMapper.java | 1 - 3 files changed, 8 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java index c2cdefa..9f7cd07 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoMapper.java @@ -1,8 +1,5 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; -import com.alibaba.nacos.common.utils.NamespaceUtil; -import com.alibaba.nacos.common.utils.StringUtils; import com.alibaba.nacos.plugin.datasource.constants.ContextConstant; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java index 451c704..5dedf09 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonConfigInfoTagMapper.java @@ -1,13 +1,9 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; -import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; -import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.mapper.ConfigInfoTagMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; import com.alibaba.nacos.plugin.datasource.model.MapperResult; import com.jn.langx.util.collection.Collects; -import com.jn.langx.util.collection.Lists; import com.jn.sqlhelper.dialect.pagination.RowSelection; import java.util.List; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java index 66a6a23..0e5244c 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/CommonHistoryConfigInfoMapper.java @@ -1,6 +1,5 @@ package com.jn.nacos.plugin.datasource.mapper; -import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.plugin.datasource.constants.FieldConstant; import com.alibaba.nacos.plugin.datasource.mapper.HistoryConfigInfoMapper; import com.alibaba.nacos.plugin.datasource.model.MapperContext; -- Gitee From 76dc754172bd0d562e6d0b8d7a9ede3b522c957a Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 15:51:39 +0800 Subject: [PATCH 121/159] =?UTF-8?q?*=20=E7=A1=AE=E4=BF=9Doracle=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=9C=A8Public=E5=90=8D=E7=A7=B0=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E4=B8=8A=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/mapper/BaseMapper.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 7c5298f..5df4b33 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -122,10 +122,16 @@ public abstract class BaseMapper extends AbstractMapper { sql.append(method); sql.append(getTableName()); + + int tenantIdColumnIndex = -1; int size = columns.size(); sql.append("("); for (int i = 0; i < size; i++) { - sql.append(columns.get(i).split("@")[0]); + String columnName= columns.get(i).split("@")[0]; + if(Objs.equals(columnName, "tenant_id")){ + tenantIdColumnIndex = i; + } + sql.append(columnName); if (i != columns.size() - 1) { sql.append(", "); } @@ -139,7 +145,11 @@ public abstract class BaseMapper extends AbstractMapper { if (parts.length == 2) { sql.append(getFunction(parts[1])); } else { - sql.append("?"); + if(i==tenantIdColumnIndex){ + sql.append(getDialect().genCastNullToDefaultExpression("?", getDefaultTenantId())); + }else { + sql.append("?"); + } } if (i != columns.size() - 1) { sql.append(","); @@ -231,7 +241,7 @@ public abstract class BaseMapper extends AbstractMapper { String condition = where.get(i); if(Strings.equalsIgnoreCase(condition, "tenant_id") && getDialect().isAutoCastEmptyStringToNull()){ - String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", useDefaultTenantIdIfBlank(NamespaceUtil.getNamespaceDefaultId())); + String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", getDefaultTenantId()); sql.append("tenant_id = ").append(castNullToDefaultExpression); }else{ sql.append(condition).append(" = ").append("?"); -- Gitee From b1a68efb8005783c96829396ed7856a04b4aac60 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Fri, 6 Sep 2024 15:52:38 +0800 Subject: [PATCH 122/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0public?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/oracle/create-tables.sql | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql index 43f053f..c402b3a 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/oracle/create-tables.sql @@ -15,7 +15,7 @@ CREATE TABLE config_info ( src_user CLOB , src_ip varchar2(20) , app_name varchar2(128) , - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', c_desc varchar2(256) , c_use varchar2(64) , effect varchar2(64) , @@ -58,7 +58,7 @@ CREATE TABLE config_info_aggr ( content CLOB NOT NULL, gmt_modified timestamp(6) NOT NULL, app_name varchar2(128) , - tenant_id varchar2(128) DEFAULT 'PUBLIC' + tenant_id varchar2(128) DEFAULT 'public' ); COMMENT ON COLUMN config_info_aggr.id IS 'id'; COMMENT ON COLUMN config_info_aggr.data_id IS 'data_id'; @@ -96,7 +96,7 @@ CREATE TABLE config_info_beta ( gmt_modified timestamp(6) NOT NULL, src_user CLOB , src_ip varchar2(20) , - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', encrypted_data_key CLOB NOT NULL ); COMMENT ON COLUMN config_info_beta.id IS 'id'; @@ -134,7 +134,7 @@ CREATE TABLE config_info_tag ( id int NOT NULL, data_id varchar2(255) NOT NULL, group_id varchar2(128) NOT NULL, - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', tag_id varchar2(128) NOT NULL, app_name varchar2(128) , content CLOB NOT NULL, @@ -179,7 +179,7 @@ CREATE TABLE config_tags_relation ( tag_type varchar2(64) , data_id varchar2(255) NOT NULL, group_id varchar2(128) NOT NULL, - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', nid int NOT NULL ); COMMENT ON COLUMN config_tags_relation.id IS 'id'; @@ -258,7 +258,7 @@ CREATE TABLE his_config_info ( src_user CLOB , src_ip varchar2(20) , op_type char(10) , - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', encrypted_data_key CLOB DEFAULT '' ); COMMENT ON COLUMN his_config_info.app_name IS 'app_name'; @@ -339,7 +339,7 @@ DROP TABLE IF EXISTS tenant_info; CREATE TABLE tenant_info ( id int NOT NULL, kp varchar2(128) NOT NULL, - tenant_id varchar2(128) DEFAULT 'PUBLIC', + tenant_id varchar2(128) DEFAULT 'public', tenant_name varchar2(128) , tenant_desc varchar2(256) , create_source varchar2(32) , -- Gitee From ec7bf998907ca9656f524c9ebaae8738cd25d208 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 21:36:32 +0800 Subject: [PATCH 123/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20mysql=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/mysql/create-tables.sql | 13 ++++++++++++- nacosplugin-datasource/installation.MD | 16 ++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql index 301519f..305bec3 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/mysql/create-tables.sql @@ -2,6 +2,7 @@ use nacos; /******************************************/ /* 表名称 = config_info */ /******************************************/ +DROP TABLE IF EXISTS `config_info`; CREATE TABLE `config_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', @@ -27,6 +28,7 @@ CREATE TABLE `config_info` ( /******************************************/ /* 表名称 = config_info_aggr */ /******************************************/ +DROP TABLE IF EXISTS `config_info_aggr`; CREATE TABLE `config_info_aggr` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', @@ -44,6 +46,7 @@ CREATE TABLE `config_info_aggr` ( /******************************************/ /* 表名称 = config_info_beta */ /******************************************/ +DROP TABLE IF EXISTS `config_info_beta`; CREATE TABLE `config_info_beta` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', @@ -65,6 +68,7 @@ CREATE TABLE `config_info_beta` ( /******************************************/ /* 表名称 = config_info_tag */ /******************************************/ +DROP TABLE IF EXISTS `config_info_tag`; CREATE TABLE `config_info_tag` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `data_id` varchar(255) NOT NULL COMMENT 'data_id', @@ -85,6 +89,7 @@ CREATE TABLE `config_info_tag` ( /******************************************/ /* 表名称 = config_tags_relation */ /******************************************/ +DROP TABLE IF EXISTS `config_tags_relation`; CREATE TABLE `config_tags_relation` ( `id` bigint(20) NOT NULL COMMENT 'id', `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', @@ -101,6 +106,7 @@ CREATE TABLE `config_tags_relation` ( /******************************************/ /* 表名称 = group_capacity */ /******************************************/ +DROP TABLE IF EXISTS `group_capacity`; CREATE TABLE `group_capacity` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `group_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', @@ -119,6 +125,7 @@ CREATE TABLE `group_capacity` ( /******************************************/ /* 表名称 = his_config_info */ /******************************************/ +DROP TABLE IF EXISTS `his_config_info`; CREATE TABLE `his_config_info` ( `id` bigint(20) unsigned NOT NULL COMMENT 'id', `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'nid, 自增标识', @@ -144,6 +151,7 @@ CREATE TABLE `his_config_info` ( /******************************************/ /* 表名称 = tenant_capacity */ /******************************************/ +DROP TABLE IF EXISTS `tenant_capacity`; CREATE TABLE `tenant_capacity` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', `tenant_id` varchar(128) NOT NULL DEFAULT '' COMMENT 'Tenant ID', @@ -159,7 +167,7 @@ CREATE TABLE `tenant_capacity` ( UNIQUE KEY `uk_tenant_id` (`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; - +DROP TABLE IF EXISTS `tenant_info`; CREATE TABLE `tenant_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', `kp` varchar(128) NOT NULL COMMENT 'kp', @@ -174,18 +182,21 @@ CREATE TABLE `tenant_info` ( KEY `idx_tenant_id` (`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; +DROP TABLE IF EXISTS `users`; CREATE TABLE `users` ( `username` varchar(50) NOT NULL PRIMARY KEY COMMENT 'username', `password` varchar(500) NOT NULL COMMENT 'password', `enabled` boolean NOT NULL COMMENT 'enabled' ); +DROP TABLE IF EXISTS `roles`; CREATE TABLE `roles` ( `username` varchar(50) NOT NULL COMMENT 'username', `role` varchar(50) NOT NULL COMMENT 'role', UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE ); +DROP TABLE IF EXISTS `permissions`; CREATE TABLE `permissions` ( `role` varchar(50) NOT NULL COMMENT 'role', `resource` varchar(128) NOT NULL COMMENT 'resource', diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 99f1b57..e3112f4 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -11,7 +11,7 @@ io.github.bes2008.solution.nacosplugins:nacosplugin-all:jar:1.0.0 # PostgreSQL spring.sql.init.platform=postgresql db.num=1 -db.url.0=jdbc:postgresql://192.168.188.131:5432/db1?currentSchema=nacos +db.url.0=jdbc:postgresql://localhost:5432/db1?currentSchema=nacos db.user.0=postgresql db.password.0=postgresql db.pool.config.driverClassName=org.postgresql.Driver @@ -36,7 +36,7 @@ nacosplugin-datasource-sqlscripts/resources/sql/ 目录下 # PostgreSQL spring.sql.init.platform=postgresql db.num=1 -db.url.0=jdbc:postgresql://192.168.188.131:5432/db1?currentSchema=nacos +db.url.0=jdbc:postgresql://localhost:5432/db1?currentSchema=nacos db.user.0=postgresql db.password.0=postgresql db.pool.config.driverClassName=org.postgresql.Driver @@ -65,7 +65,7 @@ db.pool.config.driverClassName=org.postgresql.Driver # DM spring.sql.init.platform=dm db.num=1 -db.url.0=jdbc:dm://192.168.137.133:5236?schema=nacos +db.url.0=jdbc:dm://localhost:5236?schema=nacos db.user.0=SYSDBA db.password.0=dameng777 db.pool.config.driverClassName=dm.jdbc.driver.DmDriver @@ -77,7 +77,7 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ```properties spring.sql.init.platform=kingbase db.num=1 -db.url.0=jdbc:kingbase8://192.168.137.133:5432/theDb?currentSchema=nacos&clientEncoding=utf8 +db.url.0=jdbc:kingbase8://localhost:5432/theDb?currentSchema=nacos&clientEncoding=utf8 db.user.0=username db.password.0=thePassword db.pool.config.driverClassName=com.kingbase8.Driver @@ -89,7 +89,7 @@ db.pool.config.driverClassName=com.kingbase8.Driver ```properties spring.sql.init.platform=magicdata db.num=1 -db.url.0=jdbc:magicdata://192.168.137.133:3660/theDb?currentSchema=nacos&clientEncoding=utf8 +db.url.0=jdbc:magicdata://localhost:3660/theDb?currentSchema=nacos&clientEncoding=utf8 db.user.0=username db.password.0=thePassword db.pool.config.driverClassName=com.bes.magicdata.Driver @@ -110,7 +110,7 @@ db.pool.config.driverClassName=com.bes.magicdata.Driver # SqlServer spring.sql.init.platform=sqlserver db.num=1 -db.url.0=jdbc:sqlserver://192.168.137.133:1433;databaseName=nacos;encrypt=false +db.url.0=jdbc:sqlserver://localhost:1433;databaseName=nacos;encrypt=false db.user.0=sa db.password.0=SA123456Pswd db.pool.config.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver @@ -128,7 +128,7 @@ mysql --password=root_password --host=localhost --port=3306 --user root < create # MySQL spring.sql.init.platform=mysql db.num=1 -db.url.0=jdbc:mysql://192.168.137.133:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=30000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC +db.url.0=jdbc:mysql://localhost:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=30000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true&useServerPrepStmts=true db.user.0=root db.password.0=root_password db.pool.config.driverClassName=com.mysql.cj.jdbc.Driver @@ -151,7 +151,7 @@ sqlplus C##NACOS/NACOS_PASSWORD@localhost:1521/FREE @./create-tables.sql spring.sql.init.platform=oracle db.num=1 # 在oracle中，schema就是用户名，所以不需要另外指定schema -db.url.0=jdbc:oracle:thin:@//192.168.137.133:1521/FREE +db.url.0=jdbc:oracle:thin:@//localhost:1521/FREE db.user.0=C##NACOS db.password.0=NACOS_PASSWORD db.pool.config.driverClassName=oracle.jdbc.OracleDriver -- Gitee From 88b4eb9146ce95e017f0886fb679fb6111c42985 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 21:37:41 +0800 Subject: [PATCH 124/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.3=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 0819ff6..7eada12 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.2 + 2.0.3 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index f70cc35..a9cf542 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.2 + 2.0.3 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 14d1c54..cd9773b 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.2 + 2.0.3 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index 9db165d..0dbe87e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.2 + 2.0.3 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From c6f3fbc2c72d142fd5d573c97687edc8dd7be6e6 Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 22:20:32 +0800 Subject: [PATCH 125/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/dm/create-schema.sql | 4 +++- .../resources/sql/dm/create-tables.sql | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql index 68b91a6..e3c3c18 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-schema.sql @@ -1,3 +1,5 @@ DROP SCHEMA if EXISTS nacos CASCADE; CREATE SCHEMA nacos; -/ \ No newline at end of file +/ + +exit \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql index 542ba1a..f2e127c 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql +++ b/nacosplugin-datasource-sqlscript/resources/sql/dm/create-tables.sql @@ -451,3 +451,4 @@ INSERT INTO "users" VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2ku INSERT INTO "roles" VALUES ('nacos', 'ROLE_ADMIN'); +exit \ No newline at end of file -- Gitee From eac1696ef6321b726b65009ed0193ca003eb159a Mon Sep 17 00:00:00 2001 From: coderjn Date: Fri, 6 Sep 2024 22:48:24 +0800 Subject: [PATCH 126/159] % release 2.0.3 --- RELEASE-LOG.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-LOG.MD b/RELEASE-LOG.MD index 7493d2f..0e3a94c 100644 --- a/RELEASE-LOG.MD +++ b/RELEASE-LOG.MD @@ -1,3 +1,5 @@ +## 2.0.3 +1. 完善对oracle数据库的支持，重点针处理 oracle 会把 `''` 作为 `null` 处理。 ## 2.0.2 1. 兼容nacos中的不合理SQL，对应nacos [github上的bug](https://github.com/alibaba/nacos/issues/12598) 2. 完善 oracle 的sql 脚本 -- Gitee From 1693c1709f42c66184a630b91f2fc04ae80213b9 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 9 Sep 2024 09:51:34 +0800 Subject: [PATCH 127/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BF=AE=E9=A5=B0=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 5df4b33..5767500 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -259,17 +259,17 @@ public abstract class BaseMapper extends AbstractMapper { return VersionUtils.compareVersion(currentVersion, "2.1.0")>=0; } private static final String NAMESPACE_PUBLIC_KEY = "public"; - protected String getDefaultTenantId(){ + protected final String getDefaultTenantId(){ if(getDialect().isAutoCastEmptyStringToNull()){ return NAMESPACE_PUBLIC_KEY; } return NamespaceUtil.getNamespaceDefaultId(); } - protected String useDefaultTenantIdIfBlank(String tenantId){ + protected final String useDefaultTenantIdIfBlank(String tenantId){ return Strings.useValueIfBlank(tenantId, getDefaultTenantId()); } - protected void useDefaultTenantIdWithWhereParameter(MapperContext context){ + protected final void useDefaultTenantIdWithWhereParameter(MapperContext context){ Object tenantIdObj= context.getWhereParameter(FieldConstant.TENANT_ID); String tenantId=null; if(tenantIdObj!=null){ -- Gitee From a9ba860ff441b5128cac7fd7b00f306555d61986 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 9 Sep 2024 19:46:52 +0800 Subject: [PATCH 128/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DatabaseTypes.java => DatabaseIds.java} | 6 ++++-- .../datasource/db/derby/DerbyDatabaseDialect.java | 4 ++-- .../datasource/db/mssql/MssqlDatabaseDialect.java | 4 ++-- .../datasource/db/mysql/MysqlDatabaseDialect.java | 4 ++-- .../db/oracle/OracleDatabaseDialect.java | 4 ++-- .../nacos/plugin/datasource/mapper/BaseMapper.java | 14 +++++++------- 6 files changed, 19 insertions(+), 17 deletions(-) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{DatabaseTypes.java => DatabaseIds.java} (87%) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java similarity index 87% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java index 2aea55d..0e84b49 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseTypes.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java @@ -1,8 +1,10 @@ package com.jn.nacos.plugin.datasource; -import com.alibaba.nacos.plugin.datasource.constants.DataSourceConstant; -public class DatabaseTypes extends DataSourceConstant { +public class DatabaseIds { + public static final String MYSQL = "mysql"; + + public static final String DERBY = "derby"; public static final String OPENGAUSS = "opengauss"; public static final String KINGBASE = "kingbase"; public static final String MAGICDATA = "magicdata"; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java index 01b822b..bac5724 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java @@ -1,12 +1,12 @@ package com.jn.nacos.plugin.datasource.db.derby; import com.alibaba.nacos.plugin.datasource.enums.derby.TrustedDerbylFunctionEnum; -import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseIds; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class DerbyDatabaseDialect extends NacosDatabaseDialect { public DerbyDatabaseDialect() { - super(DatabaseTypes.DERBY); + super(DatabaseIds.DERBY); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java index 57c8475..94ec0d0 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java @@ -1,14 +1,14 @@ package com.jn.nacos.plugin.datasource.db.mssql; import com.jn.langx.util.collection.Maps; -import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseIds; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import java.util.Map; public class MssqlDatabaseDialect extends NacosDatabaseDialect { public MssqlDatabaseDialect() { - super(DatabaseTypes.MSSQL); + super(DatabaseIds.MSSQL); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java index 249506c..1907fc7 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java @@ -1,13 +1,13 @@ package com.jn.nacos.plugin.datasource.db.mysql; import com.alibaba.nacos.plugin.datasource.enums.mysql.TrustedMysqlFunctionEnum; -import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseIds; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class MysqlDatabaseDialect extends NacosDatabaseDialect { public MysqlDatabaseDialect() { - super(DatabaseTypes.MYSQL); + super(DatabaseIds.MYSQL); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index a67abbe..647e889 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -1,11 +1,11 @@ package com.jn.nacos.plugin.datasource.db.oracle; -import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseIds; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect(){ - super(DatabaseTypes.ORACLE); + super(DatabaseIds.ORACLE); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 5767500..946895f 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -10,7 +10,7 @@ import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Pipeline; -import com.jn.nacos.plugin.datasource.DatabaseTypes; +import com.jn.nacos.plugin.datasource.DatabaseIds; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; import com.jn.sqlhelper.dialect.Dialect; @@ -24,7 +24,7 @@ public abstract class BaseMapper extends AbstractMapper { protected BaseMapper() { this.databaseId = getConfiguredDatabaseId(); - Preconditions.checkTrue(!Objs.equals(DatabaseTypes.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); + Preconditions.checkTrue(!Objs.equals(DatabaseIds.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } @@ -37,21 +37,21 @@ public abstract class BaseMapper extends AbstractMapper { if(Strings.isBlank(databaseId)){ // 内嵌数据库 derby if (EnvUtil.getStandaloneMode()){ - databaseId = DatabaseTypes.DERBY; + databaseId = DatabaseIds.DERBY; } else{ // 默认数据库 MySQL - databaseId = DatabaseTypes.MSSQL; + databaseId = DatabaseIds.MSSQL; } }else{ Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseId); if(dialect==null){ - databaseId = DatabaseTypes.UNSUPPORTED; + databaseId = DatabaseIds.UNSUPPORTED; } } // 因为 mysql 不支持 在子查询中 的limit，所以 不使用自定义的SQL，而使用官方的插件 - if(Strings.isBlank(databaseId) || Objs.equals(DatabaseTypes.DERBY, databaseId) || Objs.equals(DatabaseTypes.MYSQL, databaseId)){ - databaseId=DatabaseTypes.UNDEFINED; + if(Strings.isBlank(databaseId) || Objs.equals(DatabaseIds.DERBY, databaseId) || Objs.equals(DatabaseIds.MYSQL, databaseId)){ + databaseId= DatabaseIds.UNDEFINED; } return databaseId; } -- Gitee From 1611618f1baaae316db114dc793b6e878975e55a Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Mon, 9 Sep 2024 20:06:11 +0800 Subject: [PATCH 129/159] =?UTF-8?q?*=20=E5=AF=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=BC=95=E5=8F=B7=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 18 ++++++++++++++++-- .../plugin/datasource/mapper/BaseMapper.java | 6 +++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 6d3d893..4011e30 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -86,7 +86,7 @@ public abstract class NacosDatabaseDialect { return null; } public String getFunction(String functionName){ - String func =this.functionMap.get(functionName); + String func = this.functionMap.get(functionName); if(Objs.isEmpty(func)){ throw new RuntimeException(StringTemplates.formatWithPlaceholder("function {} in {} database dialect is not supported", functionName, this.getName())); } @@ -113,7 +113,21 @@ public abstract class NacosDatabaseDialect { private static String IDENTIFIER_AFTER_QUOTES="\"'`]"; - public List removeQuote(List identifiers){ + public List wrapQuotes(List identifiers){ + return Pipeline.of(identifiers).map(new Function() { + @Override + public String apply(String identifier) { + return wrapQuote(identifier); + } + }).asList(); + } + + private String wrapQuote(String identifier){ + return this.delegate.getQuotedIdentifier(removeQuote(identifier)); + } + + @Deprecated + private final List removeQuote(List identifiers){ return Pipeline.of(identifiers).map(new Function() { @Override public String apply(String identifier) { diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 946895f..da7bf7b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -82,7 +82,7 @@ public abstract class BaseMapper extends AbstractMapper { */ @Override public String select(List quotedColumns, List where) { - List columns = this.dialect.removeQuote(quotedColumns); + List columns = this.dialect.wrapQuotes(quotedColumns); return generateSelectSql(columns, where); } private String generateSelectSql(List columns, List where){ @@ -113,7 +113,7 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String insert(List quotedColumns) { - List columns = this.dialect.removeQuote(quotedColumns); + List columns = this.dialect.wrapQuotes(quotedColumns); return genInsertSql(columns); } public String genInsertSql(List columns) { @@ -161,7 +161,7 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String update(List quotedColumns, List where) { - List columns = this.dialect.removeQuote(quotedColumns); + List columns = this.dialect.wrapQuotes(quotedColumns); return genUpdateSql(columns, where); } -- Gitee From 1457792b4a6df721a243f0443533046bb932be80 Mon Sep 17 00:00:00 2001 From: coderjn Date: Tue, 10 Sep 2024 07:24:37 +0800 Subject: [PATCH 130/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 4011e30..62c30c5 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -109,42 +109,16 @@ public abstract class NacosDatabaseDialect { return this.delegate.rebuildParameters(subquery,useLimitVariable, selection, queryParams); } - private static String IDENTIFIER_BEFORE_QUOTES="\"'`["; - private static String IDENTIFIER_AFTER_QUOTES="\"'`]"; - public List wrapQuotes(List identifiers){ return Pipeline.of(identifiers).map(new Function() { @Override public String apply(String identifier) { - return wrapQuote(identifier); + return NacosDatabaseDialect.this.delegate.getQuotedIdentifier(identifier); } }).asList(); } - private String wrapQuote(String identifier){ - return this.delegate.getQuotedIdentifier(removeQuote(identifier)); - } - - @Deprecated - private final List removeQuote(List identifiers){ - return Pipeline.of(identifiers).map(new Function() { - @Override - public String apply(String identifier) { - return removeQuote(identifier); - } - }).asList(); - } - - private static String removeQuote(String identifier){ - if(Strings.isBlank(identifier)){ - return identifier; - } - identifier=Strings.stripStart(identifier, IDENTIFIER_BEFORE_QUOTES); - identifier=Strings.stripEnd(identifier, IDENTIFIER_AFTER_QUOTES); - return identifier; - } - public boolean isAutoCastEmptyStringToNull(){ return false; } -- Gitee From 0b9ab4a2640dd7e4c3f5f40efbcaa039069920d9 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 10:46:59 +0800 Subject: [PATCH 131/159] * rename it --- .../{DatabaseIds.java => DatabaseNames.java} | 2 +- .../db/derby/DerbyDatabaseDialect.java | 4 ++-- .../db/kingbase/KingbaseDatabaseDialect.java | 20 +++++++++++++++++++ .../db/mssql/MssqlDatabaseDialect.java | 4 ++-- .../db/mysql/MysqlDatabaseDialect.java | 4 ++-- .../db/oracle/OracleDatabaseDialect.java | 4 ++-- .../plugin/datasource/mapper/BaseMapper.java | 14 ++++++------- 7 files changed, 36 insertions(+), 16 deletions(-) rename nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/{DatabaseIds.java => DatabaseNames.java} (97%) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseNames.java similarity index 97% rename from nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java rename to nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseNames.java index 0e84b49..7c30b4d 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseIds.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/DatabaseNames.java @@ -1,7 +1,7 @@ package com.jn.nacos.plugin.datasource; -public class DatabaseIds { +public class DatabaseNames { public static final String MYSQL = "mysql"; public static final String DERBY = "derby"; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java index bac5724..3e519ee 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/derby/DerbyDatabaseDialect.java @@ -1,12 +1,12 @@ package com.jn.nacos.plugin.datasource.db.derby; import com.alibaba.nacos.plugin.datasource.enums.derby.TrustedDerbylFunctionEnum; -import com.jn.nacos.plugin.datasource.DatabaseIds; +import com.jn.nacos.plugin.datasource.DatabaseNames; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class DerbyDatabaseDialect extends NacosDatabaseDialect { public DerbyDatabaseDialect() { - super(DatabaseIds.DERBY); + super(DatabaseNames.DERBY); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java new file mode 100644 index 0000000..9165ec7 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java @@ -0,0 +1,20 @@ +package com.jn.nacos.plugin.datasource.db.kingbase; + +import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class KingbaseDatabaseDialect extends NacosDatabaseDialect { + public KingbaseDatabaseDialect() { + super(DatabaseNames.KINGBASE); + } + + @Override + public boolean isAutoCastEmptyStringToNull() { + return true; + } + + @Override + public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { + return " NVL("+expressionOrIdentifier+", '"+defaultValue+"') "; + } +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java index 94ec0d0..84661d0 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mssql/MssqlDatabaseDialect.java @@ -1,14 +1,14 @@ package com.jn.nacos.plugin.datasource.db.mssql; import com.jn.langx.util.collection.Maps; -import com.jn.nacos.plugin.datasource.DatabaseIds; +import com.jn.nacos.plugin.datasource.DatabaseNames; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import java.util.Map; public class MssqlDatabaseDialect extends NacosDatabaseDialect { public MssqlDatabaseDialect() { - super(DatabaseIds.MSSQL); + super(DatabaseNames.MSSQL); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java index 1907fc7..17cd345 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/mysql/MysqlDatabaseDialect.java @@ -1,13 +1,13 @@ package com.jn.nacos.plugin.datasource.db.mysql; import com.alibaba.nacos.plugin.datasource.enums.mysql.TrustedMysqlFunctionEnum; -import com.jn.nacos.plugin.datasource.DatabaseIds; +import com.jn.nacos.plugin.datasource.DatabaseNames; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class MysqlDatabaseDialect extends NacosDatabaseDialect { public MysqlDatabaseDialect() { - super(DatabaseIds.MYSQL); + super(DatabaseNames.MYSQL); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index 647e889..4a517dc 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -1,11 +1,11 @@ package com.jn.nacos.plugin.datasource.db.oracle; -import com.jn.nacos.plugin.datasource.DatabaseIds; +import com.jn.nacos.plugin.datasource.DatabaseNames; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect(){ - super(DatabaseIds.ORACLE); + super(DatabaseNames.ORACLE); } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index da7bf7b..cac98f2 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -10,7 +10,7 @@ import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Pipeline; -import com.jn.nacos.plugin.datasource.DatabaseIds; +import com.jn.nacos.plugin.datasource.DatabaseNames; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; import com.jn.sqlhelper.dialect.Dialect; @@ -24,7 +24,7 @@ public abstract class BaseMapper extends AbstractMapper { protected BaseMapper() { this.databaseId = getConfiguredDatabaseId(); - Preconditions.checkTrue(!Objs.equals(DatabaseIds.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); + Preconditions.checkTrue(!Objs.equals(DatabaseNames.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); } @@ -37,21 +37,21 @@ public abstract class BaseMapper extends AbstractMapper { if(Strings.isBlank(databaseId)){ // 内嵌数据库 derby if (EnvUtil.getStandaloneMode()){ - databaseId = DatabaseIds.DERBY; + databaseId = DatabaseNames.DERBY; } else{ // 默认数据库 MySQL - databaseId = DatabaseIds.MSSQL; + databaseId = DatabaseNames.MSSQL; } }else{ Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseId); if(dialect==null){ - databaseId = DatabaseIds.UNSUPPORTED; + databaseId = DatabaseNames.UNSUPPORTED; } } // 因为 mysql 不支持 在子查询中 的limit，所以 不使用自定义的SQL，而使用官方的插件 - if(Strings.isBlank(databaseId) || Objs.equals(DatabaseIds.DERBY, databaseId) || Objs.equals(DatabaseIds.MYSQL, databaseId)){ - databaseId= DatabaseIds.UNDEFINED; + if(Strings.isBlank(databaseId) || Objs.equals(DatabaseNames.DERBY, databaseId) || Objs.equals(DatabaseNames.MYSQL, databaseId)){ + databaseId= DatabaseNames.UNDEFINED; } return databaseId; } -- Gitee From f515864b6b378783447f3980b7d5b52ff5ee2b8f Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 10:48:17 +0800 Subject: [PATCH 132/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .wiki/dev.md | 1 - README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/.wiki/dev.md b/.wiki/dev.md index 99f2154..1d7389d 100644 --- a/.wiki/dev.md +++ b/.wiki/dev.md @@ -5,6 +5,5 @@ + [SqlServer SQL 参考手册](https://learn.microsoft.com/zh-cn/sql/t-sql/language-reference?view=sql-server-ver16) + [OpenGauss SQL 参考手册](https://docs-opengauss.osinfra.cn/zh/docs/5.0.0/docs/SQLReference/%E5%87%BD%E6%95%B0%E5%92%8C%E6%93%8D%E4%BD%9C%E7%AC%A6.html) + [Oracle SQL 参考手册](https://docs.oracle.com/en/database/oracle/oracle-database/23/sqlrf/index.html) -+ OSCAR SQL: 目前还没有 + [PostgreSQL SQL 参考手册](https://www.postgresql.org/docs/15/index.html) diff --git a/README.md b/README.md index 03e21cf..8ee27c0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ + MSSQL (SQLServer) + OpenGauss （高斯） + Oracle(8, 9, 10, 11, 12 ... ) - + oscar （神通） + PostgreSQL #### 软件架构 -- Gitee From d8e87e229f2b0d81be2e61bddb04ce9850954cf6 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 10:55:47 +0800 Subject: [PATCH 133/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.4=20=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- .../datasource/db/kingbase/KingbaseDatabaseDialect.java | 5 ----- pom.xml | 4 ++-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 7eada12..e2f6daf 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.3 + 2.0.4 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index a9cf542..6083971 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.3 + 2.0.4 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index cd9773b..d3c9f2a 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.3 + 2.0.4 nacosplugin-datasource diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java index 9165ec7..79fe934 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/kingbase/KingbaseDatabaseDialect.java @@ -8,11 +8,6 @@ public class KingbaseDatabaseDialect extends NacosDatabaseDialect { super(DatabaseNames.KINGBASE); } - @Override - public boolean isAutoCastEmptyStringToNull() { - return true; - } - @Override public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { return " NVL("+expressionOrIdentifier+", '"+defaultValue+"') "; diff --git a/pom.xml b/pom.xml index 0dbe87e..1477ec1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.3 + 2.0.4 pom ${project.groupId}:${project.artifactId}:${project.version} @@ -29,7 +29,7 @@ 1.17.0 2.4.1 5.3.34 - 5.0.4 + 5.0.5 https://gitee.com/coderjn/nacos-plugins -- Gitee From a474d7be4809d36b44c37e96bf7292ebd87fcc7e Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 11:41:33 +0800 Subject: [PATCH 134/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++++++ .../nacos/plugin/datasource/NacosDatabaseDialect.java | 1 + 2 files changed, 11 insertions(+) diff --git a/README.md b/README.md index 8ee27c0..a0263bf 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,16 @@ #### 软件架构 作为nacos的插件使用 +#### 版本映射 + +| 插件版本 | 构建时使用的nacos版本 | 支持的Nacos版本 | +| ------------- | :-------------------: | :-------------: | +| 1.0.x | 2.4.1 | 理论上是 all | +| 2.0.0 - 2.0.4 | 2.4.1 | 理论上是 all | +| | | | + + + #### 安装教程 1. [nacosplugin-datasource 安装](./nacosplugin-datasource/installation.MD) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 62c30c5..9342103 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -114,6 +114,7 @@ public abstract class NacosDatabaseDialect { return Pipeline.of(identifiers).map(new Function() { @Override public String apply(String identifier) { + // 数据库表名、列名的大小写，由 dialect 内部实现 return NacosDatabaseDialect.this.delegate.getQuotedIdentifier(identifier); } }).asList(); -- Gitee From acdbf981086d7ed843fb7824e2c576a3de21b413 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 11:57:04 +0800 Subject: [PATCH 135/159] =?UTF-8?q?*=20=E8=87=AA=E5=8A=A8=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=88=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 12 +++++- .../plugin/datasource/mapper/BaseMapper.java | 42 +++++++------------ 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 9342103..f1763e1 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -114,12 +114,20 @@ public abstract class NacosDatabaseDialect { return Pipeline.of(identifiers).map(new Function() { @Override public String apply(String identifier) { - // 数据库表名、列名的大小写，由 dialect 内部实现 - return NacosDatabaseDialect.this.delegate.getQuotedIdentifier(identifier); + return wrapQuote(identifier); } }).asList(); } + public String wrapQuote(String identifier){ + // 数据库表名、列名的大小写，由 dialect 内部实现 + return this.delegate.getQuotedIdentifier(identifier); + } + + public String unwrapQuote(String identifier){ + return this.delegate.getUnquoteIdentifier(identifier); + } + public boolean isAutoCastEmptyStringToNull(){ return false; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index cac98f2..c11cf91 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -77,20 +77,16 @@ public abstract class BaseMapper extends AbstractMapper { /** * - * @param quotedColumns The columns + * @param columns The columns * @param where The where params */ @Override - public String select(List quotedColumns, List where) { - List columns = this.dialect.wrapQuotes(quotedColumns); - return generateSelectSql(columns, where); - } - private String generateSelectSql(List columns, List where){ + public String select(List columns, List where) { StringBuilder sql = new StringBuilder(); String method = "SELECT "; sql.append(method); for (int i = 0; i < columns.size(); i++) { - sql.append(columns.get(i)); + sql.append(getDialect().wrapQuote(columns.get(i))); if (i == columns.size() - 1) { sql.append(" "); } else { @@ -112,11 +108,7 @@ public abstract class BaseMapper extends AbstractMapper { } @Override - public String insert(List quotedColumns) { - List columns = this.dialect.wrapQuotes(quotedColumns); - return genInsertSql(columns); - } - public String genInsertSql(List columns) { + public String insert(List columns) { StringBuilder sql = new StringBuilder(); String method = "INSERT INTO "; sql.append(method); @@ -127,11 +119,11 @@ public abstract class BaseMapper extends AbstractMapper { int size = columns.size(); sql.append("("); for (int i = 0; i < size; i++) { - String columnName= columns.get(i).split("@")[0]; - if(Objs.equals(columnName, "tenant_id")){ + String columnName = getDialect().unwrapQuote(columns.get(i).split("@")[0]); + if(Strings.equalsIgnoreCase(columnName, "tenant_id")){ tenantIdColumnIndex = i; } - sql.append(columnName); + sql.append(getDialect().wrapQuote(columnName)); if (i != columns.size() - 1) { sql.append(", "); } @@ -160,13 +152,7 @@ public abstract class BaseMapper extends AbstractMapper { } @Override - public String update(List quotedColumns, List where) { - List columns = this.dialect.wrapQuotes(quotedColumns); - return genUpdateSql(columns, where); - } - - public String genUpdateSql(List columns, List where) { - + public String update(List columns, List where) { StringBuilder sql = new StringBuilder(); String method = "UPDATE "; sql.append(method); @@ -174,11 +160,11 @@ public abstract class BaseMapper extends AbstractMapper { for (int i = 0; i < columns.size(); i++) { String[] parts = columns.get(i).split("@"); - String column = parts[0]; + String column = getDialect().unwrapQuote(parts[0]); if (parts.length == 2) { - sql.append(column).append(" = ").append(getFunction(parts[1])); + sql.append(getDialect().wrapQuote(column)).append(" = ").append(getFunction(parts[1])); } else { - sql.append(column).append(" = ").append("?"); + sql.append(getDialect().wrapQuote(column)).append(" = ").append("?"); } if (i != columns.size() - 1) { sql.append(","); @@ -238,13 +224,13 @@ public abstract class BaseMapper extends AbstractMapper { protected final String genWhereClause(List where) { StringBuilder sql = new StringBuilder(" WHERE "); for (int i = 0; i < where.size(); i++) { - String condition = where.get(i); + String condition = getDialect().unwrapQuote(where.get(i)); if(Strings.equalsIgnoreCase(condition, "tenant_id") && getDialect().isAutoCastEmptyStringToNull()){ String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", getDefaultTenantId()); - sql.append("tenant_id = ").append(castNullToDefaultExpression); + sql.append(getDialect().wrapQuote(condition)).append(" = ").append(castNullToDefaultExpression); }else{ - sql.append(condition).append(" = ").append("?"); + sql.append(getDialect().wrapQuote(condition)).append(" = ").append("?"); } if (i != where.size() - 1) { -- Gitee From 0b3a8d2d79728f431e6a5ca54e62ecbff8f5cebc Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 14:04:40 +0800 Subject: [PATCH 136/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index c11cf91..b7d9ee2 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -185,9 +185,6 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String delete(List where) { - return genDeleteSql(where); - } - private String genDeleteSql(List where) { StringBuilder sql = new StringBuilder(); String method = "DELETE "; sql.append(method).append("FROM ").append(getTableName()).append(" "); @@ -202,9 +199,6 @@ public abstract class BaseMapper extends AbstractMapper { @Override public String count(List where) { - return genCountSql(where); - } - private String genCountSql(List where) { StringBuilder sql = new StringBuilder(); String method = "SELECT "; sql.append(method); -- Gitee From 1402bf20031f0c291834debbbeeb203f9cea3401 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 14:06:02 +0800 Subject: [PATCH 137/159] * rename it --- .../plugin/datasource/mapper/BaseMapper.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index b7d9ee2..918526a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -19,47 +19,47 @@ import com.jn.sqlhelper.dialect.DialectRegistry; import java.util.List; public abstract class BaseMapper extends AbstractMapper { - private final String databaseId; + private final String databaseName; protected NacosDatabaseDialect dialect; protected BaseMapper() { - this.databaseId = getConfiguredDatabaseId(); - Preconditions.checkTrue(!Objs.equals(DatabaseNames.UNSUPPORTED, this.databaseId), "database {} is unsupported", this.databaseId); - this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseId); + this.databaseName = getConfiguredDatabaseName(); + Preconditions.checkTrue(!Objs.equals(DatabaseNames.UNSUPPORTED, this.databaseName), "database {} is unsupported", this.databaseName); + this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseName); } - private String getConfiguredDatabaseId(){ - String databaseId = EnvUtil.getProperty("spring.sql.init.platform"); - if(Strings.isBlank(databaseId)){ + private String getConfiguredDatabaseName(){ + String databaseName = EnvUtil.getProperty("spring.sql.init.platform"); + if(Strings.isBlank(databaseName)){ // 这个是 nacos 中更早的配置 datasource 类型的方式 - databaseId = EnvUtil.getProperty("spring.datasource.platform"); + databaseName = EnvUtil.getProperty("spring.datasource.platform"); } - if(Strings.isBlank(databaseId)){ + if(Strings.isBlank(databaseName)){ // 内嵌数据库 derby if (EnvUtil.getStandaloneMode()){ - databaseId = DatabaseNames.DERBY; + databaseName = DatabaseNames.DERBY; } else{ // 默认数据库 MySQL - databaseId = DatabaseNames.MSSQL; + databaseName = DatabaseNames.MSSQL; } }else{ - Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseId); + Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseName); if(dialect==null){ - databaseId = DatabaseNames.UNSUPPORTED; + databaseName = DatabaseNames.UNSUPPORTED; } } // 因为 mysql 不支持 在子查询中 的limit，所以 不使用自定义的SQL，而使用官方的插件 - if(Strings.isBlank(databaseId) || Objs.equals(DatabaseNames.DERBY, databaseId) || Objs.equals(DatabaseNames.MYSQL, databaseId)){ - databaseId= DatabaseNames.UNDEFINED; + if(Strings.isBlank(databaseName) || Objs.equals(DatabaseNames.DERBY, databaseName) || Objs.equals(DatabaseNames.MYSQL, databaseName)){ + databaseName = DatabaseNames.UNDEFINED; } - return databaseId; + return databaseName; } @Override public String getDataSource() { - return databaseId; + return databaseName; } public NacosDatabaseDialect getDialect() { -- Gitee From 715e4365bfee44defdd93568adc0d31daa70ec51 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 14:08:13 +0800 Subject: [PATCH 138/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java | 2 +- .../nacos/plugin/datasource/NacosDatabaseDialectManager.java | 3 --- .../java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index f1763e1..0fde881 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -25,7 +25,7 @@ public abstract class NacosDatabaseDialect { Preconditions.checkNotEmpty(name, "invalid dialect in class {}", Reflects.getFQNClassName(this.getClass())); this.name = name; String sqlhelperDialect = getCustomizedDialect(this.name); - this.delegate = DialectRegistry.getInstance().getDialectByName(sqlhelperDialect); + this.delegate = DialectRegistry.getInstance().gaussDialect(sqlhelperDialect); this.functionMap = initFunctionMap(); } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java index 34e806e..491aaf0 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialectManager.java @@ -2,14 +2,11 @@ package com.jn.nacos.plugin.datasource; import com.alibaba.nacos.common.spi.NacosServiceLoader; import com.jn.langx.util.collection.Maps; -import com.jn.langx.util.logging.Loggers; -import org.slf4j.Logger; import java.util.Collection; import java.util.Map; public class NacosDatabaseDialectManager { - private static final Logger logger = Loggers.getLogger(NacosDatabaseDialectManager.class); private Map dialectMap; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 918526a..8e4bf14 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -43,7 +43,7 @@ public abstract class BaseMapper extends AbstractMapper { databaseName = DatabaseNames.MSSQL; } }else{ - Dialect dialect = DialectRegistry.getInstance().getDialectByName(databaseName); + Dialect dialect = DialectRegistry.getInstance().gaussDialect(databaseName); if(dialect==null){ databaseName = DatabaseNames.UNSUPPORTED; } -- Gitee From d16fd6773cdb90d6f352699df8d1a33b7d7323d6 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 16:34:43 +0800 Subject: [PATCH 139/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/README.MD | 3 ++ .../resources/sql/oscar/create-schema.sql | 0 .../resources/sql/oscar/create-tables.sql | 0 .../datasource/IdentifierQuotedMode.java | 17 +++++++ .../datasource/NacosDatabaseDialect.java | 13 +----- .../plugin/datasource/mapper/BaseMapper.java | 46 ++++++++++++++++--- 6 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 nacosplugin-datasource-sqlscript/resources/sql/README.MD delete mode 100644 nacosplugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql delete mode 100644 nacosplugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/IdentifierQuotedMode.java diff --git a/nacosplugin-datasource-sqlscript/resources/sql/README.MD b/nacosplugin-datasource-sqlscript/resources/sql/README.MD new file mode 100644 index 0000000..4f70b95 --- /dev/null +++ b/nacosplugin-datasource-sqlscript/resources/sql/README.MD @@ -0,0 +1,3 @@ +在DDL语句中，表名、列名的要求： ++ 尽量统一加上引号 ++ 必须使用小写形式 （原因: nacos 中的代码中，将列名、表名都是定死的小写） \ No newline at end of file diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql b/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-schema.sql deleted file mode 100644 index e69de29..0000000 diff --git a/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql b/nacosplugin-datasource-sqlscript/resources/sql/oscar/create-tables.sql deleted file mode 100644 index e69de29..0000000 diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/IdentifierQuotedMode.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/IdentifierQuotedMode.java new file mode 100644 index 0000000..8be919b --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/IdentifierQuotedMode.java @@ -0,0 +1,17 @@ +package com.jn.nacos.plugin.datasource; + +/** + * 表名、字段名是否有使用过引号 + */ +public enum IdentifierQuotedMode { + /** + * 全部使用引号 + */ + QUOTED, + /** + * 全部不使用引号 + */ + UNQUOTED, + // 混合模式 + MIXED +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 0fde881..d17759b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -110,18 +110,9 @@ public abstract class NacosDatabaseDialect { } - public List wrapQuotes(List identifiers){ - return Pipeline.of(identifiers).map(new Function() { - @Override - public String apply(String identifier) { - return wrapQuote(identifier); - } - }).asList(); - } - - public String wrapQuote(String identifier){ + public String wrapQuote(String identifier, Dialect.IdentifierCase identifierCase){ // 数据库表名、列名的大小写，由 dialect 内部实现 - return this.delegate.getQuotedIdentifier(identifier); + return this.delegate.getQuotedIdentifier(identifier, identifierCase); } public String unwrapQuote(String identifier){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 8e4bf14..a9371d8 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -10,7 +10,9 @@ import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Pipeline; +import com.jn.langx.util.enums.Enums; import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.IdentifierQuotedMode; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; import com.jn.nacos.plugin.datasource.NacosDatabaseDialectManager; import com.jn.sqlhelper.dialect.Dialect; @@ -21,13 +23,27 @@ import java.util.List; public abstract class BaseMapper extends AbstractMapper { private final String databaseName; protected NacosDatabaseDialect dialect; + private IdentifierQuotedMode identifierQuotedModeInDDL; protected BaseMapper() { this.databaseName = getConfiguredDatabaseName(); + this.identifierQuotedModeInDDL = getConfiguredIdentifierQuotedMode(); Preconditions.checkTrue(!Objs.equals(DatabaseNames.UNSUPPORTED, this.databaseName), "database {} is unsupported", this.databaseName); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseName); } + private IdentifierQuotedMode getConfiguredIdentifierQuotedMode(){ + String modeString = EnvUtil.getProperty("spring.sql.identifier.quoted.mode"); + IdentifierQuotedMode mode = null; + if(Strings.isNotBlank(modeString)){ + mode = Enums.ofName(IdentifierQuotedMode.class, modeString); + } + if(mode==null){ + mode = IdentifierQuotedMode.QUOTED; + } + return mode; + } + private String getConfiguredDatabaseName(){ String databaseName = EnvUtil.getProperty("spring.sql.init.platform"); if(Strings.isBlank(databaseName)){ @@ -66,6 +82,24 @@ public abstract class BaseMapper extends AbstractMapper { return dialect; } + public String getIdentifierInDb(String identifier){ + String string; + switch (identifierQuotedModeInDDL){ + case QUOTED: + string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.LOWER_CASE); + break; + case UNQUOTED: + // 没有加引号，则是按照数据库对未加引号的默认行为来处理 + string = dialect.wrapQuote(identifier, null); + break; + case MIXED: + default: + string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.UPPER_CASE); + break; + } + return string; + } + @Override public String getFunction(String functionName) { return this.dialect.getFunction(functionName); @@ -86,7 +120,7 @@ public abstract class BaseMapper extends AbstractMapper { String method = "SELECT "; sql.append(method); for (int i = 0; i < columns.size(); i++) { - sql.append(getDialect().wrapQuote(columns.get(i))); + sql.append(getIdentifierInDb(columns.get(i))); if (i == columns.size() - 1) { sql.append(" "); } else { @@ -123,7 +157,7 @@ public abstract class BaseMapper extends AbstractMapper { if(Strings.equalsIgnoreCase(columnName, "tenant_id")){ tenantIdColumnIndex = i; } - sql.append(getDialect().wrapQuote(columnName)); + sql.append(getIdentifierInDb(columnName)); if (i != columns.size() - 1) { sql.append(", "); } @@ -162,9 +196,9 @@ public abstract class BaseMapper extends AbstractMapper { String[] parts = columns.get(i).split("@"); String column = getDialect().unwrapQuote(parts[0]); if (parts.length == 2) { - sql.append(getDialect().wrapQuote(column)).append(" = ").append(getFunction(parts[1])); + sql.append(getIdentifierInDb(column)).append(" = ").append(getFunction(parts[1])); } else { - sql.append(getDialect().wrapQuote(column)).append(" = ").append("?"); + sql.append(getIdentifierInDb(column)).append(" = ").append("?"); } if (i != columns.size() - 1) { sql.append(","); @@ -222,9 +256,9 @@ public abstract class BaseMapper extends AbstractMapper { if(Strings.equalsIgnoreCase(condition, "tenant_id") && getDialect().isAutoCastEmptyStringToNull()){ String castNullToDefaultExpression = getDialect().genCastNullToDefaultExpression("?", getDefaultTenantId()); - sql.append(getDialect().wrapQuote(condition)).append(" = ").append(castNullToDefaultExpression); + sql.append(getIdentifierInDb(condition)).append(" = ").append(castNullToDefaultExpression); }else{ - sql.append(getDialect().wrapQuote(condition)).append(" = ").append("?"); + sql.append(getIdentifierInDb(condition)).append(" = ").append("?"); } if (i != where.size() - 1) { -- Gitee From bf23bf911a6e54d0fee01b2c731309aeecdd6348 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 16:38:36 +0800 Subject: [PATCH 140/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index a9371d8..32edbe5 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -86,6 +86,7 @@ public abstract class BaseMapper extends AbstractMapper { String string; switch (identifierQuotedModeInDDL){ case QUOTED: + // 这个要求 DDL文件中，所有的表名、列名使用小写形式 string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.LOWER_CASE); break; case UNQUOTED: @@ -94,6 +95,7 @@ public abstract class BaseMapper extends AbstractMapper { break; case MIXED: default: + // 在混全模式下，则是按照 SQL-92 标准，统一使用大写形式 string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.UPPER_CASE); break; } -- Gitee From 58464b024fa096a872ae2fc338a0f43c8db15a79 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 16:48:59 +0800 Subject: [PATCH 141/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 7 ++++++- .../jn/nacos/plugin/datasource/NacosDatabaseDialect.java | 2 -- .../com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index e3112f4..3dd6455 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -72,6 +72,12 @@ db.pool.config.driverClassName=dm.jdbc.driver.DmDriver ``` +4. 注意事项 +```markdown +1） 要指定数据库忽略大小写 +``` + + ## 支持Kingbase 1. jdbc配置 ```properties @@ -155,7 +161,6 @@ db.url.0=jdbc:oracle:thin:@//localhost:1521/FREE db.user.0=C##NACOS db.password.0=NACOS_PASSWORD db.pool.config.driverClassName=oracle.jdbc.OracleDriver - ``` 3. 目前使用Oracle的问题 diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index d17759b..17cc083 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -6,8 +6,6 @@ import com.jn.langx.util.Objs; import com.jn.langx.util.Preconditions; import com.jn.langx.util.Strings; import com.jn.langx.util.collection.Maps; -import com.jn.langx.util.collection.Pipeline; -import com.jn.langx.util.function.Function; import com.jn.langx.util.reflect.Reflects; import com.jn.sqlhelper.dialect.Dialect; import com.jn.sqlhelper.dialect.DialectRegistry; diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 32edbe5..a5a03ea 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -95,8 +95,8 @@ public abstract class BaseMapper extends AbstractMapper { break; case MIXED: default: - // 在混全模式下，则是按照 SQL-92 标准，统一使用大写形式 - string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.UPPER_CASE); + // 在混合模式下，不加引号 + string = dialect.unwrapQuote(identifier); break; } return string; -- Gitee From 5ed847a2e64e3a0cde6d967cea3f163319e426e2 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 16:57:47 +0800 Subject: [PATCH 142/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource-sqlscript/resources/sql/README.MD | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/README.MD b/nacosplugin-datasource-sqlscript/resources/sql/README.MD index 4f70b95..e7b7452 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/README.MD +++ b/nacosplugin-datasource-sqlscript/resources/sql/README.MD @@ -1,3 +1,6 @@ -在DDL语句中，表名、列名的要求： +在DDL语句中，identifier(表名、列名)的要求： + 尽量统一加上引号 -+ 必须使用小写形式 （原因: nacos 中的代码中，将列名、表名都是定死的小写） \ No newline at end of file ++ 如果不能统一加引号，按如下规则来处理： + + 不加引号的identifier，必须使用小写形式 （原因: nacos 中的代码中，将列名、表名都是定死的小写），由数据库内部自行处理。 + + 加引号的identifier，按照数据库对不加引号的identifier的处理方式来处理。 + + 例如：oracle 对不加引号的 identifier 默认全部转换成大写形式。那么在使用引号时，就必须全部使用大写形式。 \ No newline at end of file -- Gitee From 334c7dd965f56058bbc0ad68f597f0606a5292a7 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 17:00:47 +0800 Subject: [PATCH 143/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index a5a03ea..f9d9c87 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -91,6 +91,7 @@ public abstract class BaseMapper extends AbstractMapper { break; case UNQUOTED: // 没有加引号，则是按照数据库对未加引号的默认行为来处理 + // 正常情况下，应该使用unwrapQuote去掉引号，但可能在某些数据库上出错，例如 mysql string = dialect.wrapQuote(identifier, null); break; case MIXED: -- Gitee From 43ac8477fd140191d230b08b7bfa6e943827e92d Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 17:07:56 +0800 Subject: [PATCH 144/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jn/nacos/plugin/datasource/mapper/BaseMapper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index f9d9c87..784cc65 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -90,14 +90,13 @@ public abstract class BaseMapper extends AbstractMapper { string = dialect.wrapQuote(identifier, Dialect.IdentifierCase.LOWER_CASE); break; case UNQUOTED: - // 没有加引号，则是按照数据库对未加引号的默认行为来处理 - // 正常情况下，应该使用unwrapQuote去掉引号，但可能在某些数据库上出错，例如 mysql - string = dialect.wrapQuote(identifier, null); + // 去掉引号 + string = dialect.unwrapQuote(identifier); break; case MIXED: default: - // 在混合模式下，不加引号 - string = dialect.unwrapQuote(identifier); + // 按照数据库对未加引号的默认行为来处理 + string = dialect.wrapQuote(identifier, null); break; } return string; -- Gitee From 3ca69c0629c461264e1f54844f2aaf286ce2c34b Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 17:57:14 +0800 Subject: [PATCH 145/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource-sqlscript/resources/sql/README.MD | 2 +- nacosplugin-datasource/installation.MD | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource-sqlscript/resources/sql/README.MD b/nacosplugin-datasource-sqlscript/resources/sql/README.MD index e7b7452..0b2ebf4 100644 --- a/nacosplugin-datasource-sqlscript/resources/sql/README.MD +++ b/nacosplugin-datasource-sqlscript/resources/sql/README.MD @@ -1,6 +1,6 @@ 在DDL语句中，identifier(表名、列名)的要求： + 尽量统一加上引号 -+ 如果不能统一加引号，按如下规则来处理： ++ 如果不想统一加引号，按如下规则来处理： + 不加引号的identifier，必须使用小写形式 （原因: nacos 中的代码中，将列名、表名都是定死的小写），由数据库内部自行处理。 + 加引号的identifier，按照数据库对不加引号的identifier的处理方式来处理。 + 例如：oracle 对不加引号的 identifier 默认全部转换成大写形式。那么在使用引号时，就必须全部使用大写形式。 \ No newline at end of file diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 3dd6455..d890301 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -161,6 +161,8 @@ db.url.0=jdbc:oracle:thin:@//localhost:1521/FREE db.user.0=C##NACOS db.password.0=NACOS_PASSWORD db.pool.config.driverClassName=oracle.jdbc.OracleDriver +# 指定为 MIXED、UNQUOTED 两种模式均可 +spring.sql.identifier.quoted.mode=MIXED ``` 3. 目前使用Oracle的问题 -- Gitee From b342000e3f7cc3f10ca438b34a00b52af6f8a0be Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 17:58:02 +0800 Subject: [PATCH 146/159] =?UTF-8?q?*=20=E4=BB=A3=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 2 +- .../java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index d890301..3c82952 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -162,7 +162,7 @@ db.user.0=C##NACOS db.password.0=NACOS_PASSWORD db.pool.config.driverClassName=oracle.jdbc.OracleDriver # 指定为 MIXED、UNQUOTED 两种模式均可 -spring.sql.identifier.quoted.mode=MIXED +db.sql.identifier.quoted.mode=MIXED ``` 3. 目前使用Oracle的问题 diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 784cc65..316597a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -33,7 +33,7 @@ public abstract class BaseMapper extends AbstractMapper { } private IdentifierQuotedMode getConfiguredIdentifierQuotedMode(){ - String modeString = EnvUtil.getProperty("spring.sql.identifier.quoted.mode"); + String modeString = EnvUtil.getProperty("db.sql.identifier.quoted.mode"); IdentifierQuotedMode mode = null; if(Strings.isNotBlank(modeString)){ mode = Enums.ofName(IdentifierQuotedMode.class, modeString); -- Gitee From 5c1e642812d0c312779a4f7c30f61e013e51a0c5 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 18:10:08 +0800 Subject: [PATCH 147/159] =?UTF-8?q?*=20=E6=8F=92=E4=BB=B6=E5=8F=AF?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nacos/plugin/datasource/NacosDatabaseDialect.java | 11 +++++++++++ .../datasource/db/oracle/OracleDatabaseDialect.java | 2 ++ .../jn/nacos/plugin/datasource/mapper/BaseMapper.java | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index 17cc083..f16b933 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -19,12 +19,23 @@ public abstract class NacosDatabaseDialect { private String name; private Dialect delegate; private Map functionMap; + + /** + * 插件中提供在 schema DDL 文件中， identifier 的默认模式 + */ + protected IdentifierQuotedMode identifierQuotedMode; + protected NacosDatabaseDialect(String name){ Preconditions.checkNotEmpty(name, "invalid dialect in class {}", Reflects.getFQNClassName(this.getClass())); this.name = name; String sqlhelperDialect = getCustomizedDialect(this.name); this.delegate = DialectRegistry.getInstance().gaussDialect(sqlhelperDialect); this.functionMap = initFunctionMap(); + this.identifierQuotedMode = IdentifierQuotedMode.QUOTED; + } + + public IdentifierQuotedMode getPluginProvidedDDLIdentifierQuotedMode(){ + return identifierQuotedMode; } private static String getCustomizedDialect(String dialect){ diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index 4a517dc..c13c82b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -1,11 +1,13 @@ package com.jn.nacos.plugin.datasource.db.oracle; import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.IdentifierQuotedMode; import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect(){ super(DatabaseNames.ORACLE); + this.identifierQuotedMode = IdentifierQuotedMode.MIXED; } @Override diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 316597a..41236ae 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -27,17 +27,23 @@ public abstract class BaseMapper extends AbstractMapper { protected BaseMapper() { this.databaseName = getConfiguredDatabaseName(); - this.identifierQuotedModeInDDL = getConfiguredIdentifierQuotedMode(); Preconditions.checkTrue(!Objs.equals(DatabaseNames.UNSUPPORTED, this.databaseName), "database {} is unsupported", this.databaseName); this.dialect = NacosDatabaseDialectManager.getInstance().getDialect(this.databaseName); + this.identifierQuotedModeInDDL = getConfiguredIdentifierQuotedMode(); } + /** + * 当使用的 create-schema.sql, create-tables.sql 不是插件提供的，需要指定该配置。 + */ private IdentifierQuotedMode getConfiguredIdentifierQuotedMode(){ String modeString = EnvUtil.getProperty("db.sql.identifier.quoted.mode"); IdentifierQuotedMode mode = null; if(Strings.isNotBlank(modeString)){ mode = Enums.ofName(IdentifierQuotedMode.class, modeString); } + if(mode==null){ + mode = this.dialect.getPluginProvidedDDLIdentifierQuotedMode(); + } if(mode==null){ mode = IdentifierQuotedMode.QUOTED; } -- Gitee From 63682a86c6917a3cbea1e5edb6bd1369b039c36b Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 18:11:07 +0800 Subject: [PATCH 148/159] =?UTF-8?q?*=20=E8=B0=83=E6=95=B4oracle=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/datasource/db/oracle/OracleDatabaseDialect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java index c13c82b..6221c46 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/oracle/OracleDatabaseDialect.java @@ -7,7 +7,7 @@ import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; public class OracleDatabaseDialect extends NacosDatabaseDialect { public OracleDatabaseDialect(){ super(DatabaseNames.ORACLE); - this.identifierQuotedMode = IdentifierQuotedMode.MIXED; + this.identifierQuotedMode = IdentifierQuotedMode.UNQUOTED; } @Override -- Gitee From 7f5d39929e20e33dae7ea226479d14aca38c18d9 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Tue, 10 Sep 2024 18:20:49 +0800 Subject: [PATCH 149/159] =?UTF-8?q?*=20=E5=8E=BB=E6=8E=89=E5=AF=B9?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/installation.MD | 2 -- 1 file changed, 2 deletions(-) diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 3c82952..3dd6455 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -161,8 +161,6 @@ db.url.0=jdbc:oracle:thin:@//localhost:1521/FREE db.user.0=C##NACOS db.password.0=NACOS_PASSWORD db.pool.config.driverClassName=oracle.jdbc.OracleDriver -# 指定为 MIXED、UNQUOTED 两种模式均可 -db.sql.identifier.quoted.mode=MIXED ``` 3. 目前使用Oracle的问题 -- Gitee From ba0c67b0d7630f206c9dee06fddc566fd7a881c6 Mon Sep 17 00:00:00 2001 From: coderjn Date: Wed, 11 Sep 2024 06:39:32 +0800 Subject: [PATCH 150/159] =?UTF-8?q?%=20=E5=8F=91=E5=B8=832.0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RELEASE-LOG.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-LOG.MD b/RELEASE-LOG.MD index 0e3a94c..ac47183 100644 --- a/RELEASE-LOG.MD +++ b/RELEASE-LOG.MD @@ -1,3 +1,5 @@ +## 2.0.4 +1. 解决nacos中某些sql带有 \` 引号， 给其它数据库带来SQL语法错误的问题 ## 2.0.3 1. 完善对oracle数据库的支持，重点针处理 oracle 会把 `''` 作为 `null` 处理。 ## 2.0.2 -- Gitee From 32f44b5fb8d31c628f6077d164cc6b1f3173f6f0 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Thu, 12 Sep 2024 10:21:43 +0800 Subject: [PATCH 151/159] =?UTF-8?q?%=20=E5=87=86=E5=A4=87=202.0.5=20?= =?UTF-8?q?=E8=BF=AD=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index e2f6daf..8c3b2d3 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.4 + 2.0.5 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index 6083971..1c9361e 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.4 + 2.0.5 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index d3c9f2a..5f066f5 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.4 + 2.0.5 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index 1477ec1..00660cb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.4 + 2.0.5 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From 35c7d25954218266df1df1ee6781eb14c01e8863 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Thu, 12 Sep 2024 10:32:33 +0800 Subject: [PATCH 152/159] =?UTF-8?q?*=20=E4=BD=BF=E7=94=A8=20nacos=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=BF=9B=E8=A1=8C=E6=AF=94=E8=BE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-datasource/pom.xml | 8 ++++++++ .../plugin/datasource/mapper/BaseMapper.java | 6 ++++-- .../plugin/datasource/tests/VersionTest.java | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 nacosplugin-datasource/src/test/java/com/jn/nacos/plugin/datasource/tests/VersionTest.java diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 5f066f5..80f0b4f 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -41,6 +41,14 @@ org.springframework spring-core + + + junit + junit + 4.11 + test + + \ No newline at end of file diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java index 41236ae..2d8645b 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/mapper/BaseMapper.java @@ -277,8 +277,10 @@ public abstract class BaseMapper extends AbstractMapper { } protected boolean hasEncryptedDataKeyColumn(){ - String currentVersion = VersionUtils.getFullClientVersion(); - return VersionUtils.compareVersion(currentVersion, "2.1.0")>=0; + String currentVersion = VersionUtils.version; + String[] segments = Strings.split(currentVersion, "."); + String nacosVersion = Strings.join(".", segments, 0, 3); + return VersionUtils.compareVersion(nacosVersion, "2.1.0")>=0; } private static final String NAMESPACE_PUBLIC_KEY = "public"; protected final String getDefaultTenantId(){ diff --git a/nacosplugin-datasource/src/test/java/com/jn/nacos/plugin/datasource/tests/VersionTest.java b/nacosplugin-datasource/src/test/java/com/jn/nacos/plugin/datasource/tests/VersionTest.java new file mode 100644 index 0000000..475bd62 --- /dev/null +++ b/nacosplugin-datasource/src/test/java/com/jn/nacos/plugin/datasource/tests/VersionTest.java @@ -0,0 +1,19 @@ +package com.jn.nacos.plugin.datasource.tests; + +import com.alibaba.nacos.common.utils.VersionUtils; +import com.jn.langx.util.Strings; +import org.junit.Test; + +public class VersionTest { + + @Test + public void test(){ + String currentVersion = "2.4.1.1"; + String[] segments = Strings.split(currentVersion, "."); + String nacosVersion = Strings.join(".", segments, 0, 3); + boolean gte= VersionUtils.compareVersion(nacosVersion, "2.1.0")>=0; + System.out.println(gte); + } + + +} -- Gitee From 1085497391effe5af74e80f8b08146ece2c7da11 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Thu, 12 Sep 2024 15:49:47 +0800 Subject: [PATCH 153/159] =?UTF-8?q?*=20=E6=9B=B4=E6=96=B0=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++------ RELEASE-LOG.MD | 2 ++ nacosplugin-datasource/installation.MD | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a0263bf..506d0dc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ #### 介绍 针对Nacos提供多种插件支持： -+ nacos-plugin-datasource： 支持多种数据库 ++ nacos-plugin-datasource： 理论上可支持任意关系型数据库，实际已测试过的数据库清单： + DM (达梦) + Kingbase （金仓） + MSSQL (SQLServer) @@ -15,11 +15,11 @@ #### 版本映射 -| 插件版本 | 构建时使用的nacos版本 | 支持的Nacos版本 | -| ------------- | :-------------------: | :-------------: | -| 1.0.x | 2.4.1 | 理论上是 all | -| 2.0.0 - 2.0.4 | 2.4.1 | 理论上是 all | -| | | | +| 插件版本 | 构建时使用的nacos版本 | 支持的Nacos版本 | 测试过的nacos版本 | +| ------------- | :-------------------: | :-------------: | ----------------- | +| 1.0.x | 2.4.1 | 理论上是 all | 2.3.2、2.4.1 | +| 2.0.0 - 2.0.5 | 2.4.1 | 理论上是 all | 2.3.2、2.4.1 | +| | | | | diff --git a/RELEASE-LOG.MD b/RELEASE-LOG.MD index ac47183..575e1d6 100644 --- a/RELEASE-LOG.MD +++ b/RELEASE-LOG.MD @@ -1,3 +1,5 @@ +## 2.0.5 +1. 完善版本比较机制，支持自行构建在版本。 ## 2.0.4 1. 解决nacos中某些sql带有 \` 引号， 给其它数据库带来SQL语法错误的问题 ## 2.0.3 diff --git a/nacosplugin-datasource/installation.MD b/nacosplugin-datasource/installation.MD index 3dd6455..2a963d3 100644 --- a/nacosplugin-datasource/installation.MD +++ b/nacosplugin-datasource/installation.MD @@ -1,7 +1,7 @@ ## datasource 插件安装 1. 将插件、数据库驱动 放到 `nacos/plugins` 目录 ```text -io.github.bes2008.solution.nacosplugins:nacosplugin-all:jar:1.0.0 +io.github.bes2008.solution.nacosplugins:nacosplugin-all:jar:VERSION ``` 2. 在application.properties中配置数据库 -- Gitee From db6dac5a14824818818e1043107066fc68f56724 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 14:38:02 +0800 Subject: [PATCH 154/159] =?UTF-8?q?*=20=E5=AF=B9opengauss,=20magicdata=20?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=20null=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/NacosDatabaseDialect.java | 3 +++ .../db/gauss/OpenGaussDatabaseDialect.java | 20 +++++++++++++++++++ .../db/magicdata/MagicDatabaseDialect.java | 20 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/gauss/OpenGaussDatabaseDialect.java create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java index f16b933..e1cd3bf 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/NacosDatabaseDialect.java @@ -132,6 +132,9 @@ public abstract class NacosDatabaseDialect { return false; } + /** + * 为了应对存入 "" 字符串时，被当作 null 处理的情况 + */ public String genCastNullToDefaultExpression(String expressionOrIdentifier,@Nullable String defaultValue){ return expressionOrIdentifier; } diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/gauss/OpenGaussDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/gauss/OpenGaussDatabaseDialect.java new file mode 100644 index 0000000..23d2363 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/gauss/OpenGaussDatabaseDialect.java @@ -0,0 +1,20 @@ +package com.jn.nacos.plugin.datasource.db.gauss; + +import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class OpenGaussDatabaseDialect extends NacosDatabaseDialect { + public OpenGaussDatabaseDialect() { + super(DatabaseNames.OPENGAUSS); + } + + @Override + public boolean isAutoCastEmptyStringToNull() { + return true; + } + + @Override + public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { + return " COALESCE("+expressionOrIdentifier+", '"+defaultValue+"') "; + } +} diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDatabaseDialect.java new file mode 100644 index 0000000..779a914 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/magicdata/MagicDatabaseDialect.java @@ -0,0 +1,20 @@ +package com.jn.nacos.plugin.datasource.db.magicdata; + +import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class MagicDatabaseDialect extends NacosDatabaseDialect { + public MagicDatabaseDialect() { + super(DatabaseNames.MAGICDATA); + } + + @Override + public boolean isAutoCastEmptyStringToNull() { + return true; + } + + @Override + public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { + return " COALESCE("+expressionOrIdentifier+", '"+defaultValue+"') "; + } +} -- Gitee From 8b263f990165c535a8d17873008548cb549738be Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 14:43:17 +0800 Subject: [PATCH 155/159] =?UTF-8?q?*=20=E5=AF=B9=20postgresql=20=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=20null=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../postgresql/PostgresDatabaseDialect.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java new file mode 100644 index 0000000..60af7b5 --- /dev/null +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java @@ -0,0 +1,20 @@ +package com.jn.nacos.plugin.datasource.db.postgresql; + +import com.jn.nacos.plugin.datasource.DatabaseNames; +import com.jn.nacos.plugin.datasource.NacosDatabaseDialect; + +public class PostgresDatabaseDialect extends NacosDatabaseDialect { + public PostgresDatabaseDialect() { + super(DatabaseNames.POSTGRESQL); + } + + @Override + public boolean isAutoCastEmptyStringToNull() { + return true; + } + + @Override + public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { + return " COALESCE("+expressionOrIdentifier+", '"+defaultValue+"') "; + } +} -- Gitee From cabe1a8827aa99a81a55a3e4dc0ab3d05949531f Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 14:57:31 +0800 Subject: [PATCH 156/159] =?UTF-8?q?*=20=E5=AF=B9=20postgresql=20=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=20null=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/db/postgresql/PostgresDatabaseDialect.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java index 60af7b5..21ae63a 100644 --- a/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java +++ b/nacosplugin-datasource/src/main/java/com/jn/nacos/plugin/datasource/db/postgresql/PostgresDatabaseDialect.java @@ -10,11 +10,7 @@ public class PostgresDatabaseDialect extends NacosDatabaseDialect { @Override public boolean isAutoCastEmptyStringToNull() { - return true; - } - - @Override - public String genCastNullToDefaultExpression(String expressionOrIdentifier, String defaultValue) { - return " COALESCE("+expressionOrIdentifier+", '"+defaultValue+"') "; + // 此测试结果基于 postgresql 15 + return false; } } -- Gitee From a13aa27f8bb15fa9cf023bfcd061511e4bcff738 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 14:59:06 +0800 Subject: [PATCH 157/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.6=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nacosplugin-all/pom.xml | 2 +- nacosplugin-datasource-sqlscript/pom.xml | 2 +- nacosplugin-datasource/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nacosplugin-all/pom.xml b/nacosplugin-all/pom.xml index 8c3b2d3..596699c 100644 --- a/nacosplugin-all/pom.xml +++ b/nacosplugin-all/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.5 + 2.0.6 nacosplugin-all diff --git a/nacosplugin-datasource-sqlscript/pom.xml b/nacosplugin-datasource-sqlscript/pom.xml index 1c9361e..cce5a82 100644 --- a/nacosplugin-datasource-sqlscript/pom.xml +++ b/nacosplugin-datasource-sqlscript/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.5 + 2.0.6 nacosplugin-datasource-sqlscript diff --git a/nacosplugin-datasource/pom.xml b/nacosplugin-datasource/pom.xml index 80f0b4f..f6f4a92 100644 --- a/nacosplugin-datasource/pom.xml +++ b/nacosplugin-datasource/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.5 + 2.0.6 nacosplugin-datasource diff --git a/pom.xml b/pom.xml index 00660cb..6a9f01c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.bes2008.solution.nacosplugins nacos-plugins - 2.0.5 + 2.0.6 pom ${project.groupId}:${project.artifactId}:${project.version} -- Gitee From 631880c4542760fc451a43b96ec9b7552758a5e6 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 15:00:26 +0800 Subject: [PATCH 158/159] =?UTF-8?q?*=20=E5=87=86=E5=A4=872.0.6=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RELEASE-LOG.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE-LOG.MD b/RELEASE-LOG.MD index 575e1d6..16f098a 100644 --- a/RELEASE-LOG.MD +++ b/RELEASE-LOG.MD @@ -1,3 +1,5 @@ +## 2.0.6 +1. 解决OpenGauss中将`''`处理成NULL的情况 ## 2.0.5 1. 完善版本比较机制，支持自行构建在版本。 ## 2.0.4 -- Gitee From 0868ebeb2503230dcda1057182b0e7fd5d616464 Mon Sep 17 00:00:00 2001 From: fjn1194361820 Date: Sat, 14 Sep 2024 15:13:14 +0800 Subject: [PATCH 159/159] =?UTF-8?q?*=20=E6=95=B4=E7=90=86spi=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.jn.nacos.plugin.datasource.NacosDatabaseDialect | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect index f3df91b..5948227 100644 --- a/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect +++ b/nacosplugin-datasource/src/main/resources/META-INF/services/com.jn.nacos.plugin.datasource.NacosDatabaseDialect @@ -1,4 +1,8 @@ +com.jn.nacos.plugin.datasource.db.derby.DerbyDatabaseDialect +com.jn.nacos.plugin.datasource.db.gauss.OpenGaussDatabaseDialect +com.jn.nacos.plugin.datasource.db.kingbase.KingbaseDatabaseDialect +com.jn.nacos.plugin.datasource.db.magicdata.MagicDatabaseDialect com.jn.nacos.plugin.datasource.db.mssql.MssqlDatabaseDialect +com.jn.nacos.plugin.datasource.db.mysql.MysqlDatabaseDialect com.jn.nacos.plugin.datasource.db.oracle.OracleDatabaseDialect -com.jn.nacos.plugin.datasource.db.derby.DerbyDatabaseDialect -com.jn.nacos.plugin.datasource.db.mysql.MysqlDatabaseDialect \ No newline at end of file +com.jn.nacos.plugin.datasource.db.postgresql.PostgresDatabaseDialect \ No newline at end of file -- Gitee