From c66905fbea6c4421baf1bccefcb06d8e3dd0705f Mon Sep 17 00:00:00 2001 From: xiongxiaoyang Date: Wed, 3 Jun 2020 08:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=88=86=E8=A1=A8=E6=A1=86?= =?UTF-8?q?=E6=9E=B6sharding-jdbc=EF=BC=8C=E5=86=85=E5=AE=B9=E8=A1=A8?= =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../novel/book/mapper/BookContentMapper.html | 2 +- .../java2nb/novel/news/mapper/NewsMapper.html | 2 +- doc/sql/20200603.sql | 116 ++++++++++++++++++ ...=> nacos_config_export_20200603084216.zip} | Bin 7016 -> 7560 bytes novel-book/book-service/pom.xml | 15 +++ .../mapper/BookContentDynamicSqlSupport.java | 2 +- .../novel/book/mapper/BookContentMapper.java | 2 +- .../src/main/resources/application-common.yml | 3 + .../mapper/BookContentDynamicSqlSupport.java | 2 +- .../novel/book/mapper/BookContentMapper.java | 2 +- .../news/mapper/NewsDynamicSqlSupport.java | 2 +- .../java2nb/novel/news/mapper/NewsMapper.java | 2 +- .../news/mapper/NewsDynamicSqlSupport.java | 2 +- .../java2nb/novel/news/mapper/NewsMapper.java | 2 +- 14 files changed, 144 insertions(+), 10 deletions(-) create mode 100644 doc/sql/20200603.sql rename doc/yml/{nacos_config_export_20200603004804.zip => nacos_config_export_20200603084216.zip} (61%) diff --git a/doc/java-doc/com/java2nb/novel/book/mapper/BookContentMapper.html b/doc/java-doc/com/java2nb/novel/book/mapper/BookContentMapper.html index 55eba1e..daa2a2c 100644 --- a/doc/java-doc/com/java2nb/novel/book/mapper/BookContentMapper.html +++ b/doc/java-doc/com/java2nb/novel/book/mapper/BookContentMapper.html @@ -266,7 +266,7 @@ int insert(org.mybatis.dynamic.sql.insert.render.InsertStatementProvider< 
@Generated(value="org.mybatis.generator.api.MyBatisGenerator")
  @SelectProvider(type=org.mybatis.dynamic.sql.util.SqlProviderAdapter.class,
                 method="select")
- @Results(id="BookContentResult",value={@Result(column="id",property="id",jdbcType=BIGINT,id=true),@Result(column="index_id",property="indexId",jdbcType=BIGINT),@Result(column="content",property="content",jdbcType=LONGVARCHAR)})
+ @Results(id="BookContentResult",value={@Result(column="id",property="id",jdbcType=BIGINT,id=true),@Result(column="index_id",property="indexId",jdbcType=BIGINT),@Result(column="content",property="content",jdbcType=VARCHAR)})
 java.util.List<BookContent> selectMany(org.mybatis.dynamic.sql.select.render.SelectStatementProvider selectStatement)
diff --git a/doc/java-doc/com/java2nb/novel/news/mapper/NewsMapper.html b/doc/java-doc/com/java2nb/novel/news/mapper/NewsMapper.html index dc18a70..6a37eb1 100644 --- a/doc/java-doc/com/java2nb/novel/news/mapper/NewsMapper.html +++ b/doc/java-doc/com/java2nb/novel/news/mapper/NewsMapper.html @@ -266,7 +266,7 @@ int insert(org.mybatis.dynamic.sql.insert.render.InsertStatementProvider< 
@Generated(value="org.mybatis.generator.api.MyBatisGenerator")
  @SelectProvider(type=org.mybatis.dynamic.sql.util.SqlProviderAdapter.class,
                 method="select")
- @Results(id="NewsResult",value={@Result(column="id",property="id",jdbcType=BIGINT,id=true),@Result(column="cat_id",property="catId",jdbcType=INTEGER),@Result(column="cat_name",property="catName",jdbcType=VARCHAR),@Result(column="source_name",property="sourceName",jdbcType=VARCHAR),@Result(column="title",property="title",jdbcType=VARCHAR),@Result(column="create_time",property="createTime",jdbcType=TIMESTAMP),@Result(column="create_user_id",property="createUserId",jdbcType=BIGINT),@Result(column="update_time",property="updateTime",jdbcType=TIMESTAMP),@Result(column="update_user_id",property="updateUserId",jdbcType=BIGINT),@Result(column="content",property="content",jdbcType=LONGVARCHAR)})
+ @Results(id="NewsResult",value={@Result(column="id",property="id",jdbcType=BIGINT,id=true),@Result(column="cat_id",property="catId",jdbcType=INTEGER),@Result(column="cat_name",property="catName",jdbcType=VARCHAR),@Result(column="source_name",property="sourceName",jdbcType=VARCHAR),@Result(column="title",property="title",jdbcType=VARCHAR),@Result(column="create_time",property="createTime",jdbcType=TIMESTAMP),@Result(column="create_user_id",property="createUserId",jdbcType=BIGINT),@Result(column="update_time",property="updateTime",jdbcType=TIMESTAMP),@Result(column="update_user_id",property="updateUserId",jdbcType=BIGINT),@Result(column="content",property="content",jdbcType=VARCHAR)})
 java.util.List<News> selectMany(org.mybatis.dynamic.sql.select.render.SelectStatementProvider selectStatement)
diff --git a/doc/sql/20200603.sql b/doc/sql/20200603.sql new file mode 100644 index 0000000..d831c07 --- /dev/null +++ b/doc/sql/20200603.sql @@ -0,0 +1,116 @@ +DROP TABLE IF EXISTS `book_content0`; +CREATE TABLE `book_content0` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1155 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content1 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content1`; +CREATE TABLE `book_content1` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=406 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content2 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content2`; +CREATE TABLE `book_content2` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1222 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content3 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content3`; +CREATE TABLE `book_content3` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=410 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content4 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content4`; +CREATE TABLE `book_content4` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1188 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content5 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content5`; +CREATE TABLE `book_content5` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content6 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content6`; +CREATE TABLE `book_content6` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1180 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content7 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content7`; +CREATE TABLE `book_content7` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=404 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content8 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content8`; +CREATE TABLE `book_content8` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1134 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; + +-- ---------------------------- +-- Table structure for book_content9 +-- ---------------------------- +DROP TABLE IF EXISTS `book_content9`; +CREATE TABLE `book_content9` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键', + `index_id` bigint(20) DEFAULT NULL COMMENT '目录ID', + `content` mediumtext COMMENT '小说章节内容', + PRIMARY KEY (`id`), + UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=415 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表'; \ No newline at end of file diff --git a/doc/yml/nacos_config_export_20200603004804.zip b/doc/yml/nacos_config_export_20200603084216.zip similarity index 61% rename from doc/yml/nacos_config_export_20200603004804.zip rename to doc/yml/nacos_config_export_20200603084216.zip index db4edce9316c4b71a2f3cd66a8975775427484dd..fb96036c20f2d2445d44815273da0cc821261cf0 100644 GIT binary patch delta 1403 zcmaE1)?v*P;LXe;!ob17!QkP#kw=G#$-{NC71Mb}AU&CzMZbP;Xl%Z;t4Qtl^%5s1 zc&*rdb8GDJSWTyeYgYt>F4^&P>#VsmZ%pn5!U4WvubHE>*Pt^Ng~lX zA!|JE8C_Fycx|HMxH{QR?BJtC@li##KYlsxd=o0Z^j69vHbJdr?~k>`PM@Q3s(#wq zzMD*$Nxhw^zb3UPltlEsofRC-5VN-~wUU?nu$YnE^@{FX?UU2Od5(8~Rh!nU_Dqu1 z!Q)QTMAH@1+mv$7OuJ;_FirCH^ixxduYO^?D$`}@!f@c^q>iken&s2i>^`aT?x;wM zg5uJ-yjq5VX=`MjwjGGsWqj3k@yi6S(gv-1?{)7(?*=V>^UHhbg0R(B)DA3J-D$wl zaq9VMxyVl&gLM-hg&dON@jo?BxNXO=th%K=wv(QTaJl~Y(ig|~eV(L%?!{Nk3#@*8 zJHMa*{c?Wx?|HoY_Oq|^blY*Q^Tx-yi|_q=_u|~e2fN=*ZXKEkq^CwN)^ zce&nOcefM@e&zq>c6WKRx<31Ed*6%&Gv{Ue_}%@FKmN-%{!a`$bml7w8f^71vr)e@ zb+xEMmQ9F_cdxx2!(-p2+YNHd`fl&In|3Sr6YrXx)s}yEa+ub?&OGaRsJ`H!ih8Hz z`dzUaO|HR`zw3AY6*)ft)vrep2KEx`(?y#<^A&c)u1fa1>!Hcme7MMMtLL@s)Y(^a zCVgzHa#b>0I&;m>k7^%-|6g@EX?kx)Ty}8w)6OW@v|X$m0)Bb+D_GQxO@ki&u}oNT zT@&!j8Jj`#t`+V{FeE$6ZrdL&Mr8NYT4$CAjw9hUP z+V*$%{BQjG2RUha4kF{x?pxczr^NXQ3sIn$y3EWLDU0rPd*RV!vP2r*gDkRohHspcA4+J0 z?BkP^VLHJ*Sw~VA#ES;djKHNp0?qzRts1R7@qG)@x5xW$5# z1*OzMTCAjGn2LobFOU+QoGT>^*0!o!F)0|RZ7NWk42rgF5uidXkhU{GZ5(1ip4cR5 jagczdv<#EK_+)QUX|VurR-lI&7maVEw za4y}>M_>B(_e zw@uji*MWbtJ{c{%d1vJ^MW&ycE9#Y(CoJ7@aqgtU6YoXuj1zyVcKWBtrd6NP-u}_O zRetK1r~Q16`&Nth9LwbqUKhg87;@ypsltisIm;{NZqt5Nw)^_+>d+JNwu-ML&*n6Z^4O4fni@$jm=98{zR_QVScF;RCgln z{mfk_{X92KH&%%-xEYvHe8I{iFn^O${-#aqHYEk0+P3yK z`v;S$ZVyR z1_pTsWN?XfG9QPcPJlNflL!MWnH>&zSvB`pJ5YlG&=<1E>KU%FPiB${redisson.version} + + + + + io.shardingsphere + sharding-jdbc-spring-boot-starter + ${sharding.jdbc.version} + + + + io.shardingsphere + sharding-jdbc-spring-namespace + ${sharding.jdbc.version} + + diff --git a/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java b/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java index d70367f..4bddcfc 100644 --- a/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java +++ b/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java @@ -25,7 +25,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-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java b/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java index 158de86..d232a86 100644 --- a/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java +++ b/novel-book/book-service/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java @@ -48,7 +48,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.yml b/novel-common/src/main/resources/application-common.yml index 53c62fd..5ea7cbb 100644 --- a/novel-common/src/main/resources/application-common.yml +++ b/novel-common/src/main/resources/application-common.yml @@ -14,6 +14,9 @@ mybatis: logging: config: classpath:logback-boot.xml +spring: + main: + allow-bean-definition-overriding: true feign: httpclient: diff --git a/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java b/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java index ac47840..a21bbbb 100644 --- a/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentDynamicSqlSupport.java +++ b/novel-gen/src/main/java/com/java2nb/novel/book/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-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java b/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java index 59dfd69..034c721 100644 --- a/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java +++ b/novel-gen/src/main/java/com/java2nb/novel/book/mapper/BookContentMapper.java @@ -54,7 +54,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-gen/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java b/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java index 02a40a4..cc6e8c4 100644 --- a/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java +++ b/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java @@ -60,7 +60,7 @@ public final class NewsDynamicSqlSupport { public final SqlColumn updateUserId = column("update_user_id", JDBCType.BIGINT); - public final SqlColumn content = column("content", JDBCType.LONGVARCHAR); + public final SqlColumn content = column("content", JDBCType.VARCHAR); public News() { super("news"); diff --git a/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java b/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java index 5df713c..2e7a65e 100644 --- a/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java +++ b/novel-gen/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java @@ -61,7 +61,7 @@ public interface NewsMapper { @Result(column="create_user_id", property="createUserId", jdbcType=JdbcType.BIGINT), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_user_id", property="updateUserId", 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-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java b/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java index 2314ff9..4b54e3e 100644 --- a/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java +++ b/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsDynamicSqlSupport.java @@ -61,7 +61,7 @@ public final class NewsDynamicSqlSupport { public final SqlColumn updateUserId = column("update_user_id", JDBCType.BIGINT); - public final SqlColumn content = column("content", JDBCType.LONGVARCHAR); + public final SqlColumn content = column("content", JDBCType.VARCHAR); public News() { super("news"); diff --git a/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java b/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java index 0446bf7..22eb5d4 100644 --- a/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java +++ b/novel-news/news-service/src/main/java/com/java2nb/novel/news/mapper/NewsMapper.java @@ -55,7 +55,7 @@ public interface NewsMapper { @Result(column="create_user_id", property="createUserId", jdbcType=JdbcType.BIGINT), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_user_id", property="updateUserId", jdbcType=JdbcType.BIGINT), - @Result(column="content", property="content", jdbcType=JdbcType.LONGVARCHAR) + @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR) }) List selectMany(SelectStatementProvider selectStatement);