diff --git a/Server/ArtEducation0331/WebContent/jsp/css/index.css b/Server/ArtEducation0331/WebContent/jsp/css/index.css
index 9224041..dd14c45 100644
--- a/Server/ArtEducation0331/WebContent/jsp/css/index.css
+++ b/Server/ArtEducation0331/WebContent/jsp/css/index.css
@@ -5,15 +5,15 @@
   background-position: top;
   background-repeat: no-repeat;
   background-attachment: fixed;
-  background-size: 100%;
+  background-size: cover;
 }
 .qrcode {
-  /*width: 200px;*/
-  /*height: 100px;*/
+  padding: 10px 10px 0 10px;
   background-color: #fff;
   position: absolute;
   right: 20%;
   bottom: 30%;
+  border-radius: 4px;
 }
 .qrcode div {
   display: inline-block;
@@ -29,11 +29,14 @@
   display: block;
   margin-bottom:10px;
   text-align: center;
+  font-size: 16px;
+  font-weight: bold;
+  color: #000;
 }
 .qrcode:before{
   content: '扫描二维码下载App';
   position: absolute;
-  bottom: 140px;
+  bottom: 150px;
   font-size: 20px;
   font-weight: bold;
   color: white;
diff --git a/Server/ArtEducation0331/WebContent/jsp/css/school.css b/Server/ArtEducation0331/WebContent/jsp/css/school.css
index 8e7b341..1ae9cc7 100644
--- a/Server/ArtEducation0331/WebContent/jsp/css/school.css
+++ b/Server/ArtEducation0331/WebContent/jsp/css/school.css
@@ -1,3 +1,6 @@
+hr {
+  border-top: 1px solid #000;
+}
 button {
   width: 130px;
 }
@@ -20,8 +23,68 @@ img {
   height:100%;
   width:100%;
 }
-.tinfo td {
+.tinfo td,
+.tdbasic{
   font-size: 18px;
   line-height: 3em;
   padding: 5px;
-}
\ No newline at end of file
+}
+
+
+textarea {
+  width: 100%;
+}
+
+.radiobox div{
+  display: inline-block;
+  margin-left: 20px;
+}
+
+.tuli:before {
+  content: '图例:';
+}
+.tuli li {
+  text-decoration: none;
+  display: inline-block;
+  margin-left: 20px;
+  padding: 3px;
+}
+
+.smfailed {
+  background-color: #e26a88;
+}
+
+.smwaiting {
+  background-color: #f6c1d2;
+}
+
+.smunfilled {
+  background-color: #6dd0db;
+}
+
+.smfull {
+  background-color: #3fa6d3;
+}
+
+.smsuspended {
+  background-color: #e3bb44;
+}
+
+.smgoing {
+  background-color: #e3e2df;
+}
+
+
+.smonlinepaid {
+  background-color: #fbbeff;
+}
+.smonlineunpaid {
+  background-color: #F400FF;
+}
+.smdiscount {
+  background-color: #f98451;
+}
+.smundiscount {
+  background-color: #f74c24;
+}
+
diff --git a/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css b/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css
index 855c0d2..80fd866 100644
--- a/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css
+++ b/Server/ArtEducation0331/WebContent/jsp/css/sidenav.css
@@ -30,7 +30,8 @@
 }
 .sidebar a:hover,
 .sidebar a:focus,
-.sidebar a:active
+.sidebar a:active,
+.sidebar .active
 {
   text-decoration: none;
   background-color: #00b976;
diff --git a/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css b/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css
index 979ca54..46c1b05 100644
--- a/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css
+++ b/Server/ArtEducation0331/WebContent/jsp/css/signup-style.css
@@ -3,6 +3,7 @@
 ============================================================================= */
 .page-title {
   height: 150px;
+  letter-spacing: 5px;
   text-align: center;
   line-height: 150px;
   font-size: 48px;
@@ -11,31 +12,17 @@
   text-shadow: -3px -3px 5px #264E7F;
 }
 /* numbered buttons */
-#status-buttons a{ 
-  width: 96px;
+.status-buttons {
+  width: 196px;
   height: 96px;
-  color:#333; 
-  display:inline-block; 
-  font-size:24px; 
-  margin-right:20px; 
+  color:#080808;
+  font-size:24px;
+  font-weight: bold;
+  margin:0 auto;
   text-align:center;
 }
-#status-buttons a:first-child {
-  margin-right: 40px;
-}
-#status-buttons a:nth-child(3) {
-  margin-right: 15px;
-}
-#status-buttons a:hover {
-  text-decoration: none;
-}
-#status-buttons a:active,
-#status-buttons a:focus {
-  text-decoration:none; 
-  color:#00BC8C;
-}
 
-#status-buttons span{
+.status-buttons span{
   color: #fff;
   background:#080808;
   text-align: center; 
@@ -46,13 +33,9 @@
   width:50px;
   border-radius:100%;
 }
-#status-buttons a.active {
-  color: #00BC8C;
-}
-#status-buttons a.active span{ 
-  background:#00BC8C; 
+.error {
+  color: red;
 }
-
 /* ANIMATION STYLINGS
 ============================================================================= */
 #signup-form            { position:relative; min-height:300px; overflow:hidden; padding:30px; }
diff --git a/Server/ArtEducation0331/WebContent/jsp/degreeConst.json b/Server/ArtEducation0331/WebContent/jsp/degreeConst.json
deleted file mode 100644
index 4e1ec1a..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/degreeConst.json
+++ /dev/null
@@ -1 +0,0 @@
-["专科","学士","硕士"]
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/fieldConst.json b/Server/ArtEducation0331/WebContent/jsp/fieldConst.json
deleted file mode 100644
index eb5c5ed..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/fieldConst.json
+++ /dev/null
@@ -1 +0,0 @@
-["钢琴","小提琴","吉他"]
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/img/ph.png b/Server/ArtEducation0331/WebContent/jsp/img/ph.png
new file mode 100644
index 0000000..78dbd68
Binary files /dev/null and b/Server/ArtEducation0331/WebContent/jsp/img/ph.png differ
diff --git a/Server/ArtEducation0331/WebContent/jsp/index.jsp b/Server/ArtEducation0331/WebContent/jsp/index.jsp
index 2222d87..08a5c93 100644
--- a/Server/ArtEducation0331/WebContent/jsp/index.jsp
+++ b/Server/ArtEducation0331/WebContent/jsp/index.jsp
@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
 <html >
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge">
@@ -13,7 +14,7 @@
   <body>
     <header class="container-fluid">
       <div class="row">
-        <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+        <div class="col-md-6"><a href="index.jsp"><img class="logo" src="" alt="website logo"></a>
           <p class="slogan">艺宝,您身边的艺术教师!</p>
         </div>
         <div class="col-md-6">
@@ -21,17 +22,24 @@
             <a href="signup/signup.html">教师入驻</a>
             <a href="#" class="ssin">教师登录</a>
             <a href="#" class="ssin">机构登录</a>
+           
+            <% if(session.getAttribute("resultCode")=="9001"){ %>
+                  <p>用户名或邮箱不存在</p>
+            <%session.removeAttribute("resultCode");}else if(session.getAttribute("resultCode")=="9002"){ %>
+                  <p>密码错误</p>
+            <%session.removeAttribute("resultCode");}else if(session.getAttribute("resultCode")=="9009"){ %>
+                 <p>其他原因导致登录失败</p>
+            <%session.removeAttribute("resultCode");} %>
+            
           </div>
           <div class="signin">
-            <form action="" method="post">
+            <form action="/ArtEducation/teacher/login.action" method="post">
               <table class="formtable">
-                <tr><td>邮箱：</td><td><input type="text" name="username" required></td></tr>
+                <tr><td>账户：</td><td><input type="text" name="username" required></td></tr>
                 <tr><td>密码：</td><td><input type="password" name="password" required></td></tr>
-                <tr><td>验证码：</td><td><input type="text" name="" required></td></tr>
-                <tr><td></td><td><a href=""><img src="" alt="验证码图片"></a></td></tr>
               </table>
               <div class="submit">
-                <input class="btn btn-default" type="submit" value="登录">
+                <button class="btn btn-primary" type="submit">登录</button>
                 <button type="button" class="btn btn-default" id="dismiss">关闭</button>
               </div>
             </form>
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/constSer.js b/Server/ArtEducation0331/WebContent/jsp/js/constSer.js
deleted file mode 100644
index 11a1c9c..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/js/constSer.js
+++ /dev/null
@@ -1,16 +0,0 @@
-angular.module('constSer',['ngResource'])
-  .factory('fieldConst',['$resource',function($resource) {
-    return $resource('../fieldConst.json', {}, {
-      query: {method: 'GET', isArray: true}
-    });
-  }])
-  .factory('degreeConst',['$resource',function($resource) {
-    return $resource('../degreeConst.json', {}, {
-      query: {method: 'GET', isArray: true}
-    });
-  }])
-  .factory('teAgeConst',['$resource',function($resource) {
-    return $resource('../teAgeConst.json', {}, {
-      query: {method: 'GET', isArray: true}
-    });
-  }]);
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js b/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js
index 4d09e3c..54410fd 100644
--- a/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js
+++ b/Server/ArtEducation0331/WebContent/jsp/js/signupApp.js
@@ -1,45 +1,53 @@
-angular.module('formSignup',['ngAnimate','ui.router','constSer'])
-.config(function($stateProvider,$urlRouterProvider) { 
-  $stateProvider
-    .state('signup',{
-      url:'/signup',
-      templateUrl:'signup-form.html',
-      controller:'formController'
-    })
-    .state('signup.basic',{
-      url:'/basic',
-      templateUrl:'signup-basic.html'
-    })
-    .state('signup.idinfo',{
-      url:'/idinfo',
-      templateUrl:'signup-id.html'
-    })
-    .state('signup.verification',{
-      url:'/verification',
-      templateUrl:'signup-veri.html'
-    });
-  $urlRouterProvider.otherwise('/signup/basic');
-})
-.controller('formController',function($scope,fieldConst,degreeConst,teAgeConst) {
-  $scope.formData = {
-    field:"钢琴",
-    sex:"male",
-    degree:"专科",
-    teachingAge:"0~1年"
-  };
-  
-  $scope.chkPwd = function () {
-    if ($scope.checkPwd === $scope.formData.pwd) {
-      return true;
-    } else {
-      return false;
-    }
-  };
-  
-  $scope.processForm = function() {
-    setTimeout("window.location='../index.html'",5000);
-  };
-  $scope.fieldOpts = fieldConst.query();
-  $scope.degreeOpts = degreeConst.query();
-  $scope.teAgeOpts = teAgeConst.query();
-});
\ No newline at end of file
+//angular.module('formSignup',['ngAnimate','ui.router','constSer'])
+//.config(function($stateProvider,$urlRouterProvider) {
+//  $stateProvider
+//    .state('signup',{
+//      url:'/signup',
+//      templateUrl:'signup-form.html',
+//      controller:'formController'
+//    })
+//    .state('signup.basic',{
+//      url:'/basic',
+//      templateUrl:'signup-basic.html'
+//    })
+//    .state('signup.idinfo',{
+//      url:'/idinfo',
+//      templateUrl:'signup-id.html'
+//    })
+//    .state('signup.verification',{
+//      url:'/verification',
+//      templateUrl:'signup-veri.html'
+//    });
+//  $urlRouterProvider.otherwise('/signup/basic');
+//})
+//.controller('formController',function($scope,$interval,fieldConst,degreeConst,teAgeConst) {
+//  $scope.formData = {
+//    field:"钢琴",
+//    sex:"male",
+//    degree:"专科",
+//    teachingAge:"0~1年"
+//  };
+//
+//  $scope.chkPwd = function () {
+//    if ($scope.checkPwd === $scope.formData.pwd) {
+//      return true;
+//    } else {
+//      return false;
+//    }
+//  };
+//
+//  $scope.timecount = 5;
+//
+//  $scope.processForm = function() {
+//    $interval(function () {
+//      $scope.timecount--
+//      console.log($scope.timecount)
+//      if($scope.timecount===0) {window.location='../index.html'}
+//    },1000,5,true)
+//
+//
+//  };
+//  $scope.fieldOpts = fieldConst.query();
+//  $scope.degreeOpts = degreeConst.query();
+//  $scope.teAgeOpts = teAgeConst.query();
+//});
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/smApp.js b/Server/ArtEducation0331/WebContent/jsp/js/smApp.js
index 703380f..b4b067e 100644
--- a/Server/ArtEducation0331/WebContent/jsp/js/smApp.js
+++ b/Server/ArtEducation0331/WebContent/jsp/js/smApp.js
@@ -1,4 +1,4 @@
-angular.module('smApp',['ngAnimate','ui.router','ui.date','constSer'])
+angular.module('smApp',['ngAnimate','ui.router','ui.date'])
   .config(function ($stateProvider,$urlRouterProvider) {
     $stateProvider
       .state('sm',{
@@ -32,7 +32,7 @@ angular.module('smApp',['ngAnimate','ui.router','ui.date','constSer'])
       });
     $urlRouterProvider.otherwise('/sm/teacherManager');
   })
