finish merge

WebContent/public/css/message.css

@@ -1,11 +1,14 @@
 			body{
-				background: rgba(0,0,0,0.9);
+				background: rgba(0,0,0,1);
 				color: #DDD;
 				font-family: 'Helvetica', 'Lucida Grande', 'Arial', sans-serif;
 			}
-			.border,
+			.border{
+				height: 99%;
+				width: 30%;
+			}
 			.rain{
-				height: 500px;
+				height: 550px;
 				width: 30%;
 			}
 			/* Layout with mask */

WebContent/reader/13message.jsp

@@ -29,8 +29,10 @@
 					<textarea id="mes"  placeholder="请输入您的留言"></textarea>
 					<label for="date">日期</label>
 					<input id="date" type="text" placeholder="请输入时间"/><br>&emsp;&emsp;&emsp;
-                    <button type="submit" class="btn btn-warning">提交</button>&emsp;&emsp;&emsp;
+                    <div align="center">
-                    <button type="reset" class="btn btn-danger">重置</button>
+                    <button type="submit" class="btn btn-warning" style="margin-left:0">提交</button>&emsp;&emsp;&emsp;
+                    <button type="reset" class="btn btn-danger" style="margin-right:0">重置</button>
+					</div>
 				</form>
 			</div>
 		</div>

src/javabean/Base.java

@@ -6,10 +6,9 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-
 public class Base {
 
-	private static String driver = "com.mysql.jdbc.Driver";
+	private static String driver = "com.mysql.cj.jdbc.Driver";
 	private static String url = "jdbc:mysql://localhost:3306/library?&useSSL=false&serverTimezone=UTC";
 	private static String username = "root";
 	private static String password = "root";

src/javabean/JDBCBean.java

@@ -6,7 +6,7 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 
 public class JDBCBean {
-	private static String driver = "com.mysql.jdbc.Driver";
+	private static String driver = "com.mysql.cj.jdbc.Driver";
 	private static String url = "jdbc:mysql://localhost:3306/library?&useSSL=false&serverTimezone=UTC";
 	private static String username = "root";
 	private static String password = "root";