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 1/3] 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 @@
-
-
+
J!t_VZBaejGNlWL?rUk +e`hLlEJ*$ZK56vRhBQ-u+956B1hk@pkx!(`y~!$^Nz-#dqGh~VXz#-hOhiWA z0~N~Z3AthFAY7_l3;LCLqj@ ^LNUuU~$4{o)63}fb3UEa_-7{f>E!dpW-1783Tr1I_!^Fqo`Yz^2NSEjg zZczEKl$T+=HWa+(1NVh0Zr#w%B6~Hp68-cuTac>b2Ow(ttiGMnb$3Yg*$_6@Y0wS$ zeF~7t9-|K#BZ_qA#n{$fE1%-c!pR$M)@xJyOmSn4jKl>kB}AGxJ0Jqu6_4WtFo)73 zh8Lf(Q5oJ(F-KUyWR2MEi+EK^$lsY$2_Kjp4tsik59nlkh;p(O#0Soxb}PGnP#^O| zgo @@U{Hem* z{;hw{IO=TP$K*NE-8JN`nJt#jcjjTnCq(;2rxg^J{=Chw(H@fV)=a-2yZTO)Vp9Or z4@i}!O}Ee*3a{mtoP?jotMWXM;~X25c|{*|K6qKFI<-5%8_W^%n_zO_8T^?TU-GgU z4%rL0WLpF^M9U?b5<+_-hxeJ>h`U)e4iqedAM>Xbaru!}oKtBqx3+V7$7DijtH{)y z?DCY%s&fG-v;Ci}gcqt^9{*jDmtXQ>uOqoUtE3hY6X-~4`WEEyUBfpYu;-537LqgX zV&Y$GXk OtpVllQ#(0D&9Lp!9u|(q;+^ z+ewyYE&2mB{*gp-!?M&CzwV5*UVwsYko9r_lm9D>$gtWzU~i9^0pSmc49buEL}7Ls z96#37-&B({+&k+zbL7s62qmI?3(R^sqApslrTL*}uV0j*rjt#RX3f&$(6bIlGx%wM zblZJui q2;)hJ&8889UiI1>tj^ zEg{WbT&jG~Z5vyxWEwq_7j9E|sR0Rk*2RhXzF$dY8w~#?|M}Aj7Js~}AD><8H;I}s zuO0_&pYo-|(fq>OBhOc|4QVDr;^yWloV!&x=8;^_S8L8 D4l+!kDc+2QBR_bW~1pUY?-zJF$8+Fk^9TSmPo`$-)#J%*c0Ez!-X(S|YmV#C;j ztBgf5JuuXfB5*Q1Zv_kF56xf8K9uY|>l^ 638-cIuW4TwfJW!kIhX zhDO;(<^2-5;yZ#)(Bw($e3e~Q)HyTp$CCyEb$j^DOW$fv0?{`0GnVj01=&mV<1ySv z7=8*2&jff@Q)u`NW4CjDce;vjOY3RE6Pf!Y5hCxDt2{iV&^<~vs)Q&YaZ8-c-Z0Rl z3$gz^FS<=&xMlZ*$HrBcZX`41cHT1_q6Hy4H<)#)p)dMF_E5>YHv%neU=s`B?uXix zr4$*!egcLezmb5n-tnUoYBEimQO8%AQb(4jWSt=*N2xD=^Zcf#UnLJtk238hc)Z^B zjUtx{|E}gEfgBrF3^k#~ZbOB;@qFyVYuQM**520Ik+p+c6Pz6t;3dWPA2l?pTvPnt zX3b-P%VF|EcrQ*_1D#9$VDziEjZGt+y3+O&r+^Q0n&XjI 4 z9U5Z7vgz$eS?5woX>VyxWi!b(yxAFBcK|x93Vt0T5CpAD#}~{dGndp2LyDfTOD?%b z-r0l7XB#vXv~z6MIqQv2%#{tR<>KN3 Ro*b9811%2lNI7Os#66u)~8yj(DsN8a*$ zDTYkWS~X1cMW&X$R6Mdk4y$UZ*2Mx3bG>8lGkB>)0h^@7E8$h=G5IzhzFPJSmt%^b zZOm0;d`5lPB!Vv&Of=3WmU&OJX`l=`v@={F4VgGf;N3p&Gc}4}u16lL%hv^P=So>C zQ&loob0)fZ! ske3t%0;v4<$S!(yCkZYdEJr%k9R|) z$*%ld4b&CbiM30i%5lBp?e3Bx=0T5}%NbzL#&;5uYA)$N<*Lp&(@eNZ->;%Kx|(4a z@d@G|tjh(Ti~h8SmCmEeV(q!NW)w0RSD$46hHV5*6^b89SAIzKTU^|LVzCXG$~FB} zT(;QjXQ<_u^L=t)
B%q#338bc6m~{WV8+%Ch@^l`dEf@TFeY0 zdNpzKkaNz;rIpF>hL}J$ FO zvx|Z91I?tV*y^HrJvIyG`{B-=!$Sd*A4_+B``=-$D59nPV1>~hHW}<4JW52%&GSnm zr)_Ifc=sus|4ed?soe}H^k+ZrIlT;1g>Y(os`Fqa^G`PNMD|$0C_tXwoc%M6NR}%} zd2M_6MJ`@p{~J@vXDp6jH=OWQvoJwwn28UoBKw$74BFL7>CoF%eMdcbX#p6Q1409w zu9qN3|1DjD9BO=3?&sAl8M0kK08!+}IoV|lpK9OZu^$Nu&Qs~qAEUzFtK=OSW5#Aq z?=`qykdrKQZg+_iemQ>X(!Wz188|DotC!FHe%*&1$F^h7eP7pg{>}^b;m|ZWx$_kt>70-m zE>u;7h4~&Sqgy)deoi?{-+kuT+$y$A6K)%;cJQHX=FucR(HX6~q(T=f`sm5Dr9RGc z_cPgSC8>a-YM>n*o&8>cs_37N5z}nV;NCP5c10zO4@!P0kh{S0=@>;x-bslXN~*?> z70xb5BH6Hy#D}iql4IZ&;~W=6illnD?oj7P7zzwM1bLc?Vz-6o?Q9rj&H08y7!7@C z$#}F?|D)uLz{IGSO_SyLG{w9m{1K*0%+TD|mbPtJgLRd0SvX@RVL1;bg` x4kX{VFrT`Ap@++>a#e sy(?)Q$4{;|F*eL<(i18KUEYZ5`dH&|+E?0=Sa-HoDtH-3=OsZb ztRn2L1ton5QB0a1wAX-cppc!$n!4$aA;iUhe3e%x9W9S+n&Je}y3Wm%=jwKOv%1KL z@>QHaadR98h7kM?MV7-up#@Q33E$ye!1Xz27twLx0Zga@fxR@({ak&2*%xJLrQYNj z+#DTI^_oCnjPK%oZtV^bzEsQ;D~iZuPH>7nHrK!(lSYIvirt`k#YSQrr?M1SDcQ+h zZOe@ACSxSapZuK&mVME2p03d|=9~Fx{{UBc@cE9xM6X)XwVuagO 4 ={{R0xAjB)QN$|N%;e!mGBYXcMmCiyhDHQ~tpY6A1oeY*s!0;ELEXe_5Z0VJSA z%Jt`HbKm^6C0>aHX2@>WZ0Q MP!P8!M3I3gCV3(DmL$A@;?~cauxRHhqs%fDfacNsaD(D0 zpMw^3xGJLY%OOhO_O{MAX5A+%cok 9Ss`Oj{F3W zta`gTid>oY=f8U2wO$E$itEdazdl4OuE`LX@NUJ4GVYCTr{*L=?&7mE9LAP&zc0X! ztx(5a)?Mo%NmwBGcWPJ8l|po>!GlDl)ARt*bFnVWsKgjjh$Symy~#q)V5Y7tdtsyy znWp!Y5nVSt!J9Ep3}0)*K+}`lQhb)hLl;AR>w#bU