From df3f27d6cde6103972edd3f0af1eeb241f434a42 Mon Sep 17 00:00:00 2001
From: xicheny <771832800@qq.com>
Date: Wed, 3 Jun 2020 09:15:04 +0800
Subject: [PATCH] finish merge
---
WebContent/public/css/message.css | 9 ++++++---
WebContent/reader/13message.jsp | 6 ++++--
build/classes/filter/AdminFilter.class | Bin 1937 -> 1937 bytes
.../filter/CharacterEncodingFilter.class | Bin 1277 -> 1277 bytes
build/classes/filter/ManagerFilter.class | Bin 1056 -> 1056 bytes
build/classes/javabean/Admin.class | Bin 1524 -> 1524 bytes
build/classes/javabean/Base.class | Bin 2746 -> 2749 bytes
build/classes/javabean/Manager.class | Bin 264 -> 264 bytes
build/classes/servlet/ServletExample.class | Bin 1166 -> 1166 bytes
build/classes/servlet/admin/AdminLogin.class | Bin 3142 -> 3142 bytes
.../servlet/manager/ManagerLogin.class | Bin 1284 -> 1284 bytes
src/javabean/Base.java | 3 +--
src/javabean/JDBCBean.java | 2 +-
13 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/WebContent/public/css/message.css b/WebContent/public/css/message.css
index 177abaa..8e7cf30 100644
--- a/WebContent/public/css/message.css
+++ b/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 */
diff --git a/WebContent/reader/13message.jsp b/WebContent/reader/13message.jsp
index 7fbe88e..859d4c5 100644
--- a/WebContent/reader/13message.jsp
+++ b/WebContent/reader/13message.jsp
@@ -29,8 +29,10 @@
-
-
+
+
+
+
diff --git a/build/classes/filter/AdminFilter.class b/build/classes/filter/AdminFilter.class
index 59bddf6e3a35f142f8b244500a091628f4fb3465..fdfb5a8def9d78b6711d9c89d8bd459f114203fc 100644
GIT binary patch
delta 17
ZcmbQpKaro~)W2Q(7#J8#Hga^b0{}ay1_l5C
delta 17
ZcmbQpKaro~)W2Q(7#JALHga^b0{}a+1_%HE
diff --git a/build/classes/filter/CharacterEncodingFilter.class b/build/classes/filter/CharacterEncodingFilter.class
index 5da783cc5d395dfb298640f2d607e4e67dc33f02..34a7450a15c11d0ed3f0360605b3ae12abfdc771 100644
GIT binary patch
delta 17
Zcmey%`InR9)W2Q(7#J8#HgbGr0RTx!2Ri@&
delta 17
Zcmey%`InR9)W2Q(7#JALHgbGr0RTx;2R#4)
diff --git a/build/classes/filter/ManagerFilter.class b/build/classes/filter/ManagerFilter.class
index 2baefc97227eefea379973c6f2b2ef1d4a53409f..cc9c353c880cd95338ccfc2195507c5ba5e753e7 100644
GIT binary patch
delta 17
ZcmZ3$v4Df))W2Q(7#J8#HgZU?002AD1)=}|
delta 17
ZcmZ3$v4Df))W2Q(7#JALHgZU?002AN1*8A~
diff --git a/build/classes/javabean/Admin.class b/build/classes/javabean/Admin.class
index c9ce38f9f0d2feacfd2de4d4d2dd8bd5729e0441..c77617af15920bcd7a5eae455ead04ee8e17e8b7 100644
GIT binary patch
delta 17
Zcmeyu{e_$3)W2Q(7#J8#HgddS1pr7?2PFUi
delta 17
Zcmeyu{e_$3)W2Q(7#JALHgddS1pr812PXgk
diff --git a/build/classes/javabean/Base.class b/build/classes/javabean/Base.class
index 52eeab00a194dd4827386c9ecffe5dbea2e23455..1427c9a3c93c72d23a80d604fa0081eead36356d 100644
GIT binary patch
delta 226
zcmWNK%}N4c6o#KfKWD5lNXDEJDG(P5!)Q`L(WXUG=p88L2;$F>IT{E;;2p@
z=mpe`bQRLsoOkh@_jxz=);50jn;lSH8A~hUzXfhE58p?wKUjYim32srBNA8~lhnVe
za$xGc>f5J8a4*3cqrhfM3^$yl6k7ssHvj9k2i!q3T+8(b0wLhONE{?
zjQ`G)tUjaBmx~v14u~)$#;X`cViR{qH^>5cc1_lO`g&d3kGH?Yu
delta 16
XcmeBR>R{qH^>5cc1_lPRg&d3kGI#|&
diff --git a/build/classes/servlet/ServletExample.class b/build/classes/servlet/ServletExample.class
index d6e5426a36742074f813c2316336d97623f11b62..d310a8dd17c2d57e662a10ef2fded422cb58019d 100644
GIT binary patch
delta 17
YcmeC5cc1_lO`jT~((06L2W?f?J)
delta 17
YcmeC5cc1_lPRjT~((06LWg@Bjb+
diff --git a/build/classes/servlet/admin/AdminLogin.class b/build/classes/servlet/admin/AdminLogin.class
index 6f05b03ac215a0c4dcf96c16c795e95e33d81500..d7d88591bae119e578bf18c86bc59791f6813ad3 100644
GIT binary patch
delta 17
ZcmX>maZG~a)W2Q(7#J8#HgeeU002V820Q=&
delta 17
ZcmX>maZG~a)W2Q(7#JALHgeeU002VI20j1)
diff --git a/build/classes/servlet/manager/ManagerLogin.class b/build/classes/servlet/manager/ManagerLogin.class
index 726e935f5c9cdaa6b9c958ebb15356ad919a63c2..dc05101aac0b3267be8044f1ddcaa8bdef1e5916 100644
GIT binary patch
delta 17
YcmZqSYT@EI^>5cc1_lO`jU0bi06J9$QUCw|
delta 17
YcmZqSYT@EI^>5cc1_lPRjU0bi06Jd=Q~&?~
diff --git a/src/javabean/Base.java b/src/javabean/Base.java
index 8bdf99f..3224087 100644
--- a/src/javabean/Base.java
+++ b/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";
diff --git a/src/javabean/JDBCBean.java b/src/javabean/JDBCBean.java
index 97ed768..c6c4031 100644
--- a/src/javabean/JDBCBean.java
+++ b/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";