From 9e50135d17aa29f1458a264b78f0660affe97494 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Wed, 22 May 2024 16:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 8 ++++++++ .../web/controller/system/count/SysUsernumController.java | 1 + ruoyi-admin/src/main/resources/application-druid.yml | 4 ++++ ruoyi-admin/src/main/resources/application.yml | 3 ++- .../src/main/resources/templates/system/check/add.html | 6 +++--- .../src/main/resources/templates/system/train/add.html | 2 +- .../src/main/resources/templates/system/user/add.html | 4 ++-- ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java | 2 +- .../com/ruoyi/generator/controller/GenController.java | 1 + 9 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index f5f07b5..a13ee7e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -49,6 +49,14 @@ mysql-connector-java + + + cn.com.kingbase + kingbase8 + 8.6.0 + + + com.ruoyi diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java index d65ce23..271e650 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysUsernumController.java @@ -106,6 +106,7 @@ public class SysUsernumController extends BaseController { { List list = userService.lambdaQuery().eq(SysUser::getDeptId, deptId) .eq(SysUser::getDelFlag,0) + .ne(SysUser::getUserId,1) .list(); list.forEach(sysuser -> { List 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/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html index e76d9c7..7b87c1b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html @@ -16,7 +16,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index b6f8975..9030616 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -189,7 +189,7 @@
- +
@@ -197,7 +197,7 @@
- +
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) {