From 81c1514a21a86a38f498e4a4db2995211f4e9f52 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <1179705413@qq.com> Date: Sat, 15 Mar 2025 17:25:10 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E6=9E=84=E5=BB=BA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/shardingsphere-jdbc.yml | 4 +- novel-admin/pom.xml | 5 ++ .../main/build/config/application-prod.yml | 11 ---- .../src/main/resources/application-dev.yml | 3 - .../src/main/resources/application-prod.yml | 3 - .../src/main/resources/application.yml | 5 +- .../main/resources/application-common-dev.yml | 15 +---- .../resources/application-common-prod.yml | 57 +------------------ .../src/main/resources/application-common.yml | 3 + novel-crawl/pom.xml | 5 ++ .../build/config/application-common-prod.yml | 15 ----- novel-front/pom.xml | 5 ++ .../build/config/application-common-prod.yml | 14 ----- 13 files changed, 26 insertions(+), 119 deletions(-) diff --git a/config/shardingsphere-jdbc.yml b/config/shardingsphere-jdbc.yml index 5f12200..d7cd327 100644 --- a/config/shardingsphere-jdbc.yml +++ b/config/shardingsphere-jdbc.yml @@ -34,7 +34,7 @@ rules: tableStrategy: standard: # 分片列名称 - shardingColumn: chapter_id + shardingColumn: index_id # 分片算法名称 shardingAlgorithmName: bookContentSharding @@ -44,7 +44,7 @@ rules: type: INLINE props: # 分片算法的行表达式 - algorithm-expression: book_content${chapter_id % 10} + algorithm-expression: book_content${index_id % 10} diff --git a/novel-admin/pom.xml b/novel-admin/pom.xml index 36fb42b..5033d3e 100644 --- a/novel-admin/pom.xml +++ b/novel-admin/pom.xml @@ -284,6 +284,11 @@ + + + + + diff --git a/novel-admin/src/main/build/config/application-prod.yml b/novel-admin/src/main/build/config/application-prod.yml index 73d0c2f..5f7b883 100644 --- a/novel-admin/src/main/build/config/application-prod.yml +++ b/novel-admin/src/main/build/config/application-prod.yml @@ -2,19 +2,8 @@ server: port: 8088 spring: - datasource: - url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 redis: host: 127.0.0.1 port: 6379 password: test123456 -sharding: - jdbc: - datasource: - ds0: - jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 diff --git a/novel-admin/src/main/resources/application-dev.yml b/novel-admin/src/main/resources/application-dev.yml index 2ad7bd3..0efd72e 100644 --- a/novel-admin/src/main/resources/application-dev.yml +++ b/novel-admin/src/main/resources/application-dev.yml @@ -7,9 +7,6 @@ logging: root: info com.java2nb: debug spring: - datasource: - driverClassName: org.apache.shardingsphere.driver.ShardingSphereDriver - url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml redis: host: 127.0.0.1 port: 6379 diff --git a/novel-admin/src/main/resources/application-prod.yml b/novel-admin/src/main/resources/application-prod.yml index aba7d84..0fab20d 100644 --- a/novel-admin/src/main/resources/application-prod.yml +++ b/novel-admin/src/main/resources/application-prod.yml @@ -7,9 +7,6 @@ logging: root: error com.java2nb: error spring: - datasource: - driverClassName: org.apache.shardingsphere.driver.ShardingSphereDriver - url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml redis: host: 127.0.0.1 port: 6379 diff --git a/novel-admin/src/main/resources/application.yml b/novel-admin/src/main/resources/application.yml index 7c2fd02..5cc1028 100644 --- a/novel-admin/src/main/resources/application.yml +++ b/novel-admin/src/main/resources/application.yml @@ -9,6 +9,9 @@ server: # basic: # enabled: false spring: + datasource: + driverClassName: org.apache.shardingsphere.driver.ShardingSphereDriver + url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml thymeleaf: mode: LEGACYHTML5 cache: false @@ -23,7 +26,7 @@ spring: multipart: max-file-size: 100MB max-request-size: 100MB - + devtools: restart: enabled: true diff --git a/novel-common/src/main/resources/application-common-dev.yml b/novel-common/src/main/resources/application-common-dev.yml index cd4dc74..e44d19a 100644 --- a/novel-common/src/main/resources/application-common-dev.yml +++ b/novel-common/src/main/resources/application-common-dev.yml @@ -10,21 +10,8 @@ spring: port: 6379 #Redis服务器连接密码 password: test123456 - jedis: - pool: - #连接池最大连接数（使用负值表示没有限制） - max-active: 8 - #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: 1 - #连接池最大阻塞等待时间（使用负值表示没有限制） - max-idle: 8 - #连接池中的最小空闲连接 - min-idle: 0 #连接超时时间（毫秒） - timeout: 30000 - datasource: - url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml - driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver + timeout: 10000 content: save: diff --git a/novel-common/src/main/resources/application-common-prod.yml b/novel-common/src/main/resources/application-common-prod.yml index df2b262..7a8d8b3 100644 --- a/novel-common/src/main/resources/application-common-prod.yml +++ b/novel-common/src/main/resources/application-common-prod.yml @@ -9,63 +9,8 @@ spring: #Redis服务器连接端口 port: 6379 #Redis服务器连接密码 - password: test - jedis: - pool: - #连接池最大连接数（使用负值表示没有限制） - max-active: 8 - #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: 1 - #连接池最大阻塞等待时间（使用负值表示没有限制） - max-idle: 8 - #连接池中的最小空闲连接 - min-idle: 0 - #连接超时时间（毫秒） - timeout: 30000 - datasource: - url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root password: test123456 - driver-class-name: com.mysql.cj.jdbc.Driver - - -####使用shardingJdbc时， -####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误 -##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR - -sharding: - jdbc: - datasource: - names: ds0 #,ds1 - ds0: - type: com.zaxxer.hikari.HikariDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 - # ds1: - # type: com.alibaba.druid.pool.DruidDataSource - # driver-class-name: com.mysql.jdbc.Driver - # url: jdbc:mysql://localhost:3306/novel_plus2 - # username: root - # password: test123456 - config: - sharding: - props: - sql.show: true - tables: - book_content: #book_content表 - key-generator-column-name: id #主键 - actual-data-nodes: ds${0}.book_content${0..9} #数据节点 - # database-strategy: #分库策略 - # inline: - # sharding-column: book_id - # algorithm-expression: ds${book_id % 10} - table-strategy: #分表策略 - inline: - shardingColumn: index_id - algorithm-expression: book_content${index_id % 10} - + timeout: 10000 logging: level: diff --git a/novel-common/src/main/resources/application-common.yml b/novel-common/src/main/resources/application-common.yml index b23e73b..be2c512 100644 --- a/novel-common/src/main/resources/application-common.yml +++ b/novel-common/src/main/resources/application-common.yml @@ -1,4 +1,7 @@ spring: + datasource: + url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml + driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver cache: ehcache: config: classpath:ehcache.xml diff --git a/novel-crawl/pom.xml b/novel-crawl/pom.xml index 6f8c74c..e47cd31 100644 --- a/novel-crawl/pom.xml +++ b/novel-crawl/pom.xml @@ -63,6 +63,11 @@ + + + + + diff --git a/novel-crawl/src/main/build/config/application-common-prod.yml b/novel-crawl/src/main/build/config/application-common-prod.yml index 86a6abd..b318604 100644 --- a/novel-crawl/src/main/build/config/application-common-prod.yml +++ b/novel-crawl/src/main/build/config/application-common-prod.yml @@ -4,26 +4,11 @@ server: #不分表的数据库配置 spring: - datasource: - url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: root redis: host: 127.0.0.1 port: 6379 password: test123456 -####使用shardingJdbc时， -####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误 -##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR -sharding: - jdbc: - datasource: - ds0: - jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 - #登录用户名密码 admin: username: admin diff --git a/novel-front/pom.xml b/novel-front/pom.xml index 1c8c2c2..b0e92b1 100644 --- a/novel-front/pom.xml +++ b/novel-front/pom.xml @@ -84,6 +84,11 @@ + + + + + diff --git a/novel-front/src/main/build/config/application-common-prod.yml b/novel-front/src/main/build/config/application-common-prod.yml index f21795f..15d9be5 100644 --- a/novel-front/src/main/build/config/application-common-prod.yml +++ b/novel-front/src/main/build/config/application-common-prod.yml @@ -4,25 +4,11 @@ server: #不分表的数据库配置 spring: - datasource: - url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: root redis: host: 127.0.0.1 port: 6379 password: test123456 -####使用shardingJdbc时， -####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误 -##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR -sharding: - jdbc: - datasource: - ds0: - jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 pic: save: