postList = sysUserPostService.lambdaQuery().
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 5f01c1e..5f54284 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -3,14 +3,18 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
+# driverClassName: com.kingbase8.Driver
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.254.123:3306/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:kingbase8://192.168.254.197:54321/zhky?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+
#username: root
#password: qwer1234
username: ENC(ElFzIjuV3codlxGotvqqyA==)
password: ENC(aM81j4MP4WJC4ZQBNlDntx0jKsP3wwQZ)
+# password: ENC(YgAg6bUSgw1uc1H17kDw0g==)
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 46198f5..1915d17 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@ ruoyi:
# 版权年份
copyrightYear: 2024
# 实例演示开关
- demoEnabled: true
+ demoEnabled: false
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
profile: D:/ruoyi/uploadPath
# 获取ip地址开关
@@ -85,6 +85,7 @@ mybatis:
# PageHelper分页插件
pagehelper:
helperDialect: mysql
+# helperDialect: postgresql
supportMethodsArguments: true
params: count=countSql
diff --git a/ruoyi-admin/src/main/resources/templates/system/check/add.html b/ruoyi-admin/src/main/resources/templates/system/check/add.html
index 41981e8..30b245a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/check/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/check/add.html
@@ -10,20 +10,20 @@
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
index 21e7eb7..cd25fb8 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java
@@ -6,7 +6,7 @@ import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
public class EncFactory {
public static void main(String[] args) {
String securityKey = "BUSINESS"; // 加密秘钥
- String data = "qwer1234"; // 需要加密的字符串
+ String data = "123456"; // 需要加密的字符串
PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
SimpleStringPBEConfig config = new SimpleStringPBEConfig();
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 49b02ba..80da98a 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -201,6 +201,7 @@ public class GenController extends BaseController
{
SqlUtil.filterKeyword(sql);
List sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
+ //List sqlStatements = SQLUtils.parseStatements(sql, DbType.kingbase);
List tableNames = new ArrayList<>();
for (SQLStatement sqlStatement : sqlStatements)
{