提交代码

.idea/artifacts/nanhang_war_exploded.xml

@@ -65,7 +65,7 @@
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.4.2" />
           <element id="library" level="project" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" />
           <element id="library" level="project" name="Maven: org.aspectj:aspectjweaver:1.8.2" />
-          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.29" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.48" />
           <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.11" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib-ext-spring:1.0.2" />
           <element id="library" level="project" name="Maven: net.sf.json-lib:json-lib:jdk15:2.2.2" />

.idea/encodings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

.idea/libraries/Maven__mysql_mysql_connector_java_5_1_29.xml

@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: mysql:mysql-connector-java:5.1.29">
+  <library name="Maven: mysql:mysql-connector-java:5.1.48">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29.jar!/" />
+      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29-javadoc.jar!/" />
+      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.29/mysql-connector-java-5.1.29-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.m2/repository/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

nanhang.iml

@@ -92,7 +92,7 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.4.2" level="project" />
     <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.2" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.29" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.48" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.11" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">

pom.xml

@@ -23,7 +23,7 @@
 		<mybatis.version>3.3.1</mybatis.version>
 		<mapper.version>3.3.6</mapper.version>
 		<pagehelper.version>4.1.1</pagehelper.version>
-		<mysql.version>5.1.35</mysql.version>
+		<mysql.version>5.1.48</mysql.version>
 		<spring.version>4.1.2.RELEASE</spring.version>
 		<mybatis.spring.version>1.2.4</mybatis.spring.version>
 	</properties>

src/main/java/com/yc/education/controller/admin/AdminsSecondController.java

