diff --git a/novel-common/pom.xml b/novel-common/pom.xml index f210839..de4c193 100644 --- a/novel-common/pom.xml +++ b/novel-common/pom.xml @@ -57,6 +57,22 @@ ${mybatis.version} + + + + + io.shardingsphere + sharding-jdbc-spring-boot-starter + ${sharding.jdbc.version} + + + + io.shardingsphere + sharding-jdbc-spring-namespace + ${sharding.jdbc.version} + + + com.github.pagehelper diff --git a/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentDynamicSqlSupport.java b/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentDynamicSqlSupport.java index 0e5d9fa..e17d614 100644 --- a/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentDynamicSqlSupport.java +++ b/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentDynamicSqlSupport.java @@ -24,7 +24,7 @@ public final class BookContentDynamicSqlSupport { public final SqlColumn indexId = column("index_id", JDBCType.BIGINT); - public final SqlColumn content = column("content", JDBCType.LONGVARCHAR); + public final SqlColumn content = column("content", JDBCType.VARCHAR); public BookContent() { super("book_content"); diff --git a/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentMapper.java b/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentMapper.java index 51f9067..6d59854 100644 --- a/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentMapper.java +++ b/novel-common/src/main/java/com/java2nb/novel/mapper/BookContentMapper.java @@ -63,7 +63,7 @@ public interface BookContentMapper { @Results(id="BookContentResult", value = { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="index_id", property="indexId", jdbcType=JdbcType.BIGINT), - @Result(column="content", property="content", jdbcType=JdbcType.LONGVARCHAR) + @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR) }) List selectMany(SelectStatementProvider selectStatement); diff --git a/novel-common/src/main/resources/application-common-dev.yml b/novel-common/src/main/resources/application-common-dev.yml index e5c7cdf..91ba215 100644 --- a/novel-common/src/main/resources/application-common-dev.yml +++ b/novel-common/src/main/resources/application-common-dev.yml @@ -1,11 +1,57 @@ spring: profiles: include: [common] - datasource: - url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: test123456 - driver-class-name: com.mysql.cj.jdbc.Driver + main: + allow-bean-definition-overriding: true + +# datasource: +# url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai +# username: root +# password: test123456 +# driver-class-name: com.mysql.cj.jdbc.Driver + shardingsphere: + datasource: + names: master + + +####使用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} + + #Redis服务器IP redis: host: 127.0.0.1 diff --git a/novel-crawl/pom.xml b/novel-crawl/pom.xml index f5c7338..13909ff 100644 --- a/novel-crawl/pom.xml +++ b/novel-crawl/pom.xml @@ -25,6 +25,8 @@ org.springframework.boot spring-boot-starter-security + + diff --git a/novel-front/pom.xml b/novel-front/pom.xml index 97a7352..dca8171 100644 --- a/novel-front/pom.xml +++ b/novel-front/pom.xml @@ -43,24 +43,19 @@ com.aliyun.oss aliyun-sdk-oss - 2.4.0 + ${aliyun-sdk-oss.version} commons-fileupload commons-fileupload - 1.3.1 + ${commons-fileupload.version} - - org.springframework - spring-mock - 2.0.8 - com.github.tobato fastdfs-client - 1.26.1-RELEASE + ${fastdfs-client.version} @@ -69,6 +64,8 @@ + +