From 3facf6cc218f66875448cb2517392f9d8a76c507 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Mon, 11 Nov 2019 18:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0emoji=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/books.sql                                 | 30 +++++++++----------
 src/main/resources/application.yml            |  5 ++--
 .../templates/books/book_content.html         |  4 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/sql/books.sql b/sql/books.sql
index 94d912e..ba4dbbd 100644
--- a/sql/books.sql
+++ b/sql/books.sql
@@ -1,16 +1,16 @@
 /*
 Navicat MySQL Data Transfer
 
-Source Server         : 148.70.59.92
-Source Server Version : 80013
-Source Host           : 148.70.59.92:3306
+Source Server         : 蜂鸟服务器
+Source Server Version : 80017
+Source Host           : 120.79.187.46:3306
 Source Database       : books
 
 Target Server Type    : MYSQL
-Target Server Version : 80013
+Target Server Version : 80017
 File Encoding         : 65001
 
-Date: 2019-10-23 17:43:04
+Date: 2019-11-11 17:43:17
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -31,10 +31,10 @@ CREATE TABLE `book` (
   `visit_count` bigint(20) DEFAULT '103',
   `update_time` datetime NOT NULL,
   `soft_cat` int(10) DEFAULT '0',
-  `soft_tag` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
+  `soft_tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '',
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_uniq_name_author` (`book_name`,`author`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=6117 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=6320 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for book_content
@@ -45,10 +45,10 @@ CREATE TABLE `book_content` (
   `book_id` bigint(20) NOT NULL,
   `index_id` bigint(20) DEFAULT NULL,
   `index_num` int(5) NOT NULL,
-  `content` mediumtext CHARACTER SET utf8 COLLATE utf8_general_ci,
+  `content` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci,
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_bookid_indexnum` (`book_id`,`index_num`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3148778 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3158081 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for book_index
@@ -58,10 +58,10 @@ CREATE TABLE `book_index` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `book_id` bigint(20) NOT NULL,
   `index_num` int(5) NOT NULL,
-  `index_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `index_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `unq_bookid_indexNum` (`book_id`,`index_num`)
-) ENGINE=InnoDB AUTO_INCREMENT=3563133 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=3572436 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for category
@@ -74,7 +74,7 @@ CREATE TABLE `category` (
   `get_url` varchar(100) DEFAULT NULL,
   `req_url` varchar(100) DEFAULT '本站请求的URL',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for screen_bullet
@@ -87,7 +87,7 @@ CREATE TABLE `screen_bullet` (
   `create_time` datetime NOT NULL,
   PRIMARY KEY (`id`),
   KEY `key_content_id` (`content_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for user
@@ -98,7 +98,7 @@ CREATE TABLE `user` (
   `login_name` varchar(50) NOT NULL,
   `password` varchar(100) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
 -- Table structure for user_ref_book
@@ -109,4 +109,4 @@ CREATE TABLE `user_ref_book` (
   `user_id` bigint(20) NOT NULL,
   `book_id` bigint(20) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4fce90e..e353c7e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -58,8 +58,9 @@ index:
     - {bookName: 我有一座恐怖屋,bookAuthor: 我会修空调}
 
 
-
-
+#mysql编码
+mysql:
+  charset: utf8mb4
 
 
 
diff --git a/src/main/resources/templates/books/book_content.html b/src/main/resources/templates/books/book_content.html
index 742f3ec..f94ab3b 100644
--- a/src/main/resources/templates/books/book_content.html
+++ b/src/main/resources/templates/books/book_content.html
@@ -157,7 +157,7 @@
             position: fixed;
             width: 100%;
             left: 0px;
-            bottom: 20px;
+            bottom: 110px;
             text-align: center;
         }
 
@@ -257,6 +257,8 @@
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(bp, s);
 
+        $("#chaptercontent").css("min-height",($(window).height()-260)+"px");
+
 
     })();