@@ -101,7 +101,7 @@ public class AdminsSecondController {
         String url = state.getInfo("url");
         admins.setNum01(0);admins.setNum02(0);admins.setNum03(0);admins.setNum04(0);admins.setNum05(0);admins.setNum06(0);//先去将所有的状态改为0
         if(url==null || url.equals("")){
-            admins.setHead("/nanhang/user/images/center/icon_tx.png");
+            admins.setHead("/nanhang/user/images/center/110.png");
         }else{
             admins.setHead(url);
         }

src/main/java/com/yc/education/controller/admin/UserController.java

@@ -164,7 +164,7 @@ public class UserController {
 
     @RequestMapping("submit_register.html")
     public String submitRegister(Users users){
-        users.setHead("/nanhang/user/images/center/icon_tx.png");
+        users.setHead("/nanhang/user/images/center/110.png");
         String pwd = Md5.MD5(users.getPassword());
         users.setPassword(pwd);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/java/com/yc/education/controller/admin/UserManagerController.java

@@ -47,9 +47,9 @@ public class UserManagerController {
     @RequestMapping(value = "/admin/delete_user.html",method = RequestMethod.POST)
     @ResponseBody
     public String deleteUser(Integer pid){
-        int num01 = downloadsService.deleteByUid(pid);
+        downloadsService.deleteByUid(pid);
         int num = usersService.delete(pid);//根据id,删除学员及所有下载记录
-        if(num>0&&num01>0){return "ok";}else{return "error";}
+        if(num>0){return "ok";}else{return "error";}
     }
 
 

src/main/java/com/yc/education/controller/user/NanhangController.java

@@ -45,6 +45,8 @@ public class NanhangController {
         modelAndView.addObject("news", news);
         List<Banners> banner_s = bannersService.findBannersByCid(0);//去查找轮播图,降序
         modelAndView.addObject("banner_s", banner_s);
+        System.err.println(banner_s);
+        System.out.println(banner_s);
         return modelAndView;
     }
     /*查询更多新闻*/

src/main/java/com/yc/education/model/Banners.java

@@ -109,4 +109,16 @@ public class Banners {
     public void setCid(Integer cid) {
         this.cid = cid;
     }
+
+    @Override
+    public String toString() {
+        return "Banners{" +
+                "id=" + id +
+                ", img='" + img + '\'' +
+                ", tid=" + tid +
+                ", cid=" + cid +
+                ", name='" + name + '\'' +
+                ", translation='" + translation + '\'' +
+                '}';
+    }
 }

src/main/resources/config.properties

@@ -1,18 +1,20 @@
 
 
 # \u6570\u636E\u5E93\u914D\u7F6E
+#jdbc.driverClass = com.mysql.jdbc.Driver
+#jdbc.url = jdbc:mysql://192.168.3.163:3306/nanhang?characterEncoding=gbk
+#jdbc.user = root
+#jdbc.password =root
+
+
+
+
 jdbc.driverClass = com.mysql.jdbc.Driver
-jdbc.url = jdbc:mysql://192.168.3.163:3306/nanhang?characterEncoding=gbk
+jdbc.url = jdbc:mysql://116.62.48.212:3306/nanhang?characterEncoding=UTF-8
 jdbc.user = root
-jdbc.password =root
-
+jdbc.password = yc-e.net
 
-#jdbc.driverClass = com.mysql.jdbc.Driver
-#jdbc.url = jdbc:mysql://139.224.3.193:3306/nanhang
-#jdbc.user = root
-#jdbc.password =Jzdsh63811727
 
-#c3p0
 jdbc.maxPoolSize=50
 jdbc.minPoolSize=10
 jdbc.maxStatements=100

src/main/resources/mapper/GoodbookMapper.xml

@@ -27,9 +27,6 @@
       <if test="1==1">
         and tid = #{tid}
       </if>
-      <if test="wid!=0">
-        and wid = #{wid}
-      </if>
       <if test="(title!=null and title!='')">
         and title like concat('%',#{title},'%')
       </if>

src/main/resources/mapper/OthersclassMapper.xml

@@ -25,9 +25,6 @@
       <if test="1==1">
         and tid = #{tid}
       </if>
-      <if test="wid!=0">
-        and wid = #{wid}
-      </if>
       <if test="(title!=null and title!='')">
         and title like concat('%',#{title},'%')
       </if>

src/main/resources/mapper/QuestionbankMapper.xml

@@ -39,9 +39,6 @@
       <if test="1==1">
         and tid = #{tid} and identity = 0
       </if>
-      <if test="wid!=0">
-        and wid = #{wid}
-      </if>
       <if test="(name!=null and name!='')">
         and qname like concat('%',#{name},'%')
       </if>

src/main/resources/mapper/ViodeclassMapper.xml

@@ -28,9 +28,6 @@
       <if test="1==1">
         and tid = #{tid}
       </if>
-      <if test="wid!=0">
-        and wid = #{wid}
-      </if>
       <if test="(title!=null and title!='')">
         and title like concat('%',#{title},'%')
       </if>

src/main/resources/mapper/WorklibraryMapper.xml

@@ -43,9 +43,6 @@
       <if test="1==1">
         and tid = #{tid}
       </if>
-      <if test="wid!=0">
-        and wid = #{wid}
-      </if>
       <if test="(title!=null and title!='')">
         and title like concat('%',#{title},'%')
       </if>

src/main/webapp/WEB-INF/jsp/admin/add_Work.jsp

@@ -142,7 +142,6 @@
 
 
     $("#fileToUpload").change(function(){
-        alert("jinlaie ")
         $.ajaxFileUpload({
             fileElementId : 'fileToUpload',
             url : 'uploadImage',
@@ -152,7 +151,6 @@
             success : function(message) {
                 $("#imgOne").val(message);
                 $("#showIpt").attr("src",message).show();
-                alert("成功了")
                 change01();
             },
             error : function(data) {

src/main/webapp/WEB-INF/jsp/admin/admins_list.jsp

@@ -69,7 +69,7 @@
                 <tr class="text-c">
                     <td>${p.id}</td>
                     <td>${p.name}</td>
-                    <td><img src="${p.head}" width="120" height="120"></td>
+                    <td><img src="${p.head}" width="40" height="40"></td>
                     <td>${p.zhiwei}</td>
                     <td>${p.loginname}</td>
                     <td>${p.password}</td>

src/main/webapp/WEB-INF/jsp/admin/list_Picture.jsp

@@ -54,7 +54,7 @@
                 <tr class="text-c">
                     <td>${p.id}</td>
                     <td>${p.name}</td>
-                    <td><img src="${p.img}" width="auto" height="120"></td>
+                    <td><img src="${p.img}" width="auto" height="40"></td>
                     <td>${p.cid}</td>
                     <td>${p.translation}</td>
                     <td class="f-14 td-manage">

src/main/webapp/WEB-INF/jsp/index01/book_detail.jsp

@@ -46,7 +46,7 @@
 
 
 <div class="mainbox" style="padding:20px 20px 20px 130px;position: relative;">
-    <span class="book_pic" style="top:20px;"><img src="${pageContext.request.contextPath}${good_Class.img}" alt="" /></span>
+    <span class="book_pic" style="top:20px;"><img src="${good_Class.img}" alt="" /></span>
     <p class="book_tit">${good_Class.title}</p>
     <p class="book_des">作者：${good_Class.name} </p>
     <p class="book_des">出版社: ${good_Class.press}</p>

src/main/webapp/WEB-INF/jsp/index01/goodBook.jsp

@@ -47,7 +47,7 @@
             </div>
             <div class="search">
                 <form action="pageAll_Book.html?pdfid=${userId}" method="post">
-                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入题目内容" />
+                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入搜索内容" />
                     <input type="submit" value="确定" class="search_btn">
                 </form>
             </div>

src/main/webapp/WEB-INF/jsp/index01/item.jsp

@@ -34,7 +34,7 @@
     </div>
 </div>
 
-<div class="nr_pd">
+<div class="nr_pd clearfix">
     <div class="mainbox">
         <div class="course_top clearfix">
             <div class="tit clearfix">
@@ -43,7 +43,7 @@
             </div>
             <div class="search">
                 <form action="item.html?pdfid=${userId}" method="post" enctype="multipart/form-data" id="selitem">
-                <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入题目内容" />
+                <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入搜索内容" />
                     <input type="submit" value="确定" class="search_btn">
                 </form>
             </div>

src/main/webapp/WEB-INF/jsp/index01/othersClass.jsp

@@ -47,7 +47,7 @@
 
             <div class="search">
                 <form action="pageAll_Other.html?pdfid=${userId}" method="post">
-                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入题目内容" />
+                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入搜索内容" />
                     <input type="submit" value="确定" class="search_btn">
                 </form>
             </div>

src/main/webapp/WEB-INF/jsp/index01/resources.jsp

@@ -47,7 +47,7 @@
 
             <div class="search">
                 <form action="pageAll_Video.html?pdfid=${userId}" method="post">
-                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入题目内容" />
+                    <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入搜索内容" />
                     <input type="submit" value="确定" class="search_btn">
                 </form>
             </div>

src/main/webapp/WEB-INF/jsp/index01/video_detail.jsp

@@ -47,16 +47,17 @@
 <div class="mainbox course_about clearfix">
     <div class="course_left">
         <div class="tit clearfix">
-            <h1>${video_Class.title}</h1>
-           <%-- <span>Course introduction</span>--%>
+            <h1><c:if test="${userId==1}">数字空间虚拟设计</c:if><c:if test="${userId==2}">数字影像设计</c:if><c:if test="${userId==3}">数字艺术交互设计</c:if>
+                <c:if test="${userId==4}">信息视觉设计</c:if><c:if test="${userId==5}">用户体验设计</c:if><c:if test="${userId==6}">虚拟现实设计</c:if></h1>
+            <span>Course introduction</span>
         </div>
 
 
         <div class="video_con">
             <video width="100%" height="100%" id="player2" controls="controls" style="width:100%; height:100%;" >
-                <source type="video/mp4" src="${pageContext.request.contextPath}${video_Class.viodes}" />
-                <source type="video/webm" src="${pageContext.request.contextPath}${video_Class.viodes}" />
-                <source type="video/ogg" src="${pageContext.request.contextPath}${video_Class.viodes}" />
+                <source type="video/mp4" src="${video_Class.viodes}" />
+                <source type="video/webm" src="${video_Class.viodes}" />
+                <source type="video/ogg" src="${video_Class.viodes}" />
                 <object width="100%" height="100%" type="application/x-shockwave-flash" data="${pageContext.request.contextPath}/user/build/flashmediaelement.swf">
                     <param name="wmode" value="transparent">
                     <param name="movie" value="build/flashmediaelement.swf" />
@@ -73,17 +74,17 @@
         <div class="video_text clearfix">
             <p class="video_text_tit">${video_Class.title}</p>
             <div class="video_tx">
-                <span class="video_txpic"><img src="${admin_s.head}" alt="" /></span>
+                <span class="video_txpic"><img src="${video_Class.thead}" alt="" /></span>
                 <div class="video_txcon">
-                    <p class="video_txname">${admin_s.name}</p>
-                    <p class="video_txdes">${admin_s.zhiwei}</p>
+                    <p class="video_txname">${video_Class.teachers}</p>
+                    <p class="video_txdes">${video_Class.works}</p>
                 </div>
             </div>
-            <div class="video_text_time">上传时间：${fn:substring(admin_s.time,0,10 )}</div>
+            <div class="video_text_time">上传时间：${fn:substring(video_Class.time,0,10 )}</div>
         </div>
 
         <div class="course_con edit">
-            <p class="course_contit">课程大纲</p>
+            <p class="course_contit">课程介绍</p>
             <span>${video_Class.contexts}</span>
 
 

src/main/webapp/WEB-INF/jsp/index01/zp_all.jsp

@@ -50,7 +50,7 @@
             </div>
            <div class="search">
                <form action="zp_all.html?pdfid=${userId}" method="post">
-                   <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入题目内容" />
+                   <input class="input_text" type="text" name="titleName" value="${titleName}" placeholder="请输入搜索内容" />
                    <input type="submit" value="确定" class="search_btn">
                </form>
             </div>

src/main/webapp/WEB-INF/jsp/index01/zpall_detail.jsp

@@ -47,12 +47,12 @@
 
 <div class="mainbox course_about clearfix">
     <div class="course_left">
-        <div class="tit clearfix">
+        <div class="tit clearfix" style="background:none">
             <h1>${workibraryById.title}</h1>
         </div>
         
 
-        <div class="video_text clearfix">
+        <div class="video_text clearfix" >
             <div class="video_text_time">上传时间：${fn:substring(workibraryById.time,0,10 )}</div>
         </div>
 

src/main/webapp/WEB-INF/jsp/user/index.jsp

@@ -1,8 +1,7 @@
-<%@ 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" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta name="renderer" content="webkit"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@@ -21,6 +20,7 @@
     <script src="${pageContext.request.contextPath}/user/js/jquery.min.js" type="text/javascript"></script>
     <script src="${pageContext.request.contextPath}/user/js/swiper.min.js" type="text/javascript"></script>
     <script src="${pageContext.request.contextPath}/user/js/js.js" type="text/javascript"></script>
+    <script src="${pageContext.request.contextPath}/static/admin/index/wdatepicker/lang/zh-cn.js" type="text/javascript"></script>
 </head>
 
 <body>

src/main/webapp/WEB-INF/web.xml

@@ -52,6 +52,8 @@
     <filter-name>SpringEncodingFilter</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
+
+
   <welcome-file-list>
     <welcome-file>/index.html</welcome-file>
   </welcome-file-list>

src/main/webapp/user/css/baseindex.css

@@ -68,7 +68,7 @@ select:focus,select:hover,select:active {outline:none;-webkit-tap-highlight-colo
 
 .navfixed{ height:70px; position:fixed;left:0; top:0;background:rgba(255,255,255,1); z-index:222;}
 .navfixed li .nav-href{line-height:66px;}
-.navfixed .logo{width:200px; padding-top:8px;}
+.navfixed .logo{width:180px; padding-top:0;}
 .navfixed .top_login{padding-top:23px;}
 /* 头部结束 */