Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts: # src/core/process/C_TeacherSearchStudent.java # web/jsFile/upload_action.js
6 years ago · c29dea0a04
parent 667a057e11
commit c29dea0a04
16 changed files with 133 additions and 35 deletions
--- a/src/filter/OnlineCheck.java
+++ b/src/filter/OnlineCheck.java
@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

-@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home.jsp")
+@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home/*")
 public class OnlineCheck implements Filter {
    public void destroy() {
    }
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@ -3,11 +3,18 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
         version="4.0">
-    <servlet>
+    <welcome-file-list>
+      <welcome-file>login.jsp</welcome-file>
+    </welcome-file-list>
+  <servlet>
        <servlet-name>Init</servlet-name>
        <servlet-class>init.Init</servlet-class>
        <load-on-startup>1</load-on-startup>
    </servlet>
+    <context-param>
+        <param-name>charset</param-name>
+        <param-value>UTF-8</param-value>
+   </context-param>
    <servlet-mapping>
        <servlet-name>Init</servlet-name>
        <url-pattern>/init</url-pattern>
--- a/web/cssFile/home.css
+++ b/web/cssFile/home.css
@ -104,23 +104,40 @@ ul{
 }
 .personal-opt{
  height: 100%;
-  width: 120px;
+  width: 160px;
  position: absolute;
  right: 0px;
 }

 .personal-opt .head-img{
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.31);
+  text-align: center;
+  border-radius: 5px;
+  color: #c6333e;
  float: left;
-  margin: 2px;
-  width: 45px;
-  height: 45px;
+  width: 80px;
+  height:35px;
+  line-height: 35px;
+  margin: 10px;
+  transition: 0.3s;
+  background-color: white;
+}
+.head-img:hover{
+  height: 37px;
+  cursor: pointer;
 }
 .opt .img{
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.31);
+  border-radius: 5px;
+  overflow: hidden;
  display: block;
  width: 35px;
  height: 35px;
  margin: 10px 10px 10px 10px;
 }
+.opt .img:hover{
+  height: 36px;
+}
 .opt-options div{
  width: 100%;
  height: 30px;
--- a/web/cssFile/images/opt.png
+++ b/web/cssFile/images/opt.png
--- a/web/cssFile/login-style.css
+++ b/web/cssFile/login-style.css
@ -1,21 +1,59 @@
 .img-bar{
+  margin: 55px 0 0 0 ;
  width: 100%;
  height: 600px;
  background: url("images/login-img2.jpg");
+  animation: slowShow 0.8s ease;
+}
+body{
+  overflow-x: hidden;
+}
+@keyframes showTop {
+  from{top: -55px}
+  to{top:0}
+}
+@keyframes addHeight {
+  from{height: 0}
+  to{height: 70px}
+}
+.call-us{
+  width:60px;
+  height: 70px;
+  color: #e64548;
+  font-size: 30px;
+  background-color: white;
+  font-weight: 600;
+  position: absolute;
+  top: 0px;
+  overflow: hidden;
+  text-align: center;
+  line-height: 70px;
+  right: 240px;
+  transition: 0.5s;
+  cursor: pointer;
+  border-radius: 0 0 5px 5px;
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.33);
+  animation: addHeight 0.3s ease;
+}
+.call-us:hover{
+  line-height: 80px;
+  height: 80px;
 }
 .top-bar{
+  position: fixed;
+  top: 0px;
  width: 100%;
  height: 55px;
  background-color: #c13139;
-  overflow: hidden;
  z-index: 2;
  box-shadow: 5px 0px 10px rgba(0,0,0,0.47);
+  animation:showTop 1s ease;
 }
 .top-center-bar{
  height: 100%;
  width: 900px;
  background-color: #c6333e;
-  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.42);
+  box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.31);
  margin: 0px auto;
 }
 .top-center-bar .logo{
@ -26,6 +64,19 @@
  font-weight: bolder;
  font-size: 20px;
 }
+@keyframes slowShow {
+  from{opacity: 0.1}
+  to{opacity: 1}
+}
+@keyframes rightFly {
+  from{right: -400px}
+  to{right: 150px}
+}
+@keyframes clickChange {
+  0%{width:100px}
+  50%{width: 120px}
+  100%{width: 100px}
+}
 .login-cont{
  box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.44);
  position: absolute;
@ -35,7 +86,9 @@
  height: 400px;
  top: 150px;
  right: 150px;
+  animation: rightFly 0.8s,slowShow 0.8s ease;
 }
+
 body{
  margin: 0;
 }
@ -82,6 +135,7 @@ body{
  top: 120px;
  right: 150px;
  box-shadow: 3px 3px 8px rgba(0, 0, 0, 0.44);
+  animation: rightFly 0.8s,slowShow 0.8s ease;
 }
 .register-cont .register-input-text{
  padding: 0px 0px 0px 20px;
@ -170,7 +224,7 @@ body{
  cursor: pointer;
  background-color: rgba(255, 255, 255, 0.66);
  color: #ffffff;
-  cursor: pointer;
+  animation: clickChange 0.5s ease;
 }
 .register-area .to-any:hover{
  background-color: rgba(255, 255, 255, 0.8);
@ -196,8 +250,22 @@ body{
 .main{
 }
 .bottom-bar{
-  background-color: #f7edda;
-  border: 1px solid rgba(0, 0, 0, 0.16);
-  height: 40px;
+  position: relative;
+  background-color: #323232;
+  height: 200px;
  width: 100%;
+}
+.big-logo{
+  line-height: 150px;
+  font-size: 50px;
+  color: #e7e7e7;
+  text-align: center;
+  width: 100%;
+  height: 160px;
+  border-bottom:1px solid #3f3f3f;
+}
+.bottom-bar p{
+  width: 100%;
+  text-align: center;
+  color: #7b7b7b;
 }
--- a/web/cssFile/personal.css
+++ b/web/cssFile/personal.css
@ -68,24 +68,23 @@ ul{
  border-radius: 5px;
 }
 .personal-msg-frame .personal-msg-part .part-name{
-  width: 80px;
+  width: 120px;
  text-align: right;
  line-height: 35px;
-  padding-left: 40px;
  color: rgba(0, 0, 0, 0.78);
  float: left;
  height: 100%;
  font-size: 20px;
 }
 .personal-msg-frame .personal-msg-part .part-cont{
-  width: 450px;
+  width: 400px;
  height: 100%;
  float: left;
  text-align: left;
  color: rgba(0, 0, 0, 0.74);
  line-height: 35px;
  font-size: 20px;
-  padding-left: 20px;
+  padding-left: 40px;
 }
 .updated .change-pw-frame{
  display: none;
--- a/web/home/download.jsp
+++ b/web/home/download.jsp
@ -5,7 +5,7 @@
  Time: 15:18
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
    <title>资料下载</title>
--- a/web/home/fillSbjMsg.jsp
+++ b/web/home/fillSbjMsg.jsp
@ -6,7 +6,7 @@
  Time: 15:53
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
    <title>填写选题信息</title>
--- a/web/home/fill_Information.jsp
+++ b/web/home/fill_Information.jsp
@ -9,7 +9,7 @@
  Time: 13:19
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" pageEncoding="UTF-8" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
--- a/web/home/get_time.jsp
+++ b/web/home/get_time.jsp
@ -5,7 +5,8 @@
  Time: 22:30
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" import="java.io.*,java.util.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" import="java.io.*,java.util.*"
+pageEncoding="UTF-8" %>
 <html>
 <head>
    <title>Title</title>
--- a/web/home/home.jsp
+++ b/web/home/home.jsp
@ -9,7 +9,7 @@
  Time: 20:32
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="utf-8" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <html>
 <head>
@ -47,7 +47,7 @@
            <div class="logo">GDMS</div>
            <div class="personal-opt">
                <div class="head-img">
-                    <img src="">
+                    <%=user.getName()%>
                </div>
                <div class="opt">
                    <img class="img" src="../cssFile/images/opt.png">
--- a/web/home/personal_setting.jsp
+++ b/web/home/personal_setting.jsp
@ -1,11 +1,11 @@
-<%--
+<%@ page import="core.user.User" %><%--
  Created by IntelliJ IDEA.
  User: lenovo
  Date: 2019/1/9
  Time: 23:33
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <link type="text/css" rel="stylesheet" href="../cssFile/personal.css">
 <script type="text/javascript" src="../jsFile/jquery-3.3.1.js"></script>
 <script type="text/javascript" src="../jsFile/personal.js"></script>
@ -14,8 +14,10 @@
    <title>个人信息</title>
 </head>
 <body>
+<%
+    User user=(User)session.getAttribute("user");
+%>
 <div class="updated">
-
    <div class="personal-set-frame">
        <div class="personal-choose">
            <ul class="nav-personal-choose">
@ -28,19 +30,19 @@
                <div class="info-text">个人信息</div>
            </div>
            <div class="personal-msg-part">
-                <div class="part-name">id</div><div class="part-cont">未知</div>
+                <div class="part-name">id:</div><div class="part-cont"><%=user.getId()%></div>
            </div>
            <div class="personal-msg-part">
-                <div class="part-name">姓名</div><div class="part-cont">未知</div>
+                <div class="part-name">姓名:</div><div class="part-cont"><%=user.getName()%></div>
            </div>
            <div class="personal-msg-part">
-                <div class="part-name">年级</div><div class="part-cont">未知</div>
+                <div class="part-name">年级:</div><div class="part-cont">2016</div>
            </div>
            <div class="personal-msg-part">
-                <div class="part-name">邮箱</div><div class="part-cont">未知</div>
+                <div class="part-name">邮箱:</div><div class="part-cont"><%=user.getE_mail_location()%></div>
            </div>
            <div class="personal-msg-part">
-                <div class="part-name">电话号码</div><div class="part-cont">未知</div>
+                <div class="part-name">电话号码:</div><div class="part-cont"><%=user.getPhone_number()%></div>
            </div>
        </div>
        <div class="personal-frame change-pw-frame">
--- a/web/home/result_list.jsp
+++ b/web/home/result_list.jsp
@ -5,7 +5,7 @@
  Time: 19:57
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" pageEncoding="UTF-8" %>

 <%
  String id=request.getParameter("id");
--- a/web/home/select.jsp
+++ b/web/home/select.jsp
@ -5,7 +5,7 @@
  Time: 11:13
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.Date" pageEncoding="UTF-8" %>
 <%@ page import="core.user.User" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.HashMap" %>
--- a/web/home/upload_file.jsp
+++ b/web/home/upload_file.jsp
@ -5,7 +5,7 @@
  Time: 10:21
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
    <title>上传文件</title>
--- a/web/login.jsp
+++ b/web/login.jsp
@ -5,7 +5,7 @@
  Time: 13:07
  To change this template use File | Settings | File Templates.
 --%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 <html>
 <head>
    <title>毕业设计管理系统</title>
@ -19,6 +19,7 @@
        <div class="top-center-bar">
            <div class="logo">GDMS</div>
        </div>
+        <div class="call-us">G</div>
    </div>
    <div class="img-bar">

@ -61,7 +62,10 @@
            <input class="register-submit-style" type="submit" value="注册">
        </form>
    </div>
-    <div class="bottom-bar"></div>
+    <div class="bottom-bar">
+        <div class="big-logo">GDMS</div>
+        <p>team bys</p>
+    </div>
 </div>
 </body>
 </html>