From a3391647b5cf19e424d1aa4a25f573fdda1c7c2b Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 May 2024 00:30:45 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GeneratorServiceImpl.java | 2 +- .../system/service/impl/FileServiceImpl.java | 2 +- .../main/resources/config/application-dev.yml | 16 ++++++++-------- .../main/resources/config/application-prod.yml | 16 ++++++++-------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index e0d49221..d95b17bd 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -85,7 +85,7 @@ public class GeneratorServiceImpl implements GeneratorService { List tableList = MetaUtils.getTables(dataSource); String tableName = query.getTableName(); if (StrUtil.isNotBlank(tableName)) { - tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName)); + tableList.removeIf(table -> !StrUtil.containsAnyIgnoreCase(table.getTableName(), tableName)); } tableList.removeIf(table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties .getExcludeTables())); diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java index ba60a498..e80c4a8b 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java @@ -146,7 +146,7 @@ public class FileServiceImpl extends BaseServiceImpl URLUtil diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-admin-webapi/src/main/resources/config/application-dev.yml index d7b73642..67b71566 100644 --- a/continew-admin-webapi/src/main/resources/config/application-dev.yml +++ b/continew-admin-webapi/src/main/resources/config/application-dev.yml @@ -27,14 +27,14 @@ spring.datasource: password: ${DB_PWD:123456} driver-class-name: com.mysql.cj.jdbc.Driver type: ${spring.datasource.type} - # 从库配置（可配多个，构成多从） - slave_1: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false - username: - password: - lazy: true - driver-class-name: com.mysql.cj.jdbc.Driver - type: ${spring.datasource.type} +# # 从库配置（可配多个，构成多从） +# slave_1: +# url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false +# username: +# password: +# lazy: true +# driver-class-name: com.mysql.cj.jdbc.Driver +# type: ${spring.datasource.type} # # PostgreSQL 库配置 # postgresql: # url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:5432}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-admin-webapi/src/main/resources/config/application-prod.yml index 38c76286..df616a05 100644 --- a/continew-admin-webapi/src/main/resources/config/application-prod.yml +++ b/continew-admin-webapi/src/main/resources/config/application-prod.yml @@ -29,14 +29,14 @@ spring.datasource: password: ${DB_PWD:123456} driver-class-name: com.mysql.cj.jdbc.Driver type: ${spring.datasource.type} - # 从库配置（可配多个，构成多从） - slave_1: - url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false - username: - password: - lazy: true - driver-class-name: com.mysql.cj.jdbc.Driver - type: ${spring.datasource.type} +# # 从库配置（可配多个，构成多从） +# slave_1: +# url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false +# username: +# password: +# lazy: true +# driver-class-name: com.mysql.cj.jdbc.Driver +# type: ${spring.datasource.type} # # PostgreSQL 库配置 # postgresql: # url: jdbc:postgresql://${DB_HOST:127.0.0.1}:${DB_PORT:5432}/${DB_NAME:continew_admin}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false