diff --git a/pom.xml b/pom.xml index 94083dc1..7f7edd27 100644 --- a/pom.xml +++ b/pom.xml @@ -76,18 +76,18 @@ --> - + - + @@ -96,8 +96,6 @@ ${druid.version} - - io.jsonwebtoken diff --git a/snowy-base/snowy-core/pom.xml b/snowy-base/snowy-core/pom.xml index d4b9fe06..a5ac2ab1 100644 --- a/snowy-base/snowy-core/pom.xml +++ b/snowy-base/snowy-core/pom.xml @@ -54,18 +54,16 @@ --> - + - + + --> diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/DbIdEnum.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/DbIdEnum.java index b1383469..d0a15c68 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/DbIdEnum.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/DbIdEnum.java @@ -55,7 +55,17 @@ public enum DbIdEnum { /** * mssql */ - MS_SQL("mssql", "sqlserver"); + MS_SQL("mssql", "sqlserver"), + + /** + * 达梦数据库 + */ + DM_SQL("dm", "dm"), + + /** + * 人大金仓数据库 + */ + KINGBASE_ES("kingbase", "kingbasees"); private final String code; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java index f79f1c38..b0a12f23 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java @@ -44,6 +44,11 @@ public class DruidProperties { private static final Log log = Log.get(); + /** + * mysql校验语句 + */ + private final String MYSQL_VALIDATE_QUERY_SQL = "select 1"; + /** * oracle校验语句 */ @@ -60,9 +65,14 @@ public class DruidProperties { private final String SQLSERVER_VALIDATE_QUERY_SQL = "select 1"; /** - * mysql校验语句 + * 达梦数据库校验语句 */ - private final String MYSQL_VALIDATE_QUERY_SQL = "select 1"; + private final String DM_VALIDATE_QUERY_SQL = "select 1"; + + /** + * 人大金仓数据库校验语句 + */ + private final String KINGBASEES_VALIDATE_QUERY_SQL = "select 1"; private String url; @@ -166,6 +176,10 @@ public class DruidProperties { return POSTGRESQL_VALIDATE_QUERY_SQL; } else if (url.contains(DbIdEnum.MS_SQL.getName())) { return SQLSERVER_VALIDATE_QUERY_SQL; + } else if (url.contains(DbIdEnum.DM_SQL.getName())) { + return DM_VALIDATE_QUERY_SQL; + } else if (url.contains(DbIdEnum.KINGBASE_ES.getName())) { + return KINGBASEES_VALIDATE_QUERY_SQL; } else { return MYSQL_VALIDATE_QUERY_SQL; } diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java index 35b72992..b524b49a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java @@ -53,6 +53,8 @@ public class SnowyDatabaseIdProvider implements DatabaseIdProvider { return DbIdEnum.PG_SQL.getCode(); } else if (url.contains(DbIdEnum.MS_SQL.getName())) { return DbIdEnum.MS_SQL.getCode(); + } else if (url.contains(DbIdEnum.DM_SQL.getName())) { + return DbIdEnum.DM_SQL.getCode(); } else { return DbIdEnum.MYSQL.getCode(); } diff --git a/snowy-main/src/main/resources/application-dev.yml b/snowy-main/src/main/resources/application-dev.yml index a2e7ed78..feabb99b 100644 --- a/snowy-main/src/main/resources/application-dev.yml +++ b/snowy-main/src/main/resources/application-dev.yml @@ -30,13 +30,23 @@ spring: # username: postgres # password: 123456 +# 达梦数据库 +#spring: +# datasource: +# driver-class-name: dm.jdbc.driver.DmDriver +# url: jdbc:dm://localhost:5236/snowy-pub-dm +# username: SNOWY +# password: 123456789 +# #达梦数据库兼容问题,不需要在sql语句前加模式名的解决方法: +# #https://blog.csdn.net/myth8860/article/details/100557705 + +# 人大金仓数据库 #spring: # datasource: # driver-class-name: com.kingbase8.Driver # url: jdbc:kingbase8://localhost:54321/snowy-pub-kingbase # username: SYSTEM # password: 123456 -# filters: mergeStat # #人大金仓数据库兼容问题,不需要加在sql语句中加public的解决方法: # #在根目录data下的kingbase.conf文档里面找到search_path = '"$user",PUBLIC,sys_catalog'进行替换放开 # #重启数据库即可完全兼容,注意 sql中不能出现mysql中的关键字的单引号 diff --git a/snowy-main/src/main/resources/application-local.yml b/snowy-main/src/main/resources/application-local.yml index a2e7ed78..feabb99b 100644 --- a/snowy-main/src/main/resources/application-local.yml +++ b/snowy-main/src/main/resources/application-local.yml @@ -30,13 +30,23 @@ spring: # username: postgres # password: 123456 +# 达梦数据库 +#spring: +# datasource: +# driver-class-name: dm.jdbc.driver.DmDriver +# url: jdbc:dm://localhost:5236/snowy-pub-dm +# username: SNOWY +# password: 123456789 +# #达梦数据库兼容问题,不需要在sql语句前加模式名的解决方法: +# #https://blog.csdn.net/myth8860/article/details/100557705 + +# 人大金仓数据库 #spring: # datasource: # driver-class-name: com.kingbase8.Driver # url: jdbc:kingbase8://localhost:54321/snowy-pub-kingbase # username: SYSTEM # password: 123456 -# filters: mergeStat # #人大金仓数据库兼容问题,不需要加在sql语句中加public的解决方法: # #在根目录data下的kingbase.conf文档里面找到search_path = '"$user",PUBLIC,sys_catalog'进行替换放开 # #重启数据库即可完全兼容,注意 sql中不能出现mysql中的关键字的单引号 diff --git a/snowy-main/src/main/resources/application-prod.yml b/snowy-main/src/main/resources/application-prod.yml index a2e7ed78..feabb99b 100644 --- a/snowy-main/src/main/resources/application-prod.yml +++ b/snowy-main/src/main/resources/application-prod.yml @@ -30,13 +30,23 @@ spring: # username: postgres # password: 123456 +# 达梦数据库 +#spring: +# datasource: +# driver-class-name: dm.jdbc.driver.DmDriver +# url: jdbc:dm://localhost:5236/snowy-pub-dm +# username: SNOWY +# password: 123456789 +# #达梦数据库兼容问题,不需要在sql语句前加模式名的解决方法: +# #https://blog.csdn.net/myth8860/article/details/100557705 + +# 人大金仓数据库 #spring: # datasource: # driver-class-name: com.kingbase8.Driver # url: jdbc:kingbase8://localhost:54321/snowy-pub-kingbase # username: SYSTEM # password: 123456 -# filters: mergeStat # #人大金仓数据库兼容问题,不需要加在sql语句中加public的解决方法: # #在根目录data下的kingbase.conf文档里面找到search_path = '"$user",PUBLIC,sys_catalog'进行替换放开 # #重启数据库即可完全兼容,注意 sql中不能出现mysql中的关键字的单引号