-  .controller('smController',function ($scope,fieldConst,degreeConst,teAgeConst) {
+  .controller('smController',function ($scope) {
     $scope.profileInfo = {};
 
 
diff --git a/Server/ArtEducation0331/WebContent/jsp/js/tmApp.js b/Server/ArtEducation0331/WebContent/jsp/js/tmApp.js
index afb0a84..d468c24 100644
--- a/Server/ArtEducation0331/WebContent/jsp/js/tmApp.js
+++ b/Server/ArtEducation0331/WebContent/jsp/js/tmApp.js
@@ -1,4 +1,4 @@
-angular.module('tmApp',['ngAnimate','ui.router','ui.date','constSer'])
+angular.module('tmApp',['ngAnimate','ui.router','ui.date'])
 .config(function ($stateProvider,$urlRouterProvider) {
   $stateProvider
     .state('tm',{
@@ -28,21 +28,17 @@ angular.module('tmApp',['ngAnimate','ui.router','ui.date','constSer'])
     });
   $urlRouterProvider.otherwise('/tm/profile');
 })
-.controller('tmController',function ($scope,fieldConst,degreeConst,teAgeConst) {
+.controller('tmController',function ($scope) {
   $scope.profileInfo = {};
 
 
 
-  $scope.fieldOpts = fieldConst.query();
-  $scope.degreeOpts = degreeConst.query();
-  $scope.teAgeOpts = teAgeConst.query();
-
   $scope.profileSubmit = function () {
-    
+
   };
   $scope.idSubmit = function () {
 
   };
 
   $scope.idInfo = {};
-});
\ No newline at end of file
+});
diff --git a/Server/ArtEducation0331/WebContent/jsp/school/classManager.html b/Server/ArtEducation0331/WebContent/jsp/school/classManager.html
index eaf5199..e07cc6d 100644
--- a/Server/ArtEducation0331/WebContent/jsp/school/classManager.html
+++ b/Server/ArtEducation0331/WebContent/jsp/school/classManager.html
@@ -1 +1,5 @@
-<h1>classManager</h1>
\ No newline at end of file
+<div class="row">
+  <div class="col-md-4">
+    <button class="btn btn-primary" ui-serf="sm.classDetail">增加</button>
+  </div>
+</div>
diff --git a/Server/ArtEducation0331/WebContent/jsp/school/studentDetail.html b/Server/ArtEducation0331/WebContent/jsp/school/studentDetail.html
new file mode 100644
index 0000000..5cc48da
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/school/studentDetail.html
@@ -0,0 +1,61 @@
+<div class="row">
+  <div class="col-md-12">
+    <h1>学生详情</h1>
+    <h3 style="color: #000;">个人信息</h3>
+    <table class="tinfo">
+      <tr>
+        <td>学号</td>
+        <td>123</td>
+      </tr>
+      <tr>
+        <td>姓名</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>联系方式</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>性别</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>年龄</td>
+        <td></td>
+      </tr>
+      <tr>
+        <td>课程偏好</td>
+        <td></td>
+      </tr>
+    </table>
+    <h3 style="margin-top: 30px;color: #000;">课程信息</h3>
+    <table class="table table-bordered">
+      <thead style="background-color: #f98451;color: #000;">
+      <tr>
+        <td>编号</td>
+        <td>课程名称</td>
+        <td>教师</td>
+        <td>上课时间</td>
+        <td>上课地点</td>
+        <td>课程状态</td>
+        <td>缴费状态</td>
+        <td>评分</td>
+        <td>评价</td>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/Server/ArtEducation0331/WebContent/jsp/school/studentManager.html b/Server/ArtEducation0331/WebContent/jsp/school/studentManager.html
index bf23cce..a36a8d5 100644
--- a/Server/ArtEducation0331/WebContent/jsp/school/studentManager.html
+++ b/Server/ArtEducation0331/WebContent/jsp/school/studentManager.html
@@ -1 +1,45 @@
-<h1>studentManager</h1>
\ No newline at end of file
+<div class="row" style="margin-top: 30px;">
+  <div class="col-md-12">
+    <table class="table table-bordered">
+      <thead>
+      <tr>
+        <th>姓名</th>
+        <th>学号</th>
+        <th>联系方式</th>
+        <th>偏好</th>
+        <th>缴费状态</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr class="smonlinepaid">
+        <td><a href="" ui-sref="sm.studentDetail">学生详情</a></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>线上已付款</td>
+      </tr>
+      <tr class="smonlineunpaid">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>线上未付款</td>
+      </tr>
+      <tr class="smdiscount">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>优惠券已使用</td>
+      </tr>
+      <tr class="smundiscount">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>优惠券未使用</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/school/teacherDetail.html b/Server/ArtEducation0331/WebContent/jsp/school/teacherDetail.html
index 8bdbf60..053c9a9 100644
--- a/Server/ArtEducation0331/WebContent/jsp/school/teacherDetail.html
+++ b/Server/ArtEducation0331/WebContent/jsp/school/teacherDetail.html
@@ -7,6 +7,7 @@ <h1>教师简介</h1>
       <tr>
         <td>教师编号</td>
         <td>123</td>
+        <!--<td ngIf></td>-->
       </tr>
       <tr>
         <td>姓名</td>
@@ -29,4 +30,104 @@ <h1>教师简介</h1>
   <div class="col-md-6">
     <img src="../img/160301111147.jpg" alt="教师头像">
   </div>
-</div>
\ No newline at end of file
+</div>
+<div class="row">
+  <div class="col-md-12">
+    <hr>
+    <p class="tdbasic">履历</p>
+    <p>2010年XXX2011年XXXX2013年XXXXX</p>
+    <!--<textarea name="" id="" rows="10" ngModel=""></textarea>-->
+    <hr>
+    <p class="tdbasic">状态</p>
+    <div class="radiobox">
+      <div><input type="radio" name="timetype" value="全职" ng-model="te.timetype">全职</div>
+      <div><input type="radio" name="timetype" value="兼职" ng-model="te.timetype">兼职</div>
+    </div>
+    <hr>
+    <p class="tdbasic">课程列表</p>
+    <ul class="tuli">
+      <li class="smfailed">审核未通过</li>
+      <li class="smwaiting">待审核</li>
+      <li class="smunfilled">未招满</li>
+      <li class="smfull">已招满</li>
+      <li class="smsuspended">已停课</li>
+      <li class="smgoing">正在上课</li>
+    </ul>
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>课程编号</th>
+          <th>课程名</th>
+          <th>课程类型</th>
+          <th>上课时间</th>
+          <th>上课地点</th>
+          <th>实际招生/计划招生</th>
+          <th>状态</th>
+          <th>操作</th>
+        </tr>
+      </thead>
+      <tbody>
+      <tr class="smfailed">
+        <td>1001</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><a href="" ui-serf="">修改课程信息</a></td>
+      </tr>
+      <tr class="smwaiting">
+        <td>1002</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr class="smunfilled">
+        <td>1003</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><a href="" ui-serf="">修改课程信息</a>/<a onclick="">停课</a></td>
+      </tr>
+      <tr class="smfull">
+        <td>1004</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr class="smsuspended">
+        <td>1005</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+      <tr class="smgoing">
+        <td>1006</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><a href="" ui-serf="">修改课程信息</a>/<a onclick="">停课</a></td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/Server/ArtEducation0331/WebContent/jsp/school/teacherManager.html b/Server/ArtEducation0331/WebContent/jsp/school/teacherManager.html
index 5803e77..37e7a69 100644
--- a/Server/ArtEducation0331/WebContent/jsp/school/teacherManager.html
+++ b/Server/ArtEducation0331/WebContent/jsp/school/teacherManager.html
@@ -1,6 +1,6 @@
 <div class="row" style="margin: 30px 0;">
   <div class="col-md-3">
-    <button class="btn btn-info text-center">添加</button>
+    <button class="btn btn-info text-center" ui-sref="sm.teacherDetail">添加</button>
   </div>
   <div class="col-md-3 col-md-offset-6">
     <button class="btn btn-danger text-center">批量删除</button>
diff --git a/Server/ArtEducation0331/WebContent/jsp/signup/signup-basic.html b/Server/ArtEducation0331/WebContent/jsp/signup/signup-basic.html
deleted file mode 100644
index 998cd95..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/signup/signup-basic.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="form-group">
-    <label for="email">邮箱</label>
-    <input type="email" class="form-control" name="email" ng-model="formData.email" required>
-</div>
-<div class="form-group">
-    <label for="pwd">密码</label>
-    <input type="password" class="form-control" name="pwd" ng-model="formData.pwd" required>
-</div>
-<div class="form-group">
-    <label for="pwd">密码确认</label>
-    <input type="password" class="form-control" name="pwd" ng-model="checkPwd" required>
-</div>
-<div class="form-group">
-    <label for="name">真实姓名</label>
-    <input type="text" class="form-control" name="name" ng-model="formData.name" required>
-</div>
-<div class="form-group">
-    <label>性别</label>
-    <span style="padding-left: 15px;">
-      <input type="radio" ng-model="formData.sex" value="male">男
-      <input type="radio" ng-model="formData.sex" value="female">女
-    </span>
-</div>
-<div class="form-group">
-  <label for="field">教学内容</label>
-  <select name="field" ng-model="formData.field" style="width:100px;margin-left:15px;">
-    <option value="{{f}}" ng-repeat="f in fieldOpts">{{f}}</option>
-  </select>
-</div> 
-<div class="form-group">
-  <label for="degree">最高学历</label>
-  <select name="degree" ng-model="formData.degree" style="width:100px;margin-left:15px;">
-    <option value="{{d}}" ng-repeat="d in degreeOpts">{{d}}</option>
-  </select>
-</div>
-<div class="form-group">
-  <label for="teAge">教龄</label>
-  <select name="teAge" ng-model="formData.teachingAge" style="width:100px;margin-left:43px;">
-    <option value="{{t}}" ng-repeat="t in teAgeOpts">{{t}}</option>
-  </select>
-</div> 
-
-<div class="form-group row">
-<div class="col-md-4 col-md-offset-4">
-    <a ui-sref="signup.idinfo" class="btn btn-block btn-info">
-    下一步<span class="glyphicon glyphicon-circle-arrow-right" style="margin-left:10px;"></span>
-    </a>
-</div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/signup/signup-form.html b/Server/ArtEducation0331/WebContent/jsp/signup/signup-form.html
deleted file mode 100644
index 3c0f632..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/signup/signup-form.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="row">
-  <div class="col-md-8 col-md-offset-2">
-        <div class="page-header text-center">
-            <div id="status-buttons" class="text-center">
-                <a ui-sref-active="active" ui-sref=".basic" class="active"><span>1</span>基本信息</a>
-                <a ui-sref-active="active" ui-sref=".idinfo"><span>2</span>身份信息</a>
-                <a ui-sref-active="active" ui-sref=".verification"><span>3</span>审核</a>
-                <a id="none"><span>4</span>通过</a>
-            </div>
-        </div>
-        <form id="signup-form" ng-submit="">
-            <div id="form-views" ui-view></div>
-        </form>
- 
- 
-    <pre>
-        {{ formData }}
-    </pre>
- 
- 
-</div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/signup/signup-id.html b/Server/ArtEducation0331/WebContent/jsp/signup/signup-id.html
deleted file mode 100644
index fe146c9..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/signup/signup-id.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 class="text-center" style="margin-bottom:30px;">请提交您的身份证及学历证书清晰照片</h2>
-<div class="form-group">
-  <label>身份证号码</label>
-  <input type="text" class="form-control" ng-model="idInfo.idNum">
-</div>
-<div class="form-group">
-  <p>身份证正面照片</p>
-  <input type="file">
-  <br>
-  <p>身份证背面照片</p>
-  <input type="file">
-</div>
-<div class="form-group">
-  <label>本科/专科学位证书照片</label>
-  <input type="file">
-</div>
-<div class="form-group">
-  <label>硕士学位证书照片</label>
-  <input type="file">
-</div>
- 
-
-
-<div class="form-group row">
-<div class="col-xs-6 col-xs-offset-3 text-center">
-  <button type="submit" class="btn btn-danger" ui-sref="signup.verification" ng-click="processForm()">确认注册</button>
-</div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/signup/signup-veri.html b/Server/ArtEducation0331/WebContent/jsp/signup/signup-veri.html
deleted file mode 100644
index 0bb653f..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/signup/signup-veri.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="row">
-  <div class="col-md-6 col-md-offset-3">恭喜，信息录入成功，请耐心等待验证。
-我们将在两个工作日内跟你联系。
-  </div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/signup/signup.html b/Server/ArtEducation0331/WebContent/jsp/signup/signup.html
index ec05239..8bbad6c 100644
--- a/Server/ArtEducation0331/WebContent/jsp/signup/signup.html
+++ b/Server/ArtEducation0331/WebContent/jsp/signup/signup.html
@@ -11,22 +11,128 @@
   <body ng-app="formSignup">
     <header class="container-fluid">
       <div class="row page-title">
-        入 驻 流 程
+        教师入驻信息登记
       </div>
     </header>
-    <div class="container" style="height: 800px;">
-      <div ui-view></div>
+    <div class="container">
+      <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+          <form id="signup-form" action="/ArtEducation/teacher/registerTeacher.action" name="signup" method="post">
+            <div class="page-header text-center">
+              <div class="status-buttons"><span>1</span>基本信息</div>
+            </div>
+            <div class="form-group">
+              <label for="email">邮箱</label>
+              <input type="email" id="email" class="form-control" name="email" required>
+            </div>
+            <div class="form-group">
+              <label for="teacherName">用户名</label>
+              <input type="text" id="teacherName" class="form-control" name="teacherName" required>
+            </div>
+            <div class="form-group">
+              <label for="pwd">密码</label>
+              <input type="password" id="pwd" class="form-control" name="pwd" required>
+            </div>
+            <!--<div class="form-group">-->
+              <!--<label for="pwdchk">密码确认</label>-->
+              <!--<input type="password" id="pwdchk" class="form-control" required>-->
+            <!--</div>-->
+            <div class="form-group">
+              <label for="headPortraits">头像(参数没有)</label>
+              <input type="file" id="headPortraits" name="headPortraits" required>
+            </div>
+            <div class="form-group">
+              <label for="name">真实姓名</label>
+              <input type="text" id="name" class="form-control" name="realName" required>
+            </div>
+            <div class="form-group">
+              <span>性别</span>
+              <span style="padding-left: 15px;">
+                <input type="radio" name="gender" value="male"><label>女</label>
+                <input type="radio" name="gender" value="female"><label>男</label>
+              </span>
+            </div>
+            <div class="form-group">
+              <label for="teacherAge">年龄</label>
+              <input type="text" id="teacherAge" class="form-control" name="teacherAge" required>
+            </div>
+            <div class="form-group">
+              <label for="IDNumber">身份证号</label>
+              <input type="text" id="IDNumber" class="form-control" name="IDNumber" required>
+            </div>
+            <div class="form-group">
+              <label for="preference">教学内容</label>
+              <input type="text" id="preference" class="form-control" name="preference" required>
+            </div>
+            <div class="form-group">
+              <label for="education">最高学历</label>
+              <select name="education" id="education" style="width:100px;margin-left:15px;" required>
+                <option value="本科/专科" selected>本科/专科</option>
+                <option value="硕士">硕士</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label for="seniority">教龄</label>
+              <select name="seniority" id="seniority" style="width:100px;margin-left:43px;" required>
+                <option value="1" selected>1年</option>
+                <option value="2">2年</option>
+                <option value="3">3年</option>
+                <option value="4">4年</option>
+                <option value="5">5年</option>
+                <option value="6">6年</option>
+                <option value="7">7年</option>
+                <option value="8">7年以上</option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label for="phone">联系方式(手机/固话)</label>
+              <input type="text" id="phone" class="form-control" name="phone" required>
+            </div>
+            <div class="form-group">
+              <span>工作类型</span>
+              <span style="padding-left: 15px">
+                <input type="radio" name="teacherType" value="3001" required><label>兼职</label>
+                <input type="radio" name="teacherType" value="3002"><label>全职</label>
+              </span>
+            </div>
+            <div class="form-group">
+              <label for="description">自我介绍</label>
+              <textarea id="description" class="form-control" name="description" cols="30" rows="10" required></textarea>
+            </div>
+            <div class="page-header text-center">
+              <div class="status-buttons"><span>2</span>身份审核信息</div>
+            </div>
+            <div class="form-group">
+              <label for="idPic">身份证照片(要带身份证号的一面)</label>
+              <input type="file" id="idPic" name="idPic" required>
+            </div>
+            <div class="form-group">
+              <label for="diplomaPic">本科/专科毕业证照片</label>
+              <input type="file" id="diplomaPic" name="diplomaPic">
+            </div>
+            <div class="form-group">
+              <label for="masterDiplomaPic">硕士毕业证照片</label>
+              <input type="file" id="masterDiplomaPic" name="masterDiplomaPic">
+            </div>
+            <div class="form-group">
+              <div class="text-center">
+                <button type="submit" class="btn btn-danger">确认注册</button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
     </div>
     <footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
       <div class="row" style="color:#fff;">
         &copy底部信息
       </div>
     </footer>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>
-    <script src="../js/constSer.js"></script>
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+    <!--<script src="../js/constSer.js"></script>-->
     <script src="../js/signupApp.js"></script>
   </body>
 </html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/submitDiplomaInfo.jsp b/Server/ArtEducation0331/WebContent/jsp/submitDiplomaInfo.jsp
new file mode 100644
index 0000000..12ee066
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/submitDiplomaInfo.jsp
@@ -0,0 +1,64 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>修改教师认证信息</title>
+
+</head>
+<body> 
+
+<c:if test="${resultCode=='0' }">
+   <p>shabile</p>
+   <input type="button" value="权限一"/>
+</c:if>
+
+ 
+<form id="teacherForm" action="${pageContext.request.contextPath }/teacher/editTeacherDipPic.action" method="post"  enctype="multipart/form-data">
+<%-- <input type="hidden" name="teacherId" value="${1 }"/> --%>
+修改教师认证信息
+<table width="100%" border=1>
+<tr>
+	<td>身份证照片</td>
+	<td>
+		<c:if test="${tdiv.idPic !=null}">
+			<img src="/ArtEducation/pic/${tdiv.idPic}" width=200 height=200/>
+			<br/>
+		</c:if> 
+		<input type="file"  name="teacherIdPic"/> 
+	</td>
+</tr> 
+
+<tr>
+	<td>本科/专科毕业证</td>
+	<td>
+		<c:if test="${tdiv.diplomaPic !=null}">
+			<img src="/ArtEducation/pic/${tdiv.diplomaPic}" width=200 height=200/>
+			<br/>
+		</c:if> 
+		<input type="file"  name="teacherDiplomaPic"/> 
+	</td>
+</tr> 
+
+<tr>
+	<td>硕士毕业证</td>
+	<td>
+		<c:if test="${tdiv.masterDiplomaPic !=null}">
+			<img src="/ArtEducation/pic/${tdiv.masterDiplomaPic}" width=200 height=200/>
+			<br/>
+		</c:if> 
+		<input type="file"  name="teacherMasterDiplomaPic"/> 
+	</td>
+</tr> 
+
+<tr>
+<td colspan="2" align="center"><input type="submit" value="提交"/>
+</tr>
+</table>
+</form>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teAgeConst.json b/Server/ArtEducation0331/WebContent/jsp/teAgeConst.json
deleted file mode 100644
index 826be20..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teAgeConst.json
+++ /dev/null
@@ -1 +0,0 @@
-["0~1年","1~2年","2~3年","3年以上"]
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/editpwd.html b/Server/ArtEducation0331/WebContent/jsp/teacher/editpwd.html
new file mode 100644
index 0000000..05b8ee9
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/editpwd.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>修改密码</title>
+  <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body>
+  <div class="container" style="margin-top: 30px;">
+    <div class="row">
+      <div class="col-md-6 col-md-offset-3">
+        <form action="/ArtEducation/teacher/editPassword.action" method="post">
+          <input type="input" style="display:none" name="teacherId">
+          <div class="form-group">
+            <label for="oldPassword">旧密码</label>
+            <input type="password" class="form-control" name="oldPassword" id="oldPassword">
+          </div>
+          <div class="form-group">
+            <label for="newPassword">新密码</label>
+            <input type="password" class="form-control" name="newPassword" id="newPassword">
+          </div>
+          <div class="text-center">
+            <button class="btn btn-danger" type="submit">修改密码</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-historyCourse.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-historyCourse.html
index 56da219..c7be9d5 100644
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-historyCourse.html
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-historyCourse.html
@@ -1,12 +1,82 @@
-<table id="hcTable" class="table table-striped table-bordered table-hover">
-  <thead>
-  <tr>
-    <th>课程名称</th>
-    <th>时间</th>
-    <th>课时数</th>
-    <th>地点</th>
-    <th>状态</th>
-  </tr>
-  </thead>
-  <tbody></tbody>
-</table>
\ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+  <meta charset="UTF-8">
+  <title>教师管理</title>
+  <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+  <link href="../css/sidenav.css" rel="stylesheet">
+  <link href="../css/header.css" rel="stylesheet">
+  <link href="../css/course.css" rel="stylesheet">
+</head>
+<body ng-app="tmApp">
+<header class="container-fluid">
+  <div class="row">
+    <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+      <p class="slogan">艺宝,您身边的艺术教师!</p>
+    </div>
+    <div class="col-md-6">
+      <!--<div class="login">
+        <a href="signup/signup.html">教师入驻</a>
+        <a href="#" class="ssin">教师登录</a>
+        <a href="#" class="ssin">机构登录</a>
+      </div>-->
+      <div class="login">
+        <a href="">登出</a>
+      </div>
+      <div class="buttons">
+        <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
+        <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
+        <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
+        <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
+      </div>
+    </div>
+  </div>
+</header>
+<div class="container">
+  <div class="row main">
+    <div class="col-md-3 sidebar">
+      <div class="info">
+        <img class="avatar" src="../img/ph.png" alt="touxiang">
+        <p class="usrname">username</p>
+      </div>
+      <div class="side-nav">
+        <a href="tm-profile.jsp">编辑账户信息</a>
+        <a href="tm-identity.jsp">编辑认证信息</a>
+        <a href="tm-postCourse.jsp">发布课程</a>
+        <a href="tm.jsp">我的课程</a>
+        <a href="#" class="active">历史课程</a>
+      </div>
+    </div>
+    <div class="col-md-7 col-md-offset-1">
+      <table id="hcTable" class="table table-striped table-bordered table-hover">
+        <thead>
+        <tr>
+          <th>课程名称</th>
+          <th>时间</th>
+          <th>课时数</th>
+          <th>地点</th>
+          <th>状态</th>
+        </tr>
+        </thead>
+        <tbody></tbody>
+      </table>
+    </div>
+  </div>
+</div>
+<footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
+  <div class="row" style="color:#fff;">
+    &copy底部信息
+  </div>
+</footer>
+<!--<script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>-->
+<!--<script src="../js/tmApp.js"></script>-->
+</body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.html
deleted file mode 100644
index a62b151..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<h2 class="text-center" style="margin-bottom:30px;">请提交您的身份证及学历证书清晰照片</h2>
-<div class="form-group">
-    <label>身份证号码</label>
-    <input type="text" class="form-control" ng-model="formData.idNum">
-</div>
-<div class="form-group">
-    <p>身份证正面照片</p>
-    <img class="pic" src="../img/main.jpg" alt="">
-    <input type="file">
-    <br>
-    <p>身份证背面照片</p>
-    <img class="pic" src="../img/main.jpg" alt="">
-    <input type="file">
-</div>
-<div class="form-group">
-    <label>本科/专科学位证书照片</label>
-    <img class="pic" src="../img/main.jpg" alt="">
-    <input type="file">
-</div>
-<div class="form-group">
-    <label>硕士学位证书照片</label>
-    <img class="pic" src="../img/main.jpg" alt="">
-    <input type="file">
-</div>
-
-
-
-<div class="form-group row">
-    <div class="col-xs-6 col-xs-offset-3 text-center">
-        <button type="submit" class="btn btn-danger" ui-sref="signup.verification" ng-click="idSubmit()">提交</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.jsp b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.jsp
new file mode 100644
index 0000000..167ad0b
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-identity.jsp
@@ -0,0 +1,98 @@
+<%@page import="cn.itcast.ssm.po.TeacherCustom"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta charset="UTF-8">
+    <title>教师管理</title>
+    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+    <link href="../css/sidenav.css" rel="stylesheet">
+    <link href="../css/header.css" rel="stylesheet">
+    <link href="../css/course.css" rel="stylesheet">
+</head>
+<body ng-app="tmApp">
+<header class="container-fluid">
+    <div class="row">
+        <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+            <p class="slogan">艺宝,您身边的艺术教师!</p>
+        </div>
+        <div class="col-md-6">
+            <!--<div class="login">
+              <a href="signup/signup.html">教师入驻</a>
+              <a href="#" class="ssin">教师登录</a>
+              <a href="#" class="ssin">机构登录</a>
+            </div>-->
+            <div class="login">
+                <a href="">登出</a>
+            </div>
+            <div class="buttons">
+                <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
+                <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
+                <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
+                <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
+            </div>
+        </div>
+    </div>
+</header>
+ <%TeacherCustom tc=(TeacherCustom)session.getAttribute("teacherCustom"); %>
+<div class="container">
+    <div class="row main">
+        <div class="col-md-3 sidebar">
+            <div class="info">
+                <img class="avatar" src="../img/main.jpg" alt="touxiang">
+                <p class="usrname"><%=tc.getTeacherName() %></p>
+            </div>
+            <div class="side-nav">
+                <a href="tm-profile.jsp">编辑账户信息</a>
+                <a href="#" class="active">编辑认证信息</a>
+                <a href="tm-postCourse.html">发布课程</a>
+                <a href="tm.jsp">我的课程</a>
+                <a href="tm-historyCourse.html">历史课程</a>
+            </div>
+        </div>
+        <div class="col-md-7 col-md-offset-1">
+            <h2 style="margin-bottom:30px;">请提交您的身份证及学历证书清晰照片</h2>
+            <div class="col-md-6">
+              
+                <form action="/ArtEducation/teacher/editTeacherDipPic.action" class="form-group" method="post" enctype="multipart/form-data">
+                    <input type="hidden" name="teacherId" value='<%=tc.getTeacherId()%>'/>
+                    <div class="form-group">
+                        <label for="idPic">身份证照片(要带身份证号的一面)</label>
+                        <img class="pic" src='/ArtEducation/pic/<%=tc.getIdPic() %>' alt="">
+                        <input type="file" id="idPic" name="idPic" required>
+                    </div>
+                    <div class="form-group">
+                        <label for="diplomaPic">本科/专科毕业证照片</label>
+                        <img class="pic" src='/ArtEducation/pic/<%=tc.getDiplomaPic() %>' alt="">
+                        <input type="file" id="diplomaPic" name="diplomaPic">
+                    </div>
+                    <div class="form-group">
+                        <label for="masterDiplomaPic">硕士毕业证照片</label>
+                        <img class="pic" src='/ArtEducation/pic/<%=tc.getMasterDiplomaPic() %>' alt="">
+                        <input type="file" id="masterDiplomaPic" name="masterDiplomaPic">
+                    </div>
+                    <button type="submit" class="btn btn-danger">提交</button>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
+    <div class="row" style="color:#fff;">
+        &copy底部信息
+    </div>
+</footer>
+<!--<script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>-->
+<!--<script src="../js/tmApp.js"></script>-->
+</body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-myCourse.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-myCourse.html
deleted file mode 100644
index 8d61e3c..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-myCourse.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<table id="hcTable" class="table table-striped table-bordered table-hover">
-  <thead>
-  <tr>
-    <th>课程名称</th>
-    <th>时间</th>
-    <th>课时数</th>
-    <th>地点</th>
-    <th>状态</th>
-    <th>操作</th>
-  </tr>
-  </thead>
-  <tbody></tbody>
-</table>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-postCourse.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-postCourse.html
index bf98913..641ad88 100644
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-postCourse.html
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-postCourse.html
@@ -1,49 +1,139 @@
-<div class="form-group">
-  <label for="courseName">课程名称</label>
-  <input type="text" class="form-control" name="courseName" ng-model="course.name" required>
-</div>
-<div class="form-group">
-  <label for="classHours">课时数</label>
-  <input type="text" class="form-control" name="classHours" ng-model="course.hours" required>
-</div>
-<div class="row">
-  <div class="col-md-4">
-    <p style="font-weight: bold;font-size: 20px;margin-top: 50px;">选择时间</p>
-  </div>
-  <div class="col-md-8">
-    <div class="form-group">
-      <label for="startDate">课程开始时间</label>
-      <input type="text" name="startDate" ng-model="course.startDate" ui-date required/>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+  <meta charset="UTF-8">
+  <title>教师管理</title>
+  <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+  <link href="../css/sidenav.css" rel="stylesheet">
+  <link href="../css/header.css" rel="stylesheet">
+  <link href="../css/course.css" rel="stylesheet">
+</head>
+<body ng-app="tmApp">
+<header class="container-fluid">
+  <div class="row">
+    <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+      <p class="slogan">艺宝,您身边的艺术教师!</p>
     </div>
-    <div class="form-group">
-      <label for="endDate">课程结束时间</label>
-      <input type="text" name="endDate" ng-model="course.endDate" ui-date required/>
-    </div>
-    <div class="form-group">
-      <label for="weekday">每周上课时间</label>
-      <input type="text" name="weekday" ng-model="course.weekday" required/>
+    <div class="col-md-6">
+      <!--<div class="login">
+        <a href="signup/signup.html">教师入驻</a>
+        <a href="#" class="ssin">教师登录</a>
+        <a href="#" class="ssin">机构登录</a>
+      </div>-->
+      <div class="login">
+        <a href="">登出</a>
+      </div>
+      <div class="buttons">
+        <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
+        <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
+        <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
+        <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
+      </div>
     </div>
   </div>
-</div>
-<div class="form-group">
-  <label for="classAddress">上课地点</label>
-  <input type="text" class="form-control" name="classAddress" ng-model="course.address" required>
-</div>
-<div class="form-group">
-  <label for="classDesc">课程描述</label>
-  <textarea class="form-control" name="classDesc" ng-model="course.desc" required></textarea>
-</div>
-<div class="form-group">
-  <label for="classPic">课程图片</label>
-  <div>
-    <div id="classPic1" class="classPic"></div>
-    <div id="classPic2" class="classPic"></div>
+</header>
+<div class="container">
+  <div class="row main">
+    <div class="col-md-3 sidebar">
+      <div class="info">
+        <img class="avatar" src="../img/ph.png" alt="touxiang">
+        <p class="usrname">username</p>
+      </div>
+      <div class="side-nav">
+        <a href="tm-profile.html">编辑账户信息</a>
+        <a href="tm-identity.html">编辑认证信息</a>
+        <a href="#" class="active">发布课程</a>
+        <a href="tm.html">我的课程</a>
+        <a href="tm-historyCourse.html">历史课程</a>
+      </div>
+    </div>
+    <div class="col-md-7 col-md-offset-1">
+      <div class="col-md-12">
+        <p class="bg-warning">以下内容全部必填</p>
+        <form name="courseForm" action="" method="post">
+          <div class="form-group">
+            <label for="courseName">课程名称</label>
+            <input type="text" class="form-control" name="courseName" id="courseName" required>
+          </div>
+          <div class="form-group">
+            <label for="courseDesc">课程描述</label>
+            <textarea class="form-control" name="courseDesc" id="courseDesc" cols="30" rows="10" required></textarea>
+          </div>
+          <div class="row">
+            <div class="col-md-4">
+              <p style="font-weight: bold;font-size: 20px;margin-top: 50px;text-align: center;">选择时间</p>
+            </div>
+            <div class="col-md-8">
+              <div class="form-group">
+                <label for="courseStartTime">课程开始时间</label>
+                <input type="text" name="courseStartTime" id="courseStartTime" ui-date required/>
+              </div>
+              <div class="form-group">
+                <label for="courseEndTime">课程结束时间</label>
+                <input type="text" name="courseEndTime" id="courseEndTime" ui-date required/>
+              </div>
+              <div class="form-group">
+                <label for="classTime">每周上课时间</label>
+                <input type="text" name="classTime" id="classTime" required/>
+              </div>
+            </div>
+          </div>
+          <div class="form-group">
+            <label for="teachAddress">上课地点</label>
+            <input type="text" class="form-control" name="teachAddress" id="teachAddress" required>
+          </div>
+          <div class="form-group">
+            <label for="lessonNum">课时数</label>
+            <input type="text" class="form-control" name="lessonNum" id="lessonNum" required>
+          </div>
+          <div class="form-group">
+            <label for="teachMethod">授课方式</label>
+            <select name="teachMethod" id="teachMethod" class="form-control" required>
+              <option value="2001" selected>上门授课</option>
+              <option value="2002">机构教室</option>
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="teachMethod">是否支持试听</label>
+            <select name="listenTest" id="listenTest" class="form-control" required>
+              <option value="3001" selected>不支持试听</option>
+              <option value="3002">支持试听</option>
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="coursePrice">课程价格(元)</label>
+            <input type="text" class="form-control" name="coursePrice" id="coursePrice" required>
+          </div>
+          <div class="form-group">
+            <label for="mainImage">一张与课程相关的图片</label>
+            <img src="../img/ph.png" alt="" style="display: block;margin: 5px;"><!--课程图片回显-->
+            <input type="file" name="mainImage" id="mainImage" required>
+          </div>
+          <div class="form-group">
+            <label for="planStuNum">计划招生人数</label>
+            <input type="text" class="form-control" name="planStuNum" id="planStuNum" required>
+          </div>
+          <button class="btn btn-danger" onclick="document.courseForm.action='/ArtEducation/teacher/publishCourse.action';document.courseForm.submit()">创建课程</button>
+          <button class="btn btn-danger" onclick="document.courseForm.action='/ArtEducation/teacher/editCourse.action';document.courseForm.submit()">修改课程</button>
+        </form>
+      </div>
+    </div>
   </div>
-  <input type="file" name="classPic">
 </div>
-
-<div class="form-group row">
-  <div class="col-md-4 col-md-offset-4">
-    <button class="btn btn-block btn-danger" ng-click="profileSubmit()">提交</button>
+<footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
+  <div class="row" style="color:#fff;">
+    &copy底部信息
   </div>
-</div>
\ No newline at end of file
+</footer>
+<!--<script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>-->
+<!--<script src="../js/tmApp.js"></script>-->
+</body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.html
deleted file mode 100644
index 018697a..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div class="form-group">
-    <label for="email">邮箱</label>
-    <input type="email" class="form-control" name="email" ng-model="profileInfo.email" required>
-</div>
-<div class="form-group">
-    <label for="pwd">密码</label>
-    <a class="btn btn-block btn-info" href="" target="_blank">修改密码</a>
-</div>
-<div class="form-group">
-    <label for="name">真实姓名</label>
-    <input type="text" class="form-control" name="name" ng-model="profileInfo.name" required>
-</div>
-<div class="form-group">
-    <label>性别</label>
-    <span style="padding-left: 15px;">
-      <input type="radio" ng-model="profileInfo.sex" value="male">男
-      <input type="radio" ng-model="profileInfo.sex" value="female">女
-    </span>
-</div>
-<div class="form-group">
-    <label for="field">教学内容</label>
-    <select name="field" ng-model="profileInfo.field" style="width:100px;margin-left:15px;">
-        <option value="{{f}}" ng-repeat="f in fieldOpts">{{f}}</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="degree">最高学历</label>
-    <select name="degree" ng-model="profileInfo.degree" style="width:100px;margin-left:15px;">
-        <option value="{{d}}" ng-repeat="d in degreeOpts">{{d}}</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="teAge">教龄</label>
-    <select name="teAge" ng-model="profileInfo.teachingAge" style="width:100px;margin-left:43px;">
-        <option value="{{t}}" ng-repeat="t in teAgeOpts">{{t}}</option>
-    </select>
-</div>
-
-<div class="form-group row">
-    <div class="col-md-4 col-md-offset-4">
-        <button class="btn btn-block btn-danger" ng-click="profileSubmit()">提交</button>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.jsp b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.jsp
new file mode 100644
index 0000000..fafb736
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-profile.jsp
@@ -0,0 +1,199 @@
+<%@page import="cn.itcast.ssm.po.TeacherCustom"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+  <meta charset="UTF-8">
+  <title>教师管理</title>
+  <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+  <link href="../css/sidenav.css" rel="stylesheet">
+  <link href="../css/header.css" rel="stylesheet">
+  <link href="../css/course.css" rel="stylesheet">
+</head>
+<body ng-app="tmApp">
+<header class="container-fluid">
+  <div class="row">
+    <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+      <p class="slogan">艺宝,您身边的艺术教师!</p>
+    </div>
+    <div class="col-md-6">
+      <!--<div class="login">
+        <a href="signup/signup.html">教师入驻</a>
+        <a href="#" class="ssin">教师登录</a>
+        <a href="#" class="ssin">机构登录</a>
+      </div>-->
+      <div class="login">
+        <a href="">登出</a>
+      </div>
+      <div class="buttons">
+        <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
+        <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
+        <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
+        <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
+      </div>
+    </div>
+  </div>
+</header>
+  
+        <!--获取teacherCustom对象  -->
+        <% TeacherCustom tc=(TeacherCustom)session.getAttribute("teacherCustom");
+            String editTeacherInfo=(String)session.getAttribute("editTeacherInfo");%>
+        
+<div class="container">
+  <div class="row main">
+    <div class="col-md-3 sidebar">
+      <div class="info">
+        <img class="avatar" src="../img/ph.png" alt="touxiang">
+        <p class="usrname"><%=tc.getTeacherName() %></p>
+      </div>
+      <div class="side-nav">
+        <a href="#" class="active">编辑账户信息</a>
+        <a href="tm-identity.jsp">编辑认证信息</a>
+        <a href="tm-postCourse.jsp">发布课程</a>
+        <a href="tm.jsp">我的课程</a>
+        <a href="tm-historyCourse.jsp">历史课程</a>
+      </div>
+    </div>
+    <div class="col-md-7 col-md-offset-1">
+      <div class="col-md-8">
+        <form action="/ArtEducation/teacher/editTeacherInfo.action" method="post">
+          <input type="text" style="display:none" name="teacherId" value='<%=tc.getTeacherId()%>'>
+          <div class="form-group">
+            <label for="email">邮箱</label>
+            <input type="email" id="email" class="form-control" name="email" value='<%=tc.getEmail() %>' required >
+            <c:if test='<%=editTeacherInfo.equals("9001") %>'>
+                <p style="color:red;">邮箱已存在</p>
+            </c:if>
+           
+            <c:if test='<%=editTeacherInfo.equals("9009") %>'>
+                <p style="color:red;">其他原因导致修改失败</p>
+            </c:if>
+          </div>
+          <div class="form-group">
+            <label for="teacherName">用户名</label>
+            <input type="text" id="teacherName" class="form-control" name="teacherName" value='<%=tc.getTeacherName() %>' required>
+            <c:if test='<%=editTeacherInfo.equals("9002") %>'>
+               <p style="color:red;">用户名已存在</p>
+            </c:if>
+          </div>
+          <div class="form-group">
+            <a class="btn btn-info" href="editpwd.html" target="_blank">修改密码</a>
+          </div>
+          <div class="form-group">
+            <label for="name">真实姓名</label>
+            <input type="text" id="name" class="form-control" name="realName" value='<%=tc.getRealName() %>' required>
+          </div>
+          <div class="form-group">
+            <span>性别</span>
+              <span style="padding-left: 15px;">
+              
+              <c:if test='<%=tc.getGender().equals("男") %>'>
+                  <input type="radio" name="gender" value="女" required ><label>女</label>
+                  <input type="radio" name="gender" value="男" checked="checked" required><label>男</label>
+              </c:if>
+              
+              <c:if test='<%=tc.getGender().equals("女") %>'>
+                  <input type="radio" name="gender" value="女" required  checked="checked"><label>女</label>
+                  <input type="radio" name="gender" value="男" required><label>男</label>
+              </c:if>
+                
+              </span>
+          </div>
+          <div class="form-group">
+            <label for="teacherAge">年龄</label>
+            <input type="text" id="teacherAge" class="form-control" name="teacherAge" value='<%=tc.getTeacherAge() %>' required>
+          </div>
+          <div class="form-group">
+            <label for="IDNumber">身份证号</label>
+            <input type="text" id="IDNumber" class="form-control" name="idNumber" value='<%=tc.getIdNumber() %>' required>
+          </div>
+          <div class="form-group">
+            <label for="preference">教学内容</label>
+            <input type="text" id="preference" class="form-control" name="preference" value='<%=tc.getPreference() %>' required>
+          </div>
+          <div class="form-group">
+            <label for="education">最高学历</label>
+            <select name="education" id="education" style="width:100px;margin-left:15px;" required>
+              <c:if test='<%=tc.getEducation().equals("本科/专科") %>'>
+                <option value="本科/专科" selected>本科/专科</option>
+                <option value="硕士">硕士</option>
+              </c:if>
+              <c:if test='<%=tc.getEducation().equals("硕士") %>'>
+                <option value="本科/专科" >本科/专科</option>
+              <option value="硕士" selected>硕士</option>
+              </c:if>
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="seniority">教龄</label>
+            <select name="seniority" id="seniority" style="width:100px;margin-left:43px;" required>
+            
+              <% for(int i=1;i<=7;i++){
+            	  if(tc.getSeniority()==i){
+            	  %>
+            	  <option value='<%=i %>' selected><%= i%>年</option>
+              <%}else{%>
+                   <option value='<%=i%>'><%=i%>年</option>
+              <%} 
+              }if(tc.getSeniority()==8){%> 
+                 <option value="8" selected>七年以上</option>
+              <%}else{ %>
+                 <option value="8" >七年以上</option>
+              <%} %>
+              
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="phone">联系方式(手机/固话)</label>
+            <input type="text" id="phone" class="form-control" name="phone" value='<%=tc.getPhone() %>' required>
+          </div>
+          <div class="form-group">
+            <span>工作类型</span>
+              <span style="padding-left: 15px">
+               <c:if test='<%=tc.getTeacherType().equals("3001") %>'>
+                  <input type="radio" name="teacherType" value="3001" required checked><label>兼职</label>
+                  <input type="radio" name="teacherType" value="3002" required><label>全职</label>
+                </c:if>
+                <c:if test='<%=tc.getTeacherType().equals("3002") %>'>
+                  <input type="radio" name="teacherType" value="3001" required ><label>兼职</label>
+                  <input type="radio" name="teacherType" value="3002" required checked><label>全职</label>
+                </c:if>  
+              <!--    <input type="radio" name="teacherType" value="3001" required checked><label>兼职</label>
+                  <input type="radio" name="teacherType" value="3002" required><label>全职</label> -->
+              </span>
+          </div>
+          <div class="form-group">
+            <label for="description">自我介绍</label>
+            <textarea id="description" class="form-control" name="description"  cols="30" rows="10" >
+            <%=tc.getDescription() %>
+            </textarea>
+          </div>
+          <div class="form-group row">
+            <div class="col-md-4 col-md-offset-4">
+              <button class="btn btn-block btn-danger" type="submit">提交</button>
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</div>
+<footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
+  <div class="row" style="color:#fff;">
+    &copy底部信息
+  </div>
+</footer>
+<!--<script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+<!--<script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>-->
+<!--<script src="../js/tmApp.js"></script>-->
+</body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-sidebar.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm-sidebar.html
deleted file mode 100644
index b57a5ed..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm-sidebar.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="row main">
-  <div class="col-md-3 sidebar">
-    <div class="info">
-      <img class="avatar" src="../img/main.jpg" alt="touxiang">
-      <p class="usrname">username</p>
-    </div>
-    <div class="side-nav">
-      <a ui-sref=".profile">编辑账户信息</a>
-      <a ui-sref=".identity">编辑认证信息</a>
-      <a ui-sref=".coursePost">发布课程</a>
-      <a ui-sref=".myCourse">我的课程</a>
-      <a ui-sref=".historyCourse">历史课程</a>
-    </div>
-  </div>
-  <div class="col-md-4 col-md-offset-1">
-    <div class="row">
-      <div ui-view></div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm.html b/Server/ArtEducation0331/WebContent/jsp/teacher/tm.html
deleted file mode 100644
index f147fcb..0000000
--- a/Server/ArtEducation0331/WebContent/jsp/teacher/tm.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-    <meta charset="UTF-8">
-    <title>教师管理</title>
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
-    <link href="../css/sidenav.css" rel="stylesheet">
-    <link href="../css/header.css" rel="stylesheet">
-    <link href="../css/course.css" rel="stylesheet">
-  </head>
-  <body ng-app="tmApp">
-    <header class="container-fluid">
-      <div class="row">
-        <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
-          <p class="slogan">艺宝,您身边的艺术教师!</p>
-        </div>
-        <div class="col-md-6">
-          <!--<div class="login">
-            <a href="signup/signup.html">教师入驻</a>
-            <a href="#" class="ssin">教师登录</a>
-            <a href="#" class="ssin">机构登录</a>
-          </div>-->
-          <div class="login">
-            <a href="">登出</a>
-          </div>
-          <div class="buttons">
-            <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
-            <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
-            <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
-            <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
-          </div>
-        </div>
-      </div>
-    </header>
-    <div class="container">
-      <div ui-view></div>
-    </div>
-    <footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
-      <div class="row" style="color:#fff;">
-        &copy底部信息
-      </div>
-    </footer>
-    <script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>
-    <script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>
-    <script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>
-    <script src="../js/constSer.js"></script>
-    <script src="../js/tmApp.js"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/WebContent/jsp/teacher/tm.jsp b/Server/ArtEducation0331/WebContent/jsp/teacher/tm.jsp
new file mode 100644
index 0000000..0c03bb5
--- /dev/null
+++ b/Server/ArtEducation0331/WebContent/jsp/teacher/tm.jsp
@@ -0,0 +1,116 @@
+<%@page import="cn.itcast.ssm.po.TeacherCustom"%>
+<%@page import="cn.itcast.ssm.view.TeacherCoursesView"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <meta charset="UTF-8">
+    <title>教师管理</title>
+    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.css" rel="stylesheet">
+    <link href="../css/sidenav.css" rel="stylesheet">
+    <link href="../css/header.css" rel="stylesheet">
+    <link href="../css/course.css" rel="stylesheet">
+  </head>
+  <body ng-app="tmApp">
+    <header class="container-fluid">
+      <div class="row">
+        <div class="col-md-6"><a href="index.html"><img class="logo" src="" alt="website logo"></a>
+          <p class="slogan">艺宝,您身边的艺术教师!</p>
+        </div>
+        <div class="col-md-6">
+          <!--<div class="login">
+            <a href="signup/signup.html">教师入驻</a>
+            <a href="#" class="ssin">教师登录</a>
+            <a href="#" class="ssin">机构登录</a>
+          </div>-->
+          <div class="login">
+            <a href="">登出</a>
+          </div>
+          <div class="buttons">
+            <a href="../index.html#main" class="btn" data-toggle="tab">首页</a>
+            <a href="../index.html#activities" class="btn" data-toggle="tab">活动</a>
+            <a href="../index.html#help" class="btn" data-toggle="tab">帮助</a>
+            <a href="../index.html#contactus" class="btn" data-toggle="tab">联系我们</a>
+          </div>
+        </div>
+      </div>
+    </header>
+    <div class="container">
+      <div class="row main">
+        <div class="col-md-3 sidebar">
+          <div class="info">
+            <img class="avatar" src="../img/ph.png" alt="touxiang">
+            <p class="usrname">
+            <% TeacherCustom tc=(TeacherCustom)session.getAttribute("teacherCustom");%>
+            <%=tc.getTeacherName() %>
+            </p>
+          </div>
+          <div class="side-nav">
+            <a href="tm-profile.jsp">编辑账户信息</a>
+            <a href="tm-identity.jsp">编辑认证信息</a>
+            <a href="tm-postCourse.jsp">发布课程</a>
+            <a href="#" class="active">我的课程</a>
+            <a href="tm-historyCourse.jsp">历史课程</a>
+          </div>
+        </div>
+        <div class="col-md-7 col-md-offset-1">
+          <table id="hcTable" class="table table-striped table-bordered table-hover">
+            <thead>
+            <tr>
+              <th>课程名称</th>
+              <th>开始时间</th>
+              <th>结束时间</th>
+              <th>每节课时间</th>
+              <th>地点</th>
+              <th>状态</th>
+              <th>操作</th>
+            </tr>
+           <%--  <% for(TeacherCoursesView tcv:session.getAttribute("teacherCoursesViews")){ %>
+              <tr>
+                <th><%=tcv.getCourseName() %></th>
+                <th><%=tcv.getStartTime() %></th>
+                <th><%=tcv.getEndTime() %></th>
+                <th><%=tcv.getClassTime() %></th>
+                <th><%=tcv.getTeachAddress() %></th>
+                <th><%=tcv.getStartTime() %></th>
+                <th><a href="">修改</a></th>
+              </tr>
+           <% }%> --%>
+           <!-- 匪夷所思啊，下面必须使用单引号 -->
+           <c:forEach items='<%= session.getAttribute("teacherCoursesViews")%>' var="item">
+             <tr>
+                <th>${item.courseName }</th>
+                <th>${item.startTime }</th>
+                <th>${item.endTime }</th>
+                <th>${item.classTime }</th>
+                <th>${item.teachAddress }</th>
+                <th>${item.courseStatus }</th>
+                <th><a href="tm-postCourse.html?teacherId=${item.teacherId }">修改</a></th>
+              </tr>
+           </c:forEach>
+           
+            </thead>
+            <tbody></tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+    <footer class="container-fluid" style="height: 100px;background-color: #4d99f5;text-align: center;">
+      <div class="row" style="color:#fff;">
+        &copy底部信息
+      </div>
+    </footer>
+    <!--<script src="http://cdn.bootcss.com/jquery/1.11.3/jquery.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/jqueryui/1.11.4/jquery-ui.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-animate.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular-ui-router/1.0.0-alpha0/angular-ui-router.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular.js/1.5.0/angular-resource.min.js"></script>-->
+    <!--<script src="http://cdn.bootcss.com/angular-ui-date/1.0.0-beta.3/date.min.js"></script>-->
+    <script src="../js/tmApp.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/build/classes/.gitignore b/Server/ArtEducation0331/build/classes/.gitignore
index 8fe2033..dbfdbaa 100644
--- a/Server/ArtEducation0331/build/classes/.gitignore
+++ b/Server/ArtEducation0331/build/classes/.gitignore
@@ -1 +1,5 @@
 /cn/
+/db.properties
+/log4j.properties
+/mybatis/
+/spring/
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/CourseController.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/CourseController.class
deleted file mode 100644
index 27b18ba..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/CourseController.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/StudentController.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/StudentController.class
deleted file mode 100644
index 996001c..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/StudentController.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/TeacherController.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/TeacherController.class
deleted file mode 100644
index 4d06285..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/controller/TeacherController.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.class
deleted file mode 100644
index ed432e1..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.xml b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.xml
deleted file mode 100644
index bdf1252..0000000
--- a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/CourseMapper.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.itcast.ssm.mapper.CourseMapper" >
-
-
-     <!--查询每个课程大类下的所有课程  -->
-	<select id="findCoursesByCtypeId" parameterType="java.lang.Integer" resultType="courseCustom">
-		select t_course.*,t_teacher.teacherName,t_organization.organizationName from t_course,t_teacher,t_organization 
-		where t_course.courseTypeId = #{courseTypeId} and t_course.teacherId = t_teacher.teacherId 
-		and t_teacher.organizationId = t_organization.organizationId
-	</select>
-	
-	<!-- 查询所有的课程类型 -->
-	<select id="findCourseTypesList" resultType="courseTypeCustom">
-		select * from t_coursetype
-	</select>
-	
-	
-	<!-- 根据课程ID，查询课程详情 -->
-	<select id="findCourseDetailByCId" parameterType="java.lang.Integer" resultMap="courseDetailMap">
-		select c.*,t.*,o.*,cs.*, s.* from t_course c,t_teacher t,t_organization o,t_coursestudent cs,t_student s where c.courseId=1 and c.teacherId=t.teacherId and t.organizationId=o.organizationId and cs.courseId= c.courseId and cs.studentId=s.studentId
-	</select>
-	
-	<resultMap type="courseDetailCustom" id="courseDetailMap">
-		<id column="courseId" property="courseId"/>
-		<result column="courseName" property="courseName"/>
-		<result column="courseDesc" property="courseDesc"/>
-		<result column="courseStatus" property="courseStatus"/>
-		<result column="mainImage" property="mainImage"/>
-		<association property="teacherCustom" javaType="teacherCustom">
-			<id column="teacherId" property="teacherId" />
-			<result column="teacherName" property="teacherName"/>
-			<result column="education" property="education"/>
-			<result column="seniority" property="seniority"/>
-			<result column="description" property="description"/>
-			<result column="headPortraits" property="teacherHeadPortraits"/>
-			<association property="organizationCustom" javaType="organizationCustom">
-				<id column="organizationId" property="organizationId"/>
-				<result column="organizationName" property="organizationName"/>
-				<result column="organizationDescription" property="organizationDescription"/>
-				<result column="imageId" property="organizationImageId"/>
-			</association>
-		</association>
-		<collection property="comments" ofType="comment">
-			<id column="couStuId" property="couStuId"/>
-			<result column="starLevel" property="starLevel"/>
-			<result column="comment" property="comment"/>
-			<association property="studentCustom" javaType="studentCustom">
-				<id column="studentId" property="studentId" />
-				<result column="studentName" property="studentName"/>
-				<result column="headPortraits" property="headPortraits"/>
-			</association>
-		</collection>
-	</resultMap>
-	
-	<!-- 根据课程id，查询课程优惠券使用信息 -->
-	<select id="getDiscountUseInfo" parameterType="java.lang.Integer" resultType="discountUseInfo">
-	   select discountUseInfo
-	   from t_course
-	   where courseId=#{courseId}
-	</select>
-</mapper>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.class
deleted file mode 100644
index 6e8a9c9..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.xml b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.xml
deleted file mode 100644
index 497a920..0000000
--- a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/OrganizationMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.itcast.ssm.mapper.OrganizationMapper" >
-
-   <!-- 根据机构的名称查询机构的信息 -->
-    <select id="findOrganizationByName"  parameterType="java.lang.String" resultType="organizationcustom">
-        select organizationId,password from t_organization where organizationName=#{value}
-    </select>
-    
-</mapper>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.class
deleted file mode 100644
index e147359..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.xml b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.xml
deleted file mode 100644
index ad57ac9..0000000
--- a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/StudentMapper.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.itcast.ssm.mapper.StudentMapper" >
-
-   <!-- 根据学生的用户名来登录 -->
-    <select id="findStudentByName"  parameterType="java.lang.String" resultType="studentcustom">
-        select studentId,password from t_student where studentName=#{value}
-    </select>
-    
-    <!--  根据学生的邮箱或用户名，来查询学生的信息-->
-    <select id="findStudentByNameOrEmail" parameterType="java.lang.String" resultType="studentCustom">
-       select studentId,password from t_student where email=#{value} or studentName=#{value}
-    </select>
- 
- 	<!-- 根据学生Id查询学生信息 -->	
- 	<select id="findStudentById" parameterType="java.lang.Integer" resultType="studentCustom">
- 		select * from t_student where studentId = #{studentId}
- 	</select>
- 	
- 	<!-- 更新学生信息 -->
- 	<update id="updateStudent" parameterType="studentCustom" >
- 		UPDATE t_student SET  studentAge= #{studentAge},phone = #{phone},preference = #{preference}
-		WHERE studentId = #{studentId}
- 	</update>
- 	
- 	
- 	<!-- 查询学生所有优惠券信息-->
- 	<select id="findDiscountsBySId" parameterType="java.lang.Integer" resultType="discountCustom">
- 	     select t_discount.*,t_course.courseName,t_course.mainImage,t_teacher.teacherName,t_organization.organizationName
- 	     from t_discount,t_course,t_teacher,t_organization
- 	     where t_discount.studentId=#{studentId} and t_discount.courseId=t_course.courseId  
- 	     and  t_course.teacherId=t_teacher.teacherId and t_teacher.organizationId=t_organization.organizationId
- 	</select>
- 	
- 	<!--查询优惠券详细信息 -->
- 	<select id="findDiscountDetailByDId" parameterType="java.lang.Integer" resultType="discountDetaileCustom">
- 	   select t_discount.discountCode,t_course.courseName,t_course.discountUseInfo
- 	   from   t_discount,t_course
- 	   where t_discount.discountId=#{discountId} and  t_discount.courseId=t_course.courseId
- 	 </select>
- 	 
- 	 <!--查询购物车列表  -->
- 	 <select id="findOrderscarListBySId" parameterType="java.lang.Integer" resultType="ordersCarList">
- 	    select  t_ordersCar.courseId,t_course.courseName,t_course.mainImage,t_teacher.teacherName,t_organization.organizationAddr,t_organization.organizationName
- 	    from   t_ordersCar ,t_course,t_teacher,t_organization
- 	    where  t_ordersCar.studentId=#{studentId} and t_ordersCar.courseId=t_course.courseId and t_course.teacherId=t_teacher.teacherId
- 	           and  t_teacher.organizationId=t_organization.organizationId
- 	 </select>
- 	
- 	<!-- 注册学生信息，并返回studentId -->
- 	<insert id="insertStudent" parameterType="studentCustom" >
- 	 <selectKey keyProperty="studentId" order="AFTER" resultType="java.lang.Integer">
-        SELECT LAST_INSERT_ID() 
-     </selectKey>
- 	    insert into t_student(studentName,email,password,realName,gender,studentAge,preference,phone) 
- 	    values(#{studentName},#{email},#{password},#{realName},#{gender},#{studentAge},#{preference},#{phone})
- 	</insert>
- 	
- 	<!--学生将课程添加进购物车  -->
-     <insert id="addToOrdersCar" parameterType="ordersCarCustom">
-        <selectKey keyProperty="ordersCarId" order="AFTER" resultType="java.lang.Integer">
-           SELECT LAST_INSERT_ID() 
-        </selectKey>
-        insert into t_orderscar(studentId,courseId,time,count,totalPrice)
-        values(#{studentId},#{courseId},#{time},#{count},#{totalPrice})
-     </insert>
-     
-     
-     <!--根据课程id，查询课程单价  -->
- 	<select id="findCoursePriceById" parameterType="java.lang.Integer" resultType="courseCustom">
- 	    select coursePrice
- 	    from t_course
- 	    where courseId=#{courseId}
- 	</select>
- 	
- 	<!-- 查询购物车信息 -->
- 	<select id="queryOrdersCar" parameterType="java.lang.Integer" resultType="ordersCarInfo">
- 	     select t_orderscar.ordersCarId,t_orderscar.courseId,courseName,teacherName,organizationName
- 	     from t_orderscar,t_course,t_teacher,t_organization
- 	     where t_orderscar.studentId=#{studentId} and t_orderscar.courseId=t_course.courseId and
- 	           t_course.teacherId=t_teacher.teacherId  and t_teacher.organizationId=t_organization.organizationId
- 	</select>
- 	
- 	
- 	<!--根据课程id和学生id，查询购物车中该学生是否已经添加该课程  -->
- 	<select id="findCarCourseByCourseId" parameterType="ordersCarCustom" resultType="ordersCarCustom">
- 	   select * 
- 	   from t_orderscar
- 	   where courseId=#{courseId} and studentId=#{studentId}
- 	</select>
- 	
- 	<!-- 根据学生id和课程id，更新购物车信息 -->
- 	<update id="updateOrdersCar" parameterType="ordersCarCustom">
- 	    update t_orderscar
- 	    set count=#{count},totalPrice=#{totalPrice},time=#{time}
- 	    where studentId=#{studentId} and courseId=#{courseId}
- 	</update>
- 	
- 	<!--删除购物车中的课程  -->
- 	<delete id="deleteOrdersCar" parameterType="java.lang.Integer">
- 	   delete 
- 	   from t_orderscar
- 	   where ordersCarId=#{ordersCarId}
- 	</delete>
- 	
- 	<!--获取优惠券信息  -->
- 	<select id="getDiscount" parameterType="java.lang.Integer" resultType="myDiscountInfo">
- 	   select t_discount.courseId,discountStatus,discountCode,t_course.courseName,t_teacher.teacherName,
- 	           t_organization.organizationName
- 	   from t_discount,t_course,t_teacher,t_organization
- 	   where t_discount.studentId=#{studentId} and t_discount.courseId=t_course.courseId and 
- 	      t_course.teacherId=t_teacher.teacherId and t_teacher.organizationId=t_organization.organizationId
- 	</select>
-</mapper>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.class
deleted file mode 100644
index 642bce8..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.xml b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.xml
deleted file mode 100644
index 6e740e5..0000000
--- a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/mapper/TeacherMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.itcast.ssm.mapper.TeacherMapper" >
-
-   <!-- 根据教师的用户名来查询教师的信息 -->
-    <select id="findTeacherByName"  parameterType="java.lang.String" resultType="teachercustom">
-        select teacherId,password from t_teacher where teacherName=#{value}
-    </select>
-    
-    <!--  根据教师的邮箱，来查询教师的信息-->
-    <select id="findTeacherByNameOrEmail" parameterType="java.lang.String" resultType="teacherCustom">
-       select teacherId,password from t_teacher where teacherName=#{value} or email=#{value}
-    </select>
- 
-</mapper>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Admin.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Admin.class
deleted file mode 100644
index 4fce6e4..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Admin.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/AdminCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/AdminCustom.class
deleted file mode 100644
index b6681a1..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/AdminCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Comment.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Comment.class
deleted file mode 100644
index 49829f7..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Comment.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Course.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Course.class
deleted file mode 100644
index d3f102c..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Course.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseCustom.class
deleted file mode 100644
index 8f7e72c..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseDetailCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseDetailCustom.class
deleted file mode 100644
index fd6606d..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseDetailCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseStudent.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseStudent.class
deleted file mode 100644
index c559250..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseStudent.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseType.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseType.class
deleted file mode 100644
index f00ce2b..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseType.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseTypeCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseTypeCustom.class
deleted file mode 100644
index 2b4c52e..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/CourseTypeCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Discount.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Discount.class
deleted file mode 100644
index e61e688..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Discount.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountCustom.class
deleted file mode 100644
index 21ab48a..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountDetaileCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountDetaileCustom.class
deleted file mode 100644
index b5ad260..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountDetaileCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountUseInfo.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountUseInfo.class
deleted file mode 100644
index b5b37c9..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/DiscountUseInfo.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/File.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/File.class
deleted file mode 100644
index 3ba6ed8..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/File.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/FileRelation.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/FileRelation.class
deleted file mode 100644
index 51ed90e..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/FileRelation.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/MyDiscountInfo.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/MyDiscountInfo.class
deleted file mode 100644
index bcda689..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/MyDiscountInfo.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Orders.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Orders.class
deleted file mode 100644
index 7a453b1..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Orders.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCar.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCar.class
deleted file mode 100644
index 5cb88ba..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCar.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarCustom.class
deleted file mode 100644
index 70ce3ff..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarInfo.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarInfo.class
deleted file mode 100644
index 42b7d5c..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarInfo.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarList.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarList.class
deleted file mode 100644
index 2f437e3..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrdersCarList.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Organization.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Organization.class
deleted file mode 100644
index afe5d18..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Organization.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrganizationCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrganizationCustom.class
deleted file mode 100644
index e316d1b..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/OrganizationCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/PayInfo.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/PayInfo.class
deleted file mode 100644
index 34cca77..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/PayInfo.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Student.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Student.class
deleted file mode 100644
index 4c46e92..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Student.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/StudentCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/StudentCustom.class
deleted file mode 100644
index 6b39275..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/StudentCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Teacher.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Teacher.class
deleted file mode 100644
index 5b7577b..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/Teacher.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/TeacherCustom.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/TeacherCustom.class
deleted file mode 100644
index 4a0125f..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/TeacherCustom.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/UserToken.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/UserToken.class
deleted file mode 100644
index a516c19..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/po/UserToken.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/AdminService.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/AdminService.class
deleted file mode 100644
index cc76081..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/AdminService.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/CourseService.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/CourseService.class
deleted file mode 100644
index 123af0e..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/CourseService.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/OrganizationService.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/OrganizationService.class
deleted file mode 100644
index 14e2557..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/OrganizationService.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/StudentService.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/StudentService.class
deleted file mode 100644
index 33b54bc..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/StudentService.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/TeacherService.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/TeacherService.class
deleted file mode 100644
index f069b26..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/TeacherService.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/AdminServiceImpl.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/AdminServiceImpl.class
deleted file mode 100644
index 1536b09..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/AdminServiceImpl.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/CourseServiceImpl.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/CourseServiceImpl.class
deleted file mode 100644
index def5b19..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/CourseServiceImpl.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/OrganizationServiceImpl.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/OrganizationServiceImpl.class
deleted file mode 100644
index c15016f..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/OrganizationServiceImpl.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/StudentServiceImpl.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/StudentServiceImpl.class
deleted file mode 100644
index 8d4a92b..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/StudentServiceImpl.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/TeacherServiceImpl.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/TeacherServiceImpl.class
deleted file mode 100644
index f9c2009..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/service/impl/TeacherServiceImpl.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseCommentView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseCommentView.class
deleted file mode 100644
index 3c06d07..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseCommentView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseDetailView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseDetailView.class
deleted file mode 100644
index 71abfba..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseDetailView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseTypeView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseTypeView.class
deleted file mode 100644
index 19edd8c..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseTypeView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseView.class
deleted file mode 100644
index c0c8997..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/CourseView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/DiscountCustomView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/DiscountCustomView.class
deleted file mode 100644
index 72c4d4f..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/DiscountCustomView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/OrdersCarListView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/OrdersCarListView.class
deleted file mode 100644
index 6267709..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/OrdersCarListView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentCourseEnrollView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentCourseEnrollView.class
deleted file mode 100644
index 74c42d2..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentCourseEnrollView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentView.class b/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentView.class
deleted file mode 100644
index 6ed78b5..0000000
Binary files a/Server/ArtEducation0331/build/classes/cn/itcast/ssm/view/StudentView.class and /dev/null differ
diff --git a/Server/ArtEducation0331/build/classes/db.properties b/Server/ArtEducation0331/build/classes/db.properties
deleted file mode 100644
index df24acd..0000000
--- a/Server/ArtEducation0331/build/classes/db.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://127.0.0.1:3306/artedu?characterEncoding=utf-8
-jdbc.username=root
-jdbc.password=123456
-
-
diff --git a/Server/ArtEducation0331/build/classes/log4j.properties b/Server/ArtEducation0331/build/classes/log4j.properties
deleted file mode 100644
index 0dda59a..0000000
--- a/Server/ArtEducation0331/build/classes/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Global logging configuration\uFF0C\u5EFA\u8BAE\u5F00\u53D1\u73AF\u5883\u4E2D\u8981\u7528debug
-log4j.rootLogger=DEBUG, stdout
-# Console output...
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] - %m%n
-
diff --git a/Server/ArtEducation0331/build/classes/mybatis/sqlMapConfig.xml b/Server/ArtEducation0331/build/classes/mybatis/sqlMapConfig.xml
deleted file mode 100644
index 3497ec5..0000000
--- a/Server/ArtEducation0331/build/classes/mybatis/sqlMapConfig.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration
-PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-
-<configuration>
-
-<!-- 全局setting配置 -->
-
-<!-- 定义别名 -->
-<typeAliases>
-  <!--批量扫描的方式定义别名  -->
-  <package name="cn.itcast.ssm.po"/>
-</typeAliases>
-
-<!-- 使用自动扫描器时，mapper.xml文件如果和mapper.java接口在一个目录则此处不用定义mappers --> 
-<!-- <mappers>
-<package name="cn.itcast.ssm.mapper" />
-</mappers> -->
-
-
-</configuration>
diff --git a/Server/ArtEducation0331/build/classes/spring/applicationContext-dao.xml b/Server/ArtEducation0331/build/classes/spring/applicationContext-dao.xml
deleted file mode 100644
index 2c2a1b0..0000000
--- a/Server/ArtEducation0331/build/classes/spring/applicationContext-dao.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd 
-		http://www.springframework.org/schema/mvc 
-		http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd 
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-3.2.xsd 
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-3.2.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-3.2.xsd ">
-		
-		
-<!-- 加载数据库配置文件 -->
-<context:property-placeholder location="classpath:db.properties"/>
-
-<!-- 配置数据库连接池 ，这里使用的是dbcp连接池-->
-<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" >
-       <property name="driverClassName" value="${jdbc.driver}"/>
-		<property name="url" value="${jdbc.url}"/>
-		<property name="username" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-		<property name="maxActive" value="100"/>
-		<property name="maxIdle" value="5"/>
-	<!-- 	<property name="validationQuery" value="select 1"/>
-		<property name="testWhileIdle" value="true"/>
-		<property name="timeBetweenEvictionRunsMillis" value="3600000"/>
-		<property name="minEvictableIdleTimeMillis" value="1800000"/>
-		<property name="testOnBorrow" value="true"/> -->
-		
-</bean>	
-
-
-<!--  让spring管理Sqlsessionfactory ，使用mybatis和spring整合包中的类 
-      不需要在代码中重复生成Sqlsessionfactory对象-->
-	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-		<!-- 数据库连接池 -->
-		<property name="dataSource" ref="dataSource" />
-		<!-- 加载mybatis的全局配置文件 -->
-		<property name="configLocation" value="classpath:mybatis/sqlMapConfig.xml" />
-	</bean>
-	
-<!-- mapper扫描器，在此配置后，不需要通过SqlSession对象的getMapper方法获取mapper接口的代理类的对象，可在代码中直接注入 -->
-<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-  <property name="basePackage" value="cn.itcast.ssm.mapper"></property>
-  <property name="sqlSessionFactoryBeanName" value="sqlSessionFactory"/>
-</bean>
-
-</beans>
diff --git a/Server/ArtEducation0331/build/classes/spring/applicationContext-service.xml b/Server/ArtEducation0331/build/classes/spring/applicationContext-service.xml
deleted file mode 100644
index 606fae0..0000000
--- a/Server/ArtEducation0331/build/classes/spring/applicationContext-service.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd 
-		http://www.springframework.org/schema/mvc 
-		http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd 
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-3.2.xsd 
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-3.2.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-3.2.xsd ">
-		
-<!-- 商品管理的service -->
-<bean id="studentService" class="cn.itcast.ssm.service.impl.StudentServiceImpl"/>
-<bean id="teacherService" class="cn.itcast.ssm.service.impl.TeacherServiceImpl"/>
-<bean id="organizationService" class="cn.itcast.ssm.service.impl.OrganizationServiceImpl"/>
-<bean id="courseService" class="cn.itcast.ssm.service.impl.CourseServiceImpl"/>
-
-</beans>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/build/classes/spring/applicationContext-transaction.xml b/Server/ArtEducation0331/build/classes/spring/applicationContext-transaction.xml
deleted file mode 100644
index e930287..0000000
--- a/Server/ArtEducation0331/build/classes/spring/applicationContext-transaction.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd 
-		http://www.springframework.org/schema/mvc 
-		http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd 
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-3.2.xsd 
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-3.2.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-3.2.xsd ">
-
-<!-- 事务管理器 
-	对mybatis操作数据库进行事务控制，spring使用jdbc的事务控制类
--->
-<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-	<!-- 数据源
-	dataSource在applicationContext-dao.xml中配置了
-	 -->
-	<property name="dataSource" ref="dataSource"/>
-</bean>
-
-<!-- 通知 -->
-<tx:advice id="txAdvice" transaction-manager="transactionManager">
-	<tx:attributes>
-		<!-- 传播行为 -->
-		<tx:method name="save*" propagation="REQUIRED"/>
-		<tx:method name="delete*" propagation="REQUIRED"/>
-		<tx:method name="insert*" propagation="REQUIRED"/>
-		<tx:method name="update*" propagation="REQUIRED"/>
-		<tx:method name="find*" propagation="SUPPORTS" read-only="true"/>
-		<tx:method name="get*" propagation="SUPPORTS" read-only="true"/>
-		<tx:method name="select*" propagation="SUPPORTS" read-only="true"/>
-	</tx:attributes>
-</tx:advice>
-
-<!-- aop ，这里的意思是对cn.itcast.ssm.service.impl包下的所有类的所有方法进行事务控制，这些方法在执行前后都会执行一些语句进行事务控制，
-     面向切面编程-->
-<aop:config>
-	<aop:advisor advice-ref="txAdvice" pointcut="execution(* cn.itcast.ssm.service.impl.*.*(..))"/>
-</aop:config>
-
-</beans>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/build/classes/spring/springmvc.xml b/Server/ArtEducation0331/build/classes/spring/springmvc.xml
deleted file mode 100644
index 35a3bbf..0000000
--- a/Server/ArtEducation0331/build/classes/spring/springmvc.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd 
-		http://www.springframework.org/schema/mvc 
-		http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd 
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-3.2.xsd 
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-3.2.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-3.2.xsd" >
-		
-		<!--定义处理器映射器的扫描包  -->
-		<context:component-scan base-package="cn.itcast.ssm.controller"></context:component-scan>
-		
-		<!-- 这里使用注解的处理器适配器和处理器映射器 -->
-		<mvc:annotation-driven > </mvc:annotation-driven>
-		
-		
-		<!--视图解析器，对modelandview进行解析，返回view 
-		解析 jsp视图，默认使用jstl 包-->
-		<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-		    <property name="prefix" value="/jsp/"/>
-		    <property name="suffix" value=".jsp" /> 
-		</bean>
-		
-		<!-- 自定义参数绑定 -->
-	<!-- <bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
-		转换器
-		<property name="converters">
-			<list>
-				日期类型转换
-				<bean class="cn.itcast.ssm.controller.converter.CustomDateConverter"/>
-			</list>
-		</property>
-	</bean> -->
-	
-	<!-- <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-	    <property name="maxUploadSize">
-	    上传图片的最大尺寸是5MB 
-	        <value>5242880</value>
-	    </property>
-	</bean> -->
-		
-</beans>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/config/spring/springmvc.xml b/Server/ArtEducation0331/config/spring/springmvc.xml
index 35a3bbf..5cd560a 100644
--- a/Server/ArtEducation0331/config/spring/springmvc.xml
+++ b/Server/ArtEducation0331/config/spring/springmvc.xml
@@ -41,11 +41,11 @@
 		</property>
 	</bean> -->
 	
-	<!-- <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
 	    <property name="maxUploadSize">
-	    上传图片的最大尺寸是5MB 
-	        <value>5242880</value>
+	    <!-- 上传图片的最大尺寸是5MB  -->
+	        <value>52428800</value>
 	    </property>
-	</bean> -->
+	</bean> 
 		
 </beans>
\ No newline at end of file
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/CourseController.java b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/CourseController.java
index 50b7541..a982f73 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/CourseController.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/CourseController.java
@@ -20,7 +20,7 @@ public class CourseController {
 
 	@Autowired
 	private CourseService courseService;
-	
+//	查询每个课程大类下的所有课程
 	@RequestMapping(value="/queryCoursesList.action")
 	public @ResponseBody List<CourseView> queryCoursesList(Integer courseTypeId) throws Exception{
 		List<CourseView> cvs = courseService.findCourseListByCId(courseTypeId);
@@ -36,6 +36,7 @@ public class CourseController {
 		return ctvs;
 	}
 	
+//	查询课程详情
 	@RequestMapping(value="/queryCourseDetail.action")
 	public @ResponseBody CourseDetailView queryCourseDetail(Integer courseId) throws Exception{
 		CourseDetailView cdv = courseService.findCourseDetailByCId(courseId);
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/StudentController.java b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/StudentController.java
index 808951b..eb9dbf3 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/StudentController.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/StudentController.java
@@ -23,6 +23,7 @@
 import cn.itcast.ssm.view.DiscountCustomView;
 import cn.itcast.ssm.view.OrdersCarListView;
 import cn.itcast.ssm.view.StudentCourseEnrollView;
+import cn.itcast.ssm.view.StudentCourseView;
 import cn.itcast.ssm.view.StudentView;
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
@@ -100,7 +101,7 @@ public void updateStuInfoSubmit(HttpServletRequest request,HttpServletResponse r
 	}
 	
 //	查询优惠券详细信息
-	@RequestMapping(value="queryDiscountDetail.action",method=RequestMethod.GET)
+	@RequestMapping(value="/queryDiscountDetail.action",method=RequestMethod.GET)
 	public @ResponseBody DiscountDetaileCustom queryDiscountDetail(Integer discountId)throws Exception{
 		DiscountDetaileCustom discountDetaileCustom=studentService.findDiscountDetailByDId(discountId);
 		System.out.println(discountDetaileCustom.toString());
@@ -217,6 +218,46 @@ public void deleteOrdersCar(HttpServletRequest request,HttpServletResponse respo
 	public @ResponseBody List<MyDiscountInfo> getDiscount(Integer studentId){
 		return studentService.getDiscount(studentId);
 	}
+	
+	@RequestMapping(value="/queryStuCourseList.action",method=RequestMethod.GET)
+	public @ResponseBody List<StudentCourseView> queryStuCourseList(Integer studentId){
+		return studentService.findStuCouViewBySId(studentId);
+	}
+	
+//  生成优惠码
+	@RequestMapping(value="/getDiscountNum.action",method=RequestMethod.POST)
+	public void getDiscountNum(HttpServletRequest request,HttpServletResponse response){
+		String data=request.getParameter("data");
+		JSONObject jsonObject=JSONObject.fromObject(data);
+		String resultCode=null;
+//		获取学生id
+		Integer studentId=Integer.parseInt(jsonObject.get("studentId").toString());
+		
+		String s=jsonObject.get("ids").toString();
+		JSONArray jsonArray=JSONArray.fromObject(s);
+		
+		try {
+			for(int i=0;i<jsonArray.size();i++){
+				Integer ordersCarId=Integer.parseInt(jsonArray.getJSONObject(i).get("id").toString());
+				Integer courseId=Integer.parseInt(jsonArray.getJSONObject(i).get("courseId").toString());
+				studentService.insertDiscountNum(studentId, courseId, ordersCarId);
+			}
+			resultCode="{\"resultCode\":0}";
+		} catch (NumberFormatException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			resultCode="{\"resultCode\":9001}";
+		}
+		
+		
+		try {
+			PrintWriter ps=response.getWriter();
+			ps.write(resultCode);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 }
 
 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/TeacherController.java b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/TeacherController.java
index 243e311..df56f26 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/controller/TeacherController.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/controller/TeacherController.java
@@ -1,15 +1,29 @@
 package cn.itcast.ssm.controller;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import cn.itcast.ssm.po.TeacherCustom;
 import cn.itcast.ssm.service.TeacherService;
+import cn.itcast.ssm.view.TeacherCoursesView;
+import cn.itcast.ssm.view.TeacherDiplomaInfoView;
 
 @Controller
 @RequestMapping(value="/teacher")
@@ -20,25 +34,134 @@ public class TeacherController {
 	
 //	教师登录
 	@RequestMapping(value="/login.action",method=RequestMethod.POST)
-	public ModelAndView login(HttpServletRequest request,HttpServletResponse response){
+	public String login(HttpServletRequest request,HttpSession session){
 		String account=request.getParameter("username");
 		String password=request.getParameter("password");
 		
 		String resultCode=teacherService.login(account,password);
 		String[] resultCodes=resultCode.split(" ");
-		
-		ModelAndView modelAndView=new ModelAndView();
+	
 		if(!resultCodes[0].equals("0")){
-			modelAndView.addObject("resultCode", resultCodes[0]);
-			modelAndView.setViewName("index");
-			return modelAndView;
+//			modelAndView.addObject("resultCode", resultCodes[0]);
+//			modelAndView.setViewName("redirect:/jsp/index.jsp");
+			session.setAttribute("resultCode", resultCodes[0]);
+			return "redirect:/jsp/index.jsp";
+//			redirectAttributes.addFlashAttribute("resultCode", resultCodes[0]);
+//			return "redirect:/jsp/index.jsp";
 		}else{
-			modelAndView.addObject("resultCode", resultCodes[0]);
-			modelAndView.addObject("studentId", resultCodes[1]);
-			modelAndView.setViewName("");
-			return modelAndView;
-			
+//			modelAndView.addObject("resultCode", resultCodes[0]);
+//			modelAndView.addObject("studentId", resultCodes[1]);
+//			modelAndView.setViewName("redirect:/jsp/teacher/tm.html");
+//			return modelAndView;
+			int teacherId=Integer.parseInt(resultCodes[1]);
+			TeacherCustom tc=teacherService.findTeacherById(teacherId);
+			List<TeacherCoursesView> teacherCoursesViews=teacherService.findTeacherCourses(teacherId);
+			session.setAttribute("teacherCustom", tc);
+			session.setAttribute("teacherCoursesViews", teacherCoursesViews);
+			return "redirect:/jsp/teacher/tm.jsp";
+		}
+	}
+	
+//	编辑教师认证信息
+	@RequestMapping(value="/editTeacherDipPic.action",method=RequestMethod.POST)
+	public String  editTeacherDipPic(HttpServletRequest request,
+			TeacherCustom tc,
+            HttpSession session,
+            MultipartFile idPic, //接受身份证的图片
+            MultipartFile diplomaPic,
+            MultipartFile masterDiplomaPic
+            ) throws IllegalStateException, IOException{
+		
+//		存储图片的物理路径
+		String pic_path="/Users/linbo/Documents/test/";
+		System.out.println(tc);
+
+//		图片的原始名称
+		String idPicFilename=idPic.getOriginalFilename();
+		if(idPic!=null&&idPicFilename!=null&&idPicFilename.length()>0){
+//			新的图片名称
+			String newFileName=UUID.randomUUID()+idPicFilename.substring(idPicFilename.lastIndexOf('.'));
+//			新图片
+			File newFile=new File(pic_path+newFileName);
+//			将内存中的数据写入磁盘
+			idPic.transferTo(newFile);
+//			将新的图片名称写进itemsCustom中
+			tc.setIdPic(newFileName);
+		}
+		
+//		图片的原始名称
+		String diplomaPicFilename=diplomaPic.getOriginalFilename();
+		if(diplomaPic!=null&&diplomaPicFilename!=null&&diplomaPicFilename.length()>0){
+//			新的图片名称
+			String newFileName=UUID.randomUUID()+diplomaPicFilename.substring(diplomaPicFilename.lastIndexOf('.'));
+//			新图片
+			File newFile=new File(pic_path+newFileName);
+//			将内存中的数据写入磁盘
+			diplomaPic.transferTo(newFile);
+//			将新的图片名称写进itemsCustom中
+			tc.setDiplomaPic(newFileName);
+		}
+		
+//		图片的原始名称
+		String masterDiplomaPicFilename=masterDiplomaPic.getOriginalFilename();
+		if(masterDiplomaPic!=null&&masterDiplomaPicFilename!=null&&masterDiplomaPicFilename.length()>0){
+//			新的图片名称
+			String newFileName=UUID.randomUUID()+masterDiplomaPicFilename.substring(masterDiplomaPicFilename.lastIndexOf('.'));
+//			新图片
+			File newFile=new File(pic_path+newFileName);
+//			将内存中的数据写入磁盘
+			masterDiplomaPic.transferTo(newFile);
+//			将新的图片名称写进itemsCustom中
+			tc.setMasterDiplomaPic(newFileName);
 		}
+		
+		String resultCode=teacherService.editTeacherDiplomaInfo(tc);
+		System.out.println("*************");
+		System.out.println(resultCode);
+		System.out.println("*************");
+//		ModelAndView modelAndView=new ModelAndView();
+//		modelAndView.setViewName("submitDiplomaInfo");
+	
+		TeacherCustom newTc=teacherService.findTeacherById(tc.getTeacherId());
+		session.removeAttribute("teacherCustom");
+		session.setAttribute("teacherCustom", newTc);
+		return "redirect:/jsp/teacher/tm-identity.jsp";
+//		model.addAttribute("resultCode", resultCode);
+//		return "submitDiplomaInfo";
+	}
+	
+	
+//	查询教师的认证图片信息
+	@RequestMapping(value="/findDiplomaInfo.action")
+	public ModelAndView findDiplomaInfo(Integer teacherId){
+		TeacherDiplomaInfoView tdiv=teacherService.findDiplomaInfo(teacherId);
+		ModelAndView modelAndView=new ModelAndView();
+		modelAndView.addObject("tdiv", tdiv);
+//		return "redirect:/jsp/submitDiplomaInfo.jsp";
+		modelAndView.setViewName("submitDiplomaInfo");
+		return modelAndView;
 	}
 	
+	
+//	编辑教师信息
+	@RequestMapping(value="/editTeacherInfo.action",method=RequestMethod.POST)
+	public String editTeacherInfo(TeacherCustom teacherCustom,HttpSession session){
+		String editTeacherInfo=teacherService.editTeacherInfo(teacherCustom);
+		session.setAttribute("editTeacherInfo", editTeacherInfo);
+		TeacherCustom tc=teacherService.findTeacherById(teacherCustom.getTeacherId());
+		session.removeAttribute("teacherCustom");
+		session.setAttribute("teacherCustom", tc);
+		return "redirect:/jsp/teacher/tm-profile.jsp";
+	}
 }
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/CourseMapper.xml b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/CourseMapper.xml
index bdf1252..8c226d3 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/CourseMapper.xml
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/CourseMapper.xml
@@ -18,7 +18,8 @@
 	
 	<!-- 根据课程ID，查询课程详情 -->
 	<select id="findCourseDetailByCId" parameterType="java.lang.Integer" resultMap="courseDetailMap">
-		select c.*,t.*,o.*,cs.*, s.* from t_course c,t_teacher t,t_organization o,t_coursestudent cs,t_student s where c.courseId=1 and c.teacherId=t.teacherId and t.organizationId=o.organizationId and cs.courseId= c.courseId and cs.studentId=s.studentId
+		select c.*,t.*,o.*,cs.* from t_course c left join t_coursestudent cs on cs.courseId=c.courseId ,t_teacher t,t_organization o  
+		where c.courseId=#{courseId} and c.teacherId=t.teacherId and t.organizationId=o.organizationId
 	</select>
 	
 	<resultMap type="courseDetailCustom" id="courseDetailMap">
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.java b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.java
index 133533a..9167453 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.java
@@ -5,11 +5,13 @@
 import cn.itcast.ssm.po.CourseCustom;
 import cn.itcast.ssm.po.DiscountCustom;
 import cn.itcast.ssm.po.DiscountDetaileCustom;
+import cn.itcast.ssm.po.DiscountNum;
 import cn.itcast.ssm.po.MyDiscountInfo;
 import cn.itcast.ssm.po.OrdersCarCustom;
 import cn.itcast.ssm.po.OrdersCarInfo;
 import cn.itcast.ssm.po.OrdersCarList;
 import cn.itcast.ssm.po.Student;
+import cn.itcast.ssm.po.StudentCourseCustom;
 import cn.itcast.ssm.po.StudentCustom;
 
 public interface StudentMapper {
@@ -52,7 +54,12 @@ public interface StudentMapper {
  	
 // 	获取优惠券信息
  	public List<MyDiscountInfo> getDiscount(Integer studentId);
+ 	
+//  根据学生id获取学生所有课程 	
+	public List<StudentCourseCustom> findStuCourseByStudentId(Integer studentId);
 	
+//	领取优惠码
+	public void insertDiscountNum(DiscountNum discountNum);
 }
 
 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.xml b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.xml
index ad57ac9..556b695 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.xml
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/StudentMapper.xml
@@ -103,6 +103,13 @@
  	   where ordersCarId=#{ordersCarId}
  	</delete>
  	
+ 	<!-- 领取优惠码 -->
+ 	<insert id="insertDiscountNum" parameterType="discountNum">
+ 	   insert 
+ 	   into t_discount(discountCode,studentId,courseId)
+ 	   values(#{discountCode},#{studentId},#{courseId})
+ 	</insert>
+ 	
  	<!--获取优惠券信息  -->
  	<select id="getDiscount" parameterType="java.lang.Integer" resultType="myDiscountInfo">
  	   select t_discount.courseId,discountStatus,discountCode,t_course.courseName,t_teacher.teacherName,
@@ -111,6 +118,13 @@
  	   where t_discount.studentId=#{studentId} and t_discount.courseId=t_course.courseId and 
  	      t_course.teacherId=t_teacher.teacherId and t_teacher.organizationId=t_organization.organizationId
  	</select>
+ 	
+ 	<select id="findStuCourseByStudentId" parameterType="java.lang.Integer" resultType="studentCourseCustom">
+ 		select c.*,t.teacherName,o.organizationName,ct.studentId 
+ 		from t_coursestudent ct ,t_course c ,t_organization o ,t_teacher t 
+ 		where ct.studentId = #{studentId} and 
+			ct.courseId = c.courseId and c.teacherId = t.teacherId and o.organizationId = t.organizationId
+ 	</select>
 </mapper>
 
 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.java b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.java
index 35cca2a..2c9c16a 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.java
@@ -1,13 +1,28 @@
 package cn.itcast.ssm.mapper;
 
+import java.util.List;
+
+import cn.itcast.ssm.po.TeacherCourses;
 import cn.itcast.ssm.po.TeacherCustom;
 
 public interface TeacherMapper {
 
+//	根据教师的id来查询教师的信息
+	public TeacherCustom findTeacherById(Integer teacherId);
+	
 //	根据教师的用户名查询教师信息
 	public TeacherCustom findTeacherByName(String studentName);
 	
 //	根据教师用户名或邮箱查询教师的信息，教师的邮箱也是唯一的
 	public TeacherCustom findTeacherByNameOrEmail(String userName);
 	
+//	编辑教师认证信息
+	public void editTeacherDiplomaInfo(TeacherCustom teacherCustom);
+	
+//	查询教师的课程
+	public List<TeacherCourses> findTeacherCourses(Integer teacherId);
+	
+//	编辑教师信息
+	public void editTeacherInfo(TeacherCustom teacherCustom);
+	
 }
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.xml b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.xml
index 6e740e5..4ba46c4 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.xml
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/mapper/TeacherMapper.xml
@@ -7,9 +7,44 @@
         select teacherId,password from t_teacher where teacherName=#{value}
     </select>
     
-    <!--  根据教师的邮箱，来查询教师的信息-->
+      <!-- 根据教师的id来查询教师的信息 -->
+    <select id="findTeacherById"  parameterType="java.lang.Integer" resultType="teachercustom">
+        select * from t_teacher where teacherId=#{value}
+    </select>
+    
+    <!--  根据教师的邮箱或教师的用户名来查询教师的信息-->
     <select id="findTeacherByNameOrEmail" parameterType="java.lang.String" resultType="teacherCustom">
        select teacherId,password from t_teacher where teacherName=#{value} or email=#{value}
     </select>
+    
+    <!-- 编辑教师的认证信息 -->
+    <update id="editTeacherDiplomaInfo" parameterType="teacherCustom" >
+         update t_teacher
+         set idPic=#{idPic},diplomaPic=#{diplomaPic},masterDiplomaPic=#{masterDiplomaPic}
+         where teacherId=#{teacherId}
+    </update>
+    
+    <!--  查询教师的课程-->
+    <select id="findTeacherCourses" parameterType="java.lang.Integer" resultType="teacherCourses">
+       select t_course.*
+       from t_course
+       where t_course.teacherId=#{value} 
+    </select>
+    
+    <!-- 编辑教师信息 -->
+    <update id="editTeacherInfo" parameterType="teacherCustom" >
+        update t_teacher
+        set email=#{email},teacherName=#{teacherName},realName=#{realName},gender=#{gender},teacherAge=#{teacherAge},
+            idNumber=#{idNumber},preference=#{preference},education=#{education},seniority=#{seniority},phone=#{phone},
+            teacherType=#{teacherType},description=#{description}
+        where teacherId=#{teacherId}
+    </update>
  
-</mapper>
\ No newline at end of file
+</mapper>
+
+
+
+
+
+
+
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/po/Course.java b/Server/ArtEducation0331/src/cn/itcast/ssm/po/Course.java
index 2885651..684c922 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/po/Course.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/po/Course.java
@@ -15,7 +15,7 @@ public class Course {
 
     private String courseDesc;
 
-    private Date teachTime;
+    private String teachTime;
 
     private String totalStarLevel;
 
@@ -35,7 +35,7 @@ public class Course {
 
     private Integer realStuNum;
 
-    private Integer courseStatus;
+    private String courseStatus;
 
     private String discountUseInfo;
 
@@ -87,11 +87,11 @@ public void setCourseDesc(String courseDesc) {
         this.courseDesc = courseDesc == null ? null : courseDesc.trim();
     }
 
-    public Date getTeachTime() {
+    public String getTeachTime() {
         return teachTime;
     }
 
-    public void setTeachTime(Date teachTime) {
+    public void setTeachTime(String teachTime) {
         this.teachTime = teachTime;
     }
 
@@ -167,11 +167,11 @@ public void setRealStuNum(Integer realStuNum) {
         this.realStuNum = realStuNum;
     }
 
-    public Integer getCourseStatus() {
+    public String getCourseStatus() {
         return courseStatus;
     }
 
-    public void setCourseStatus(Integer courseStatus) {
+    public void setCourseStatus(String courseStatus) {
         this.courseStatus = courseStatus;
     }
 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/po/DiscountNum.java b/Server/ArtEducation0331/src/cn/itcast/ssm/po/DiscountNum.java
new file mode 100644
index 0000000..2a53eaf
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/po/DiscountNum.java
@@ -0,0 +1,5 @@
+package cn.itcast.ssm.po;
+
+public class DiscountNum extends Discount{
+
+}
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/po/StudentCourseCustom.java b/Server/ArtEducation0331/src/cn/itcast/ssm/po/StudentCourseCustom.java
new file mode 100644
index 0000000..4e7bf49
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/po/StudentCourseCustom.java
@@ -0,0 +1,26 @@
+package cn.itcast.ssm.po;
+
+public class StudentCourseCustom extends Course{
+	private String teacherName;
+	private String organizationName;
+	private Integer studentId;
+	public String getTeacherName() {
+		return teacherName;
+	}
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
+	public String getOrganizationName() {
+		return organizationName;
+	}
+	public void setOrganizationName(String organizationName) {
+		this.organizationName = organizationName;
+	}
+	public Integer getStudentId() {
+		return studentId;
+	}
+	public void setStudentId(Integer studentId) {
+		this.studentId = studentId;
+	}
+	
+}
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/po/Teacher.java b/Server/ArtEducation0331/src/cn/itcast/ssm/po/Teacher.java
index ea6b850..e01a40d 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/po/Teacher.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/po/Teacher.java
@@ -32,10 +32,53 @@ public class Teacher {
     private String description;
 
     private Integer status;
-
-    private Integer teacherType;
-
-    public Integer getTeacherId() {
+    
+    private String idNumber;
+
+    private String teacherType;
+    
+    private String idPic;
+    
+    private String diplomaPic;
+    
+    private String masterDiplomaPic;
+    
+
+    
+    public String getIdNumber() {
+		return idNumber;
+	}
+
+	public void setIdNumber(String idNumber) {
+		this.idNumber = idNumber;
+	}
+
+	
+	public String getIdPic() {
+		return idPic;
+	}
+
+	public void setIdPic(String idPic) {
+		this.idPic = idPic;
+	}
+
+	public String getDiplomaPic() {
+		return diplomaPic;
+	}
+
+	public void setDiplomaPic(String diplomaPic) {
+		this.diplomaPic = diplomaPic;
+	}
+
+	public String getMasterDiplomaPic() {
+		return masterDiplomaPic;
+	}
+
+	public void setMasterDiplomaPic(String masterDiplomaPic) {
+		this.masterDiplomaPic = masterDiplomaPic;
+	}
+
+	public Integer getTeacherId() {
         return teacherId;
     }
 
@@ -163,11 +206,24 @@ public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public Integer getTeacherType() {
+    public String getTeacherType() {
         return teacherType;
     }
 
-    public void setTeacherType(Integer teacherType) {
+    public void setTeacherType(String teacherType) {
         this.teacherType = teacherType;
     }
+
+	@Override
+	public String toString() {
+		return "Teacher [teacherId=" + teacherId + ", teacherCode=" + teacherCode + ", teacherName=" + teacherName
+				+ ", password=" + password + ", email=" + email + ", headPortraits=" + headPortraits + ", realName="
+				+ realName + ", gender=" + gender + ", teacherAge=" + teacherAge + ", preference=" + preference
+				+ ", phone=" + phone + ", seniority=" + seniority + ", organizationId=" + organizationId
+				+ ", education=" + education + ", description=" + description + ", status=" + status + ", idNumber="
+				+ idNumber + ", teacherType=" + teacherType + ", idPic=" + idPic + ", diplomaPic=" + diplomaPic
+				+ ", masterDiplomaPic=" + masterDiplomaPic + "]";
+	}
+    
+    
 }
\ No newline at end of file
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/po/TeacherCourses.java b/Server/ArtEducation0331/src/cn/itcast/ssm/po/TeacherCourses.java
new file mode 100644
index 0000000..c8024b8
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/po/TeacherCourses.java
@@ -0,0 +1,5 @@
+package cn.itcast.ssm.po;
+
+public class TeacherCourses extends Course{
+
+}
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/service/StudentService.java b/Server/ArtEducation0331/src/cn/itcast/ssm/service/StudentService.java
index bb5e610..c75ccca 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/service/StudentService.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/service/StudentService.java
@@ -4,6 +4,7 @@
 
 import cn.itcast.ssm.po.CourseCustom;
 import cn.itcast.ssm.po.DiscountDetaileCustom;
+import cn.itcast.ssm.po.DiscountNum;
 import cn.itcast.ssm.po.MyDiscountInfo;
 import cn.itcast.ssm.po.OrdersCarCustom;
 import cn.itcast.ssm.po.OrdersCarInfo;
@@ -12,6 +13,7 @@
 import cn.itcast.ssm.view.DiscountCustomView;
 import cn.itcast.ssm.view.OrdersCarListView;
 import cn.itcast.ssm.view.StudentCourseEnrollView;
+import cn.itcast.ssm.view.StudentCourseView;
 import cn.itcast.ssm.view.StudentView;
 
 
@@ -65,4 +67,11 @@ public interface StudentService {
  	
 // 	获取优惠券信息
  	public List<MyDiscountInfo> getDiscount(Integer studentId);
-}
+ 	
+//  根据学生id查询学生课程
+ 	public List<StudentCourseView> findStuCouViewBySId(Integer studentId);
+ 	
+//	插入优惠码
+	public void insertDiscountNum(Integer studentId,Integer courseId,Integer ordersCarId);
+
+} 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/service/TeacherService.java b/Server/ArtEducation0331/src/cn/itcast/ssm/service/TeacherService.java
index a3e5a40..7c3e59c 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/service/TeacherService.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/service/TeacherService.java
@@ -1,13 +1,32 @@
 package cn.itcast.ssm.service;
 
+import java.util.List;
+
+import cn.itcast.ssm.po.TeacherCourses;
 import cn.itcast.ssm.po.TeacherCustom;
+import cn.itcast.ssm.view.TeacherCoursesView;
+import cn.itcast.ssm.view.TeacherDiplomaInfoView;
 
 public interface TeacherService {
 
+//	根据教师的id来查询教师的信息
+	public TeacherCustom findTeacherById(Integer teacherId);
+	
 //	根据教师用户名或邮箱查询教师信息
 	public TeacherCustom findTeacherByNameOrEmail(String userName);
 	
 // 教师登录
 	public String login(String account,String password);
 	
+//	编辑教师的认证信息
+	public String editTeacherDiplomaInfo(TeacherCustom teacherCustom);
+
+//	查询身份认证信息
+	public TeacherDiplomaInfoView findDiplomaInfo(Integer teacherId);
+	
+//	查询教师的课程
+	public List<TeacherCoursesView> findTeacherCourses(Integer teacherId);
+	
+//	编辑教师信息
+	public String editTeacherInfo(TeacherCustom teacherCustom);
 }
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/CourseServiceImpl.java b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/CourseServiceImpl.java
index 1b854da..c35d362 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/CourseServiceImpl.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/CourseServiceImpl.java
@@ -54,27 +54,6 @@ public List<CourseTypeView> findCourseTypeList() throws Exception{
 		return ctvs;
 	}
 	
-	
-//	查询课程详情
-	@Override
-	public CourseDetailView findCourseDetailByCId(Integer courseId) throws Exception {
-		// TODO Auto-generated method stub
-		CourseDetailCustom cdc = courseMapping.findCourseDetailByCId(courseId);
-//		if(cdc != null){
-//			System.out.println(cdc.getCourseName()+" "+cdc.getTeacherCustom().getTeacherName()+" "+cdc.getTeacherCustom().getOrganizationCustom().getOrganizationName());
-//			System.out.println(cdc.getComments().size());
-//			System.out.println(cdc.getComments().get(0).getStudentCustom().getStudentName());
-//			System.out.println(cdc.getComments().get(1).getStudentCustom().getStudentName());
-//		}else{
-//			System.out.println("-----null");
-//		}
-		if(cdc != null){
-			CourseDetailView cdv = TransToCourseDetailView(cdc);
-			return cdv;
-		}
-		return null;
-	}
-	
 	private CourseView transToCourseView(CourseCustom cc){
 		System.out.println(cc.toString());
 		CourseView cv = new CourseView();
@@ -94,6 +73,19 @@ private CourseTypeView transToCourseTypeView(CourseTypeCustom ctc){
 		return ctv;
 	}
 
+//	查询课程详情
+	@Override
+	public CourseDetailView findCourseDetailByCId(Integer courseId) throws Exception {
+		// TODO Auto-generated method stub
+		CourseDetailCustom cdc = courseMapping.findCourseDetailByCId(courseId);
+
+		if(cdc != null){
+			CourseDetailView cdv = TransToCourseDetailView(cdc);
+			return cdv;
+		}
+		return null;
+	}
+	
 	private CourseDetailView TransToCourseDetailView(CourseDetailCustom cdc){
 		List<CourseCommentView> ccvs = new LinkedList<CourseCommentView>();
 		CourseDetailView cdv = new CourseDetailView();
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/StudentServiceImpl.java b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/StudentServiceImpl.java
index f004158..2ed0125 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/StudentServiceImpl.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/StudentServiceImpl.java
@@ -2,7 +2,9 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -10,16 +12,19 @@
 import cn.itcast.ssm.po.CourseCustom;
 import cn.itcast.ssm.po.DiscountCustom;
 import cn.itcast.ssm.po.DiscountDetaileCustom;
+import cn.itcast.ssm.po.DiscountNum;
 import cn.itcast.ssm.po.MyDiscountInfo;
 import cn.itcast.ssm.po.OrdersCarCustom;
 import cn.itcast.ssm.po.OrdersCarInfo;
 import cn.itcast.ssm.po.OrdersCarList;
 import cn.itcast.ssm.po.Student;
+import cn.itcast.ssm.po.StudentCourseCustom;
 import cn.itcast.ssm.po.StudentCustom;
 import cn.itcast.ssm.service.StudentService;
 import cn.itcast.ssm.view.DiscountCustomView;
 import cn.itcast.ssm.view.OrdersCarListView;
 import cn.itcast.ssm.view.StudentCourseEnrollView;
+import cn.itcast.ssm.view.StudentCourseView;
 import cn.itcast.ssm.view.StudentView;
 
 
@@ -89,12 +94,7 @@ private StudentView transToStudentView(StudentCustom sc){
 		sv.setEmail(sc.getEmail());
 		sv.setHeadPortraits(sc.getHeadPortraits());
 		sv.setStudentAge(sc.getStudentAge());
-		sv.setRealName(sc.getRealName());
-		if(sc.getGender().equals("男")){
-			sv.setGender("男");
-		}else if(sc.getGender().equals("女")){
-			sv.setGender("女");
-		}
+		sv.setPhone(sc.getPhone());
 		sv.setPreference(sc.getPreference());
 		return sv;
 	}
@@ -317,6 +317,47 @@ public List<MyDiscountInfo> getDiscount(Integer studentId) {
 		// TODO Auto-generated method stub
 		return studentMapper.getDiscount(studentId);
 	}
+
+	@Override
+	public List<StudentCourseView> findStuCouViewBySId(Integer studentId) {
+		// TODO Auto-generated method stub
+		List<StudentCourseCustom> studentCourseCustomList = studentMapper.findStuCourseByStudentId(studentId);
+		List<StudentCourseView> studentCourseViewList = new LinkedList<>();
+		for(StudentCourseCustom scc : studentCourseCustomList){
+			studentCourseViewList.add(transToStudentCourseView(scc));
+		}
+		return studentCourseViewList;
+	}
+	
+	private StudentCourseView transToStudentCourseView(StudentCourseCustom scc){
+		StudentCourseView scv = new StudentCourseView();
+		scv.setStudentId(scc.getStudentId());
+		scv.setCourseId(scc.getCourseId());
+		scv.setCourseName(scc.getCourseName());
+		scv.setTeacherName(scc.getTeacherName());
+		scv.setTeachAddress(scc.getTeachAddress());
+		scv.setOrganizationName(scc.getOrganizationName());
+		return scv;
+	}
+
+//	生成优惠码
+	@Override
+	public void insertDiscountNum(Integer studentId,Integer courseId,Integer ordersCarId) {
+		// TODO Auto-generated method stub
+		DiscountNum discountNum=new DiscountNum();
+		discountNum.setStudentId(studentId);
+		discountNum.setCourseId(courseId);
+		Random rand=new Random();
+		StringBuilder sb=new StringBuilder();
+		for(int i=0;i<6;i++){
+			sb.append(rand.nextInt(10));
+		}
+		String discountCode=sb.toString();
+		discountNum.setDiscountCode(discountCode);
+//		生成优惠码的同时将购物车列表中的课程删除
+		studentMapper.insertDiscountNum(discountNum);
+		studentMapper.deleteOrdersCar(ordersCarId);
+	}
 }
 
 
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/TeacherServiceImpl.java b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/TeacherServiceImpl.java
index 1f687d2..f9d64f2 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/TeacherServiceImpl.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/service/impl/TeacherServiceImpl.java
@@ -1,11 +1,17 @@
 package cn.itcast.ssm.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import cn.itcast.ssm.mapper.TeacherMapper;
 import cn.itcast.ssm.po.Teacher;
+import cn.itcast.ssm.po.TeacherCourses;
 import cn.itcast.ssm.po.TeacherCustom;
 import cn.itcast.ssm.service.TeacherService;
+import cn.itcast.ssm.view.TeacherCoursesView;
+import cn.itcast.ssm.view.TeacherDiplomaInfoView;
 
 public class TeacherServiceImpl implements TeacherService{
 
@@ -42,7 +48,132 @@ public String login(String account, String password) {
 		}
 		
 	}
+
+//	编辑教师认证信息
+	@Override
+	public String editTeacherDiplomaInfo(TeacherCustom teacherCustom) {
+		// TODO Auto-generated method stub
+		try {
+			teacherMapper.editTeacherDiplomaInfo(teacherCustom);
+			return "0";
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return "9001";
+		}
+	}
+
+//	根据教师id 查询教师信息
+	@Override
+	public TeacherCustom findTeacherById(Integer teacherId) {
+		// TODO Auto-generated method stub
+		try {
+			TeacherCustom tc=teacherMapper.findTeacherById(teacherId);
+			return tc;
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return null;
+		}
+	}
 	
-	
+//	查询教师的认证图片信息
+	@Override
+	public TeacherDiplomaInfoView findDiplomaInfo(Integer teacherId){
+		TeacherCustom tc=teacherMapper.findTeacherById(teacherId);
+		if(tc==null){
+			return null;
+		}else{
+			TeacherDiplomaInfoView tdiv=new TeacherDiplomaInfoView();
+			tdiv.setIdPic(tc.getIdPic());
+			tdiv.setDiplomaPic(tc.getDiplomaPic());
+			tdiv.setMasterDiplomaPic(tc.getMasterDiplomaPic());
+			return tdiv;
+		}
+	}
+
+	@Override
+	public List<TeacherCoursesView> findTeacherCourses(Integer teacherId) {
+		List<TeacherCourses> teacherCourses=teacherMapper.findTeacherCourses(teacherId);
+		List<TeacherCoursesView> teacherCoursesViews=new ArrayList<>();
+		if(teacherCourses!=null){
+			for(TeacherCourses tc:teacherCourses){
+				teacherCoursesViews.add(transportToTCView(tc));
+			}
+			return teacherCoursesViews;
+		}
+		return null;
+	}
+
+	public TeacherCoursesView transportToTCView(TeacherCourses tc){
+		TeacherCoursesView tcv=new TeacherCoursesView();
+		String teachTime=tc.getTeachTime();
+		String[] teachTimes=teachTime.split(" ");
+		tcv.setStartTime(teachTimes[0]);
+		tcv.setEndTime(teachTimes[1]);
+//		tcv.setClassTime(teachTimes[2]);
+		tcv.setCourseId(tc.getCourseId());
+		tcv.setCourseName(tc.getCourseName());
+		if(tc.getCourseStatus().equals("1001")){
+			tcv.setCourseStatus("审核不通过");
+		}else if(tc.getCourseStatus().equals("1002")){
+			tcv.setCourseStatus("待审核");
+		}else if(tc.getCourseStatus().equals("1003")){
+			tcv.setCourseStatus("未招满");
+		}else if(tc.getCourseStatus().equals("1004")){
+			tcv.setCourseStatus("已招满");
+		}else if(tc.getCourseStatus().equals("1005")){
+			tcv.setCourseStatus("已停课");
+		}else if(tc.getCourseStatus().equals("1006")){
+			tcv.setCourseStatus("正在上课");
+		}else {
+			tcv.setCourseStatus("历史课程");
+		}
+		tcv.setTeachAddress(tc.getTeachAddress());
+		tcv.setTeacherId(tc.getTeacherId());
+		return tcv;
+	}
 
+//	编辑教师基本信息
+	@Override
+	public String editTeacherInfo(TeacherCustom teacherCustom) {
+		// TODO Auto-generated method stub
+		TeacherCustom tc=teacherMapper.findTeacherByNameOrEmail(teacherCustom.getTeacherName());
+		if(tc!=null&&tc.getTeacherId()!=teacherCustom.getTeacherId()){
+//			System.out.println("******************");
+//			System.out.println(teacherCustom.getTeacherName());
+//			System.out.println("******************");
+			return "9002";
+		}
+		tc=teacherMapper.findTeacherByNameOrEmail(teacherCustom.getEmail());
+		if(tc!=null&&tc.getTeacherId()!=teacherCustom.getTeacherId()){
+			return "9001";
+		}else{
+			try {
+				teacherMapper.editTeacherInfo(teacherCustom);
+				return "0";
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+				return "9009";
+			}
+		}
+	}
+	
+	
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/view/CourseDetailView.java b/Server/ArtEducation0331/src/cn/itcast/ssm/view/CourseDetailView.java
index 48cfefa..901671c 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/view/CourseDetailView.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/view/CourseDetailView.java
@@ -8,7 +8,7 @@ public class CourseDetailView {
 	private String teacherName;
 	private String mainImage;
 	private String courseDesc;
-	private Integer courseStatus;
+	private String courseStatus;
 	private String education;
 	private Integer seniority;
 	private String description;
@@ -47,10 +47,10 @@ public String getCourseDesc() {
 	public void setCourseDesc(String courseDesc) {
 		this.courseDesc = courseDesc;
 	}
-	public Integer getCourseStatus() {
+	public String getCourseStatus() {
 		return courseStatus;
 	}
-	public void setCourseStatus(Integer courseStatus) {
+	public void setCourseStatus(String courseStatus) {
 		this.courseStatus = courseStatus;
 	}
 	public String getEducation() {
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentCourseView.java b/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentCourseView.java
new file mode 100644
index 0000000..7a4db79
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentCourseView.java
@@ -0,0 +1,47 @@
+package cn.itcast.ssm.view;
+
+public class StudentCourseView {
+	private Integer studentId;
+	private Integer courseId;
+	private String courseName;
+	private String teacherName;
+	private String teachAddress;
+	private String organizationName;
+	public Integer getStudentId() {
+		return studentId;
+	}
+	public void setStudentId(Integer studentId) {
+		this.studentId = studentId;
+	}
+	public Integer getCourseId() {
+		return courseId;
+	}
+	public void setCourseId(Integer courseId) {
+		this.courseId = courseId;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getTeacherName() {
+		return teacherName;
+	}
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
+	public String getTeachAddress() {
+		return teachAddress;
+	}
+	public void setTeachAddress(String teachAddress) {
+		this.teachAddress = teachAddress;
+	}
+	public String getOrganizationName() {
+		return organizationName;
+	}
+	public void setOrganizationName(String organizationName) {
+		this.organizationName = organizationName;
+	}
+	
+}
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentView.java b/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentView.java
index e19eab9..7214aa6 100644
--- a/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentView.java
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/view/StudentView.java
@@ -6,9 +6,15 @@ public class StudentView {
 	private String email;
 	private String headPortraits;
 	private Integer studentAge;
-	private String realName;
-	private String gender;
+	private String phone;
 	private String preference;
+
+	public String getPhone() {
+		return phone;
+	}
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
 	public Integer getStudentId() {
 		return studentId;
 	}
@@ -40,29 +46,11 @@ public Integer getStudentAge() {
 	public void setStudentAge(Integer studentAge) {
 		this.studentAge = studentAge;
 	}
-	public String getRealName() {
-		return realName;
-	}
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-	public String getGender() {
-		return gender;
-	}
-	public void setGender(String gender) {
-		this.gender = gender;
-	}
+	
 	public String getPreference() {
 		return preference;
 	}
 	public void setPreference(String preference) {
 		this.preference = preference;
 	}
-	@Override
-	public String toString() {
-		return "StudentView [studentId=" + studentId + ", studentName=" + studentName + ", email=" + email
-				+ ", headPortraits=" + headPortraits + ", studentAge=" + studentAge + ", realName=" + realName
-				+ ", gender=" + gender + ", preference=" + preference + "]";
-	}
-	
 }
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherCoursesView.java b/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherCoursesView.java
new file mode 100644
index 0000000..153d348
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherCoursesView.java
@@ -0,0 +1,69 @@
+package cn.itcast.ssm.view;
+
+public class TeacherCoursesView {
+	private int teacherId;
+	private int courseId;
+	private String teacherName;
+	private String courseName;
+	private String startTime;
+	private String endTime;
+	private String classTime;
+	private String teachAddress;
+	private String courseStatus;
+	public int getTeacherId() {
+		return teacherId;
+	}
+	public void setTeacherId(int teacherId) {
+		this.teacherId = teacherId;
+	}
+	public int getCourseId() {
+		return courseId;
+	}
+	public void setCourseId(int courseId) {
+		this.courseId = courseId;
+	}
+	public String getTeacherName() {
+		return teacherName;
+	}
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public String getClassTime() {
+		return classTime;
+	}
+	public void setClassTime(String classTime) {
+		this.classTime = classTime;
+	}
+	public String getTeachAddress() {
+		return teachAddress;
+	}
+	public void setTeachAddress(String teachAddress) {
+		this.teachAddress = teachAddress;
+	}
+	public String getCourseStatus() {
+		return courseStatus;
+	}
+	public void setCourseStatus(String courseStatus) {
+		this.courseStatus = courseStatus;
+	}
+	
+	
+}
diff --git a/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherDiplomaInfoView.java b/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherDiplomaInfoView.java
new file mode 100644
index 0000000..2f83f4b
--- /dev/null
+++ b/Server/ArtEducation0331/src/cn/itcast/ssm/view/TeacherDiplomaInfoView.java
@@ -0,0 +1,29 @@
+package cn.itcast.ssm.view;
+
+public class TeacherDiplomaInfoView {
+	
+	private String idPic;
+	private String diplomaPic;
+	private String masterDiplomaPic;
+	
+	public String getIdPic() {
+		return idPic;
+	}
+	public void setIdPic(String idPic) {
+		this.idPic = idPic;
+	}
+	public String getDiplomaPic() {
+		return diplomaPic;
+	}
+	public void setDiplomaPic(String diplomaPic) {
+		this.diplomaPic = diplomaPic;
+	}
+	public String getMasterDiplomaPic() {
+		return masterDiplomaPic;
+	}
+	public void setMasterDiplomaPic(String masterDiplomaPic) {
+		this.masterDiplomaPic = masterDiplomaPic;
+	}
+	
+	
+}