diff --git a/cs-ui-portal/src/api/manager/category.js b/cs-ui-portal/src/api/manager/category.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b8c12079040af666c8669aad224223dcf7dcea0
--- /dev/null
+++ b/cs-ui-portal/src/api/manager/category.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+//查询所有课程分类信息
+export function fetchList(query) {
+    return request({
+      url: '/category/findPage',
+      method: 'post',
+      params: query
+    })
+}
+
+//添加课程分类信息 
+export function createArticle(data) {
+    return request({
+      url: '/category/add',
+      method: 'post',
+      data: data
+    })
+}
+
+//根据id获取信息 getInfoById
+export function getInfoById(id) {
+    return request({
+      url: '/category/findById?id='+id,
+      method: 'get'
+    })
+}
+
+//更新 
+export function updateArticle(data) {
+    return request({
+      url: '/category/update',
+      method: 'post',
+      data: data
+    })
+}
+
+//删除
+export function deleteInfo(id) {
+    return request({
+      url: '/category/delete?id='+id,
+      method: 'get',
+    })
+  }
\ No newline at end of file
diff --git a/cs-ui-portal/src/api/manager/course.js b/cs-ui-portal/src/api/manager/course.js
index 545ac151599e4f71a627173082e8fd62d8794a23..7d193d940e7b6f74bd7b8873e4a6a93d1dd745a1 100644
--- a/cs-ui-portal/src/api/manager/course.js
+++ b/cs-ui-portal/src/api/manager/course.js
@@ -7,6 +7,35 @@ export function fetchList(query) {
     params: query
   })
 }
+export function fetchListByKey(query) {
+  return request({
+    url: '/course/findPageByKey',
+    method: 'post',
+    params: query
+  })
+}
+
+//获取课程分类列表 categoryInfo
+export function categoryInfo() {
+  return request({
+    url: '/category/findAll',
+    method: 'get'
+  })
+}
+//根据课程id查询课程信息
+export function getCourseInfo(id) {
+  return request({
+    url: '/course/findById?id='+id,
+    method: 'get'
+  })
+}
+//获取教师id列表
+export function teacherList() {
+  return request({
+    url: '/teacher/findAll',
+    method: 'get',
+  })
+}
 
 export function fetchArticle(id) {
   return request({
@@ -23,19 +52,19 @@ export function fetchPv(pv) {
     params: { pv }
   })
 }
-
+// 添加课程信息
 export function createArticle(data) {
   return request({
-    url: '/vue-element-admin/article/create',
+    url: '/course/add',
     method: 'post',
     data
   })
 }
-
+//修改课程信息
 export function updateArticle(data) {
   return request({
-    url: '/vue-element-admin/article/update',
+    url: '/course/update',
     method: 'post',
-    data
+    data: data
   })
-}
+}
\ No newline at end of file
diff --git a/cs-ui-portal/src/api/manager/student.js b/cs-ui-portal/src/api/manager/student.js
index 77beed32cdb0a770a397d1646448f48de519636a..4bb5ff5c075b08772a8ddf3398a2a78a7518bb6d 100644
--- a/cs-ui-portal/src/api/manager/student.js
+++ b/cs-ui-portal/src/api/manager/student.js
@@ -23,19 +23,26 @@ export function fetchPv(pv) {
     params: { pv }
   })
 }
-
+//新增学生信息
 export function createArticle(data) {
   return request({
-    url: '/vue-element-admin/article/create',
+    url: '/student/add',
     method: 'post',
     data
   })
 }
-
+//修改学生信息
 export function updateArticle(data) {
   return request({
-    url: '/vue-element-admin/article/update',
+    url: '/student/update',
     method: 'post',
-    data
+    data: data
+  })
+}
+//根据学号获取学生信息
+export function getStudentInfo(id) {
+  return request({
+    url: '/student/findById?id='+id,
+    method: 'get',
   })
 }
diff --git a/cs-ui-portal/src/api/manager/teacher.js b/cs-ui-portal/src/api/manager/teacher.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d9478d23972af949a053a04189321881a2a1f0f
--- /dev/null
+++ b/cs-ui-portal/src/api/manager/teacher.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+//查询所有教师信息
+export function fetchList(query) {
+    return request({
+      url: '/teacher/findPage',
+      method: 'post',
+      params: query
+    })
+}
+
+//根据教师id获取教师授课信息
+export function getDetailInfo(teacherId) {
+    return request({
+        url: '/course/getDetailInfo?teacherId='+teacherId,
+        method: 'get',
+    })
+}
+
+//添加教师信息 createArticle
+export function createArticle(data) {
+    return request({
+        url: '/teacher/add',
+        method: 'post',
+        data: data
+    })
+}
+
+//根据id查询教师信息
+export function getInfoById(id) {
+    return request({
+        url: '/teacher/findById?id='+id,
+        method: 'get'
+    })
+}
+
+//修改信息
+export function updateArticle(data) {
+    return request({
+        url: '/teacher/update',
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/cs-ui-portal/src/api/manager/user.js b/cs-ui-portal/src/api/manager/user.js
index 2364b6bfbb2545d4c1f1da6b69ffc06bbad747aa..a21d71945a93cca27d037f35f572f46625c16e0e 100644
--- a/cs-ui-portal/src/api/manager/user.js
+++ b/cs-ui-portal/src/api/manager/user.js
@@ -23,19 +23,34 @@ export function fetchPv(pv) {
     params: { pv }
   })
 }
-
+//添加user
 export function createArticle(data) {
   return request({
-    url: '/vue-element-admin/article/create',
+    url: '/user/add',
     method: 'post',
-    data
+    data: data
   })
 }
 
 export function updateArticle(data) {
   return request({
-    url: '/vue-element-admin/article/update',
+    url: '/user/update',
     method: 'post',
-    data
+    data: data
+  })
+}
+//根据id查询user信息
+export function getUserInfo(id) {
+  return request({
+    url: '/user/findById?id='+id,
+    method: 'get',
   })
 }
+
+//删除user
+export function deleteUserInfo(id) {
+  return request({
+    url: '/user/delete?id='+id,
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/cs-ui-portal/src/api/seckill_selection.js b/cs-ui-portal/src/api/seckill_selection.js
index f222120998db3886dc4376ce80fd9021c5892fe7..324154ad517c5b7fbf025d63eb113cbadd866586 100644
--- a/cs-ui-portal/src/api/seckill_selection.js
+++ b/cs-ui-portal/src/api/seckill_selection.js
@@ -26,10 +26,15 @@ export function getHistoryList() {
  */
 export function seckillRemove(id) {
   return request({
-    url: '/stu/sk/rm',
-    method: 'get',
-    params: {
-      'courseId': id
-    }
+    url: '/stu/sk/rm?courseId=' + id,
+    method: 'get'
+  })
+}
+
+// 统计课程分类课程数量用于图表显示
+export function countCategory() {
+  return request({
+    url: '/category/countCategory',
+    method: 'get'
   })
 }
diff --git a/cs-ui-portal/src/api/teach.js b/cs-ui-portal/src/api/teach.js
index 57bbc7fa6dc082bf4cb0ed13de367e78463929b9..986392158cec003c7858cca5b4d656925dda4fff 100644
--- a/cs-ui-portal/src/api/teach.js
+++ b/cs-ui-portal/src/api/teach.js
@@ -7,6 +7,15 @@ export function fetchList() {
   })
 }
 
+//根据课程id查询选课学生名单
+export function getStudentList(id) {
+  return request({
+    url: '/teach/getStudentList?id='+id,
+    method: 'get'
+  })
+}
+
+
 export function fetchArticle(id) {
   return request({
     url: '/vue-element-admin/article/detail',
diff --git a/cs-ui-portal/src/router/index.js b/cs-ui-portal/src/router/index.js
index ccf24d16bf0ed1e0bfa9b63111c6912331c2c555..0bf88aef637e4f4b99be4133222a5787169d95c9 100644
--- a/cs-ui-portal/src/router/index.js
+++ b/cs-ui-portal/src/router/index.js
@@ -129,6 +129,23 @@ export const asyncRoutes = [
       }
     ]
   },
+  {
+    path: '/myTeachCourse',
+    component: Layout,
+    children: [
+      {
+        path: 'studentList',
+        component: () => import('@/views/myTeachCourse/studentList'),
+        name: 'select_studentList',
+        meta: {
+          title: '选课学生名单',
+          icon: 'peoples',
+          roles: ['ROLE_ADMIN', 'ROLE_DEV','ROLE_TEACHER'],
+        },
+        hidden: true
+      }
+    ]
+  },
   {
     path: '/seckillCourse',
     component: Layout,
@@ -172,7 +189,8 @@ export const asyncRoutes = [
           title: '历史选课情况',
           icon: 'list',
           roles: ['ROLE_STUDENT']
-        }
+        },
+        hidden: true
       }
     ]
   },
@@ -485,8 +503,8 @@ export const asyncRoutes = [
     component: Layout,
     children: [
       {
-        path: 'http://chengyi.jmu.edu.cn/',
-        meta: { title: '集美大学诚毅学院', icon: 'link' }
+        path: 'https://tva1.sinaimg.cn/large/008eGmZEly1gmkza78qrkj31bq0mgdje.jpg',
+        meta: { title: '微信公众号', icon: 'link' }
       }
     ]
   },
diff --git a/cs-ui-portal/src/views/dashboard/admin/components/PanelGroup.vue b/cs-ui-portal/src/views/dashboard/admin/components/PanelGroup.vue
index 50571f6156fdc1f3f84e8a8712643c951dbf83c5..db03f2dbd2b6e572d145d6a8b34ee1334a189807 100644
--- a/cs-ui-portal/src/views/dashboard/admin/components/PanelGroup.vue
+++ b/cs-ui-portal/src/views/dashboard/admin/components/PanelGroup.vue
@@ -1,7 +1,8 @@
 <template>
+  
   <el-row :gutter="40" class="panel-group">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="chart" class-name="card-panel-icon" />
         </div>
@@ -14,7 +15,7 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="international" class-name="card-panel-icon" />
         </div>
@@ -27,31 +28,33 @@
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="education" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            热门课程
+            课程总数
           </div>
-          <count-to :start-val="0" :end-val="99" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="18" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+      <div class="card-panel" >
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            课程男女比例
+            学生男女比例
           </div>
+          <span class="card-panel-num">52.3% : 47.7%</span>
         </div>
       </div>
     </el-col>
   </el-row>
+  
 </template>
 
 <script>
diff --git a/cs-ui-portal/src/views/dashboard/admin/components/PieChart.vue b/cs-ui-portal/src/views/dashboard/admin/components/PieChart.vue
index 4d2ef32a5cf2bac3818596ad54ed2956afd8ab67..61f4a4a237f442ff336e905a6ebc98e7260e2ea9 100644
--- a/cs-ui-portal/src/views/dashboard/admin/components/PieChart.vue
+++ b/cs-ui-portal/src/views/dashboard/admin/components/PieChart.vue
@@ -6,6 +6,7 @@
 import echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
+import { countCategory } from '@/api/seckill_selection.js'
 
 export default {
   mixins: [resize],
@@ -25,13 +26,27 @@ export default {
   },
   data() {
     return {
-      chart: null
+      chart: null,
+      names: [],
+      nameValuePairs: [
+        { value: 3, name: 'Industries' },
+        { value: 2, name: 'Technology' },
+        { value: 1, name: 'Forex' },
+        { value: 10, name: 'Gold' },
+        { value: 5, name: 'Forecasts' }
+      ]
     }
   },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
+  watch: {
+    options: {
+      handler(options) {
+        this.chart.setOption(this.options)
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.initData()
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -41,6 +56,13 @@ export default {
     this.chart = null
   },
   methods: {
+    initData() {
+      countCategory().then(response => {
+        this.names = response.names
+        this.nameValuePairs = response.nameCountList
+        this.initChart()
+      })
+    },
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
 
@@ -52,22 +74,16 @@ export default {
         legend: {
           left: 'center',
           bottom: '10',
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+          data: this.names
         },
         series: [
           {
-            name: 'WEEKLY WRITE ARTICLES',
+            name: '课程数占比',
             type: 'pie',
             roseType: 'radius',
             radius: [15, 95],
             center: ['50%', '38%'],
-            data: [
-              { value: 320, name: 'Industries' },
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
-            ],
+            data: this.nameValuePairs,
             animationEasing: 'cubicInOut',
             animationDuration: 2600
           }
diff --git a/cs-ui-portal/src/views/dashboard/admin/index.vue b/cs-ui-portal/src/views/dashboard/admin/index.vue
index 7ecbe779890b93395dc802c6fa2b97ad6a36c5ed..866703ae92dc7fd5ee7354d99e914038c38d8df1 100644
--- a/cs-ui-portal/src/views/dashboard/admin/index.vue
+++ b/cs-ui-portal/src/views/dashboard/admin/index.vue
@@ -62,7 +62,7 @@ export default {
   components: {
     GithubCorner,
     PanelGroup,
-    LineChart,
+    //LineChart,
     RaddarChart,
     PieChart,
     BarChart,
diff --git a/cs-ui-portal/src/views/manager/category.vue b/cs-ui-portal/src/views/manager/category.vue
index a7a34fef174bd40c47560513f1e2fcbf5a7ae770..450daeaea0411a5d732f9c120e279ee45573e46f 100644
--- a/cs-ui-portal/src/views/manager/category.vue
+++ b/cs-ui-portal/src/views/manager/category.vue
@@ -20,24 +20,22 @@
       style="width: 100%;"
       @sort-change="sortChange"
     >
-      <el-table-column label="登录名" prop="id" sortable="custom" align="center" :class-name="getSortClass('id')">
+      <el-table-column label="id" prop="id" sortable="custom" align="center" :class-name="getSortClass('id')" >
         <template slot-scope="{row}">
           <span>{{ row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" align="center">
+      <el-table-column label="课程分类" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.role === 0 ? '管理员' : row.role === 1 ? '学生' : '教师' }}</span>
+          <span>{{ row.name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="handleUpdate(row.id)">
             编辑
           </el-button>
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-setting" @click="updatePwd(row.id)">
-            更改密码
-          </el-button>
+          <el-button type="danger" icon="el-icon-delete" circle @click="deleteCategory(row.id)"></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -46,35 +44,19 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="Type" prop="type">
-          <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Date" prop="timestamp">
-          <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date" />
-        </el-form-item>
-        <el-form-item label="Title" prop="title">
-          <el-input v-model="temp.title" />
-        </el-form-item>
-        <el-form-item label="Status">
-          <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Imp">
-          <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;" />
+        <el-form-item label="id" prop="id">
+          <el-input v-model="temp.id" placeholder="id自增" :disabled="true" />
         </el-form-item>
-        <el-form-item label="Remark">
-          <el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="Please input" />
+        <el-form-item label="课程分类" prop="name">
+          <el-input v-model="temp.name" placeholder="Please enter" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
-          Cancel
+          取消
         </el-button>
         <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          Confirm
+          完成
         </el-button>
       </div>
     </el-dialog>
@@ -92,7 +74,7 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/manager/user.js'
+import { fetchList, fetchPv, createArticle, updateArticle,getInfoById,deleteInfo } from '@/api/manager/category.js'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -237,14 +219,15 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
+          //this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
+          //this.temp.author = 'vue-element-admin'
           createArticle(this.temp).then(() => {
             this.list.unshift(this.temp)
             this.dialogFormVisible = false
+            this.getList()
             this.$notify({
               title: 'Success',
-              message: 'Created Successfully',
+              message: '添加成功',
               type: 'success',
               duration: 2000
             })
@@ -252,9 +235,12 @@ export default {
         }
       })
     },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
+    handleUpdate(id) {
+      getInfoById(id).then(response => {
+        this.temp = response;
+      })
+      //this.temp = Object.assign({}, row) // copy obj
+      //this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {
@@ -264,15 +250,15 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
+          //const tempData = Object.assign({}, this.temp)
+          //tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          updateArticle(this.temp).then(() => {
             const index = this.list.findIndex(v => v.id === this.temp.id)
             this.list.splice(index, 1, this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Update Successfully',
+              message: '信息更新成功',
               type: 'success',
               duration: 2000
             })
@@ -309,6 +295,31 @@ export default {
         this.downloadLoading = false
       })
     },
+    //删除
+    deleteCategory(id){
+      this.$confirm('此操作将永久删除该选课分类, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteInfo(id).then(() => {
+          this.$notify({
+                title: 'Success',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+          })
+      })
+      this.getList()
+        }).catch(() => {
+          this.$notify({
+                title: 'Cancel',
+                message: '取消删除',
+                type: 'info',
+                duration: 2000
+          });
+        });
+    },
     formatJson(filterVal) {
       return this.list.map(v => filterVal.map(j => {
         if (j === 'timestamp') {
diff --git a/cs-ui-portal/src/views/manager/course.vue b/cs-ui-portal/src/views/manager/course.vue
index 20b95b137c6ebe0be978a7d155100c4f5496620e..1b1d28eae1554153d904a562b5ffb9a419f3f79f 100644
--- a/cs-ui-portal/src/views/manager/course.vue
+++ b/cs-ui-portal/src/views/manager/course.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="listQuery.key" placeholder="关键字" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
+      <el-input v-model="listQuery.key" placeholder="请输入查询条件" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
         搜索
       </el-button>
@@ -49,8 +49,8 @@
         </template>
       </el-table-column>
       <el-table-column label="课程类别" align="center" width="100">
-        <template>
-          <span>计算机选修</span>
+        <template slot-scope="{row}" >
+          <span v-for="item in categoryList" v-if="row.categoryId==item.id">{{ item.name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="课程总人数" align="center" width="100">
@@ -60,7 +60,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="handleUpdate(row.id)">
             编辑
           </el-button>
         </template>
@@ -68,33 +68,63 @@
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
-
+    
+    <!-- 新增课程信息 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
         <el-form-item label="课程序号" prop="id">
-          <el-input v-model="temp.id" placeholder="Please enter" />
+          <el-input v-model="temp.id" placeholder="Please enter" :disabled="dialogStatus==='create'? false : true"/>
         </el-form-item>
         <el-form-item label="课程名称" prop="name">
           <el-input v-model="temp.name" placeholder="Please enter" />
         </el-form-item>
+        <el-form-item label="学分" prop="credit">
+          <el-input v-model="temp.credit" placeholder="Please enter" />
+        </el-form-item>
         <el-form-item label="上课时间" prop="time">
-          <el-date-picker v-model="temp.time" type="datetime" placeholder="Please pick a date" />
+          <el-input v-model="temp.time" placeholder="'周三3-4'" />
+        </el-form-item>
+        <el-form-item label="开始周数" prop="durationStart">
+          <el-input v-model="temp.durationStart" placeholder="Please enter" />
+        </el-form-item>
+        <el-form-item label="结束周数" prop="durationEnd">
+          <el-input v-model="temp.durationEnd" placeholder="Please enter" />
         </el-form-item>
         <el-form-item label="上课地点" prop="place">
-          <el-input v-model="temp.place" />
+          <el-input v-model="temp.place" placeholder="Please enter" />
+        </el-form-item>
+        <el-form-item label="授课形式" prop="online">
+          <el-input v-model="temp.online" placeholder="0为线下 1为网课" />
+        </el-form-item>
+        <el-form-item label="授课教师" prop="teacherId">
+          <el-select v-model="temp.teacherId" placeholder="请选择">
+          <el-option
+            v-for="item in teacherIds"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
         </el-form-item>
-        <el-form-item label="授课老师" prop="teacherName">
-          <el-input v-model="temp.teacherName" placeholder="Please enter" />
+        <el-form-item label="课程类别" prop="categoryId">
+          <el-select v-model="temp.categoryId" placeholder="请选择">
+          <el-option
+            v-for="item in categoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
         </el-form-item>
         <el-form-item label="总人数" prop="total">
           <el-input v-model="temp.total" placeholder="Please enter" />
         </el-form-item>
-        <div slot="footer" class="dialog-footer">
+        <div class="dialog-footer">
           <el-button @click="dialogFormVisible = false">
-            Cancel
+            取消
           </el-button>
           <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-            Confirm
+            完成
           </el-button>
         </div>
       </el-form>
@@ -105,7 +135,7 @@
         <el-table-column prop="key" label="Channel" />
         <el-table-column prop="pv" label="Pv" />
       </el-table>
-      <span slot="footer" class="dialog-footer">
+      <span class="dialog-footer">
         <el-button type="primary" @click="dialogPvVisible = false">Confirm</el-button>
       </span>
     </el-dialog>
@@ -113,7 +143,7 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/manager/course.js'
+import { fetchList, fetchPv, createArticle, updateArticle,teacherList,getCourseInfo,categoryInfo,fetchListByKey } from '@/api/manager/course.js'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -150,6 +180,9 @@ export default {
   },
   data() {
     return {
+      categoryName: '',
+      categoryList: null,
+      teacherIds: null,
       tableKey: 0,
       list: null,
       total: 0,
@@ -157,7 +190,7 @@ export default {
       listQuery: {
         page: 1,
         size: 20,
-        importance: undefined,
+        key: '',
         title: undefined,
         type: undefined
       },
@@ -192,13 +225,38 @@ export default {
   },
   created() {
     this.getList()
+    this.getTeacherList()
+    this.getCategoryList()
   },
   methods: {
+    //获取课程类别列表
+    getCategoryList(){
+      categoryInfo().then(response => {
+        this.categoryList = response
+      })
+    },
+    //获取老师id列表
+    getTeacherList(){
+      teacherList().then(response => {
+        this.teacherIds = response
+      })
+    },
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
         this.list = response.rows
         this.total = response.total
+        // Just to simulate the time of the request
+        setTimeout(() => {
+          this.listLoading = false
+        }, 1.5 * 1000)
+      })
+    },
+    getListBykey() {
+      this.listLoading = true
+      fetchListByKey(this.listQuery).then(response => {
+        this.list = response.rows
+        this.total = response.total
 
         // Just to simulate the time of the request
         setTimeout(() => {
@@ -207,8 +265,13 @@ export default {
       })
     },
     handleFilter() {
-      this.listQuery.page = 1
-      this.getList()
+      if(this.listQuery.key == null) {
+        this.listQuery.page = 1
+        this.getList()
+      }else {
+        this.listQuery.page = 1
+        this.getListBykey()
+      }
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -253,14 +316,19 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
+          this.temp.stock = this.temp.total
+          for(let i = 0;i<this.teacherIds.length;i++){
+            if(this.teacherIds[i].id == this.temp.teacherId){
+              this.temp.teacherName = this.teacherIds[i].name
+            }
+          }
+          this.temp.term = 0
           createArticle(this.temp).then(() => {
             this.list.unshift(this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Created Successfully',
+              message: '添加课程成功',
               type: 'success',
               duration: 2000
             })
@@ -269,26 +337,30 @@ export default {
       })
     },
     handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
+      getCourseInfo(row).then(response => {
+        this.temp = response
+      })
+      // this.temp = Object.assign({}, row) // copy obj
+      // this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
+      console.log(1)
     },
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
+          //const tempData = Object.assign({}, this.temp)
+          //tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          updateArticle(this.temp).then(() => {
             const index = this.list.findIndex(v => v.id === this.temp.id)
             this.list.splice(index, 1, this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Update Successfully',
+              message: '成功修改课程信息',
               type: 'success',
               duration: 2000
             })
diff --git a/cs-ui-portal/src/views/manager/student.vue b/cs-ui-portal/src/views/manager/student.vue
index f88e12eb3425c7fbe1cbc9fb6601665509960462..02835bff1e832c39c4f2efbba1bc40ea6ce94d72 100644
--- a/cs-ui-portal/src/views/manager/student.vue
+++ b/cs-ui-portal/src/views/manager/student.vue
@@ -60,7 +60,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="handleUpdate(row.id)">
             编辑
           </el-button>
         </template>
@@ -68,38 +68,38 @@
     </el-table>
 
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
-
+    
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="Type" prop="type">
-          <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-          </el-select>
+        <el-form-item label="学号" prop="id">
+          <el-input v-model="temp.id" placeholder="Please enter" :disabled="dialogStatus==='create'? false : true"/>
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="temp.name" placeholder="Please enter" />
         </el-form-item>
-        <el-form-item label="Date" prop="timestamp">
-          <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date" />
+        <el-form-item label="性别" prop="sex">
+          <el-radio v-model="temp.sex" :label="1">男</el-radio>
+          <el-radio v-model="temp.sex" :label="0">女</el-radio>
         </el-form-item>
-        <el-form-item label="Title" prop="title">
-          <el-input v-model="temp.title" />
+        <el-form-item label="身份证号" prop="idNumber">
+          <el-input v-model="temp.idNumber" placeholder="Please enter" />
         </el-form-item>
-        <el-form-item label="Status">
-          <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
-          </el-select>
+        <el-form-item label="学院/系" prop="college">
+          <el-input v-model="temp.college" placeholder="Please enter" />
         </el-form-item>
-        <el-form-item label="Imp">
-          <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;" />
+        <el-form-item label="专业" prop="major">
+          <el-input v-model="temp.major" placeholder="Please enter" />
         </el-form-item>
-        <el-form-item label="Remark">
-          <el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="Please input" />
+        <el-form-item label="班级" prop="clazz">
+          <el-input v-model="temp.clazz" placeholder="Please enter" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
-          Cancel
+          取消
         </el-button>
         <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          Confirm
+          完成
         </el-button>
       </div>
     </el-dialog>
@@ -117,7 +117,7 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/manager/student.js'
+import { fetchList, fetchPv, createArticle, updateArticle,getStudentInfo } from '@/api/manager/student.js'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -175,7 +175,8 @@ export default {
         timestamp: new Date(),
         title: '',
         type: '',
-        status: 'published'
+        status: 'published',
+        sex: '1'
       },
       dialogFormVisible: false,
       dialogStatus: '',
@@ -256,14 +257,14 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
+          //this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
+          //this.temp.author = 'vue-element-admin'
           createArticle(this.temp).then(() => {
             this.list.unshift(this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Created Successfully',
+              message: '添加学生信息成功',
               type: 'success',
               duration: 2000
             })
@@ -271,9 +272,12 @@ export default {
         }
       })
     },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
+    handleUpdate(id) {
+      getStudentInfo(id).then(response => {
+        this.temp = response
+      })
+      //this.temp = Object.assign({}, row) // copy obj
+      //this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {
@@ -283,15 +287,15 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
+          //const tempData = Object.assign({}, this.temp)
+          //tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          updateArticle(this.temp).then(() => {
             const index = this.list.findIndex(v => v.id === this.temp.id)
             this.list.splice(index, 1, this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Update Successfully',
+              message: '修改学生信息成功',
               type: 'success',
               duration: 2000
             })
diff --git a/cs-ui-portal/src/views/manager/teacher.vue b/cs-ui-portal/src/views/manager/teacher.vue
index a7a34fef174bd40c47560513f1e2fcbf5a7ae770..8de96bfab820041432740999273cfb9dea57d08c 100644
--- a/cs-ui-portal/src/views/manager/teacher.vue
+++ b/cs-ui-portal/src/views/manager/teacher.vue
@@ -20,23 +20,23 @@
       style="width: 100%;"
       @sort-change="sortChange"
     >
-      <el-table-column label="登录名" prop="id" sortable="custom" align="center" :class-name="getSortClass('id')">
+      <el-table-column label="教师id" prop="id" sortable="custom" align="center" :class-name="getSortClass('id')">
         <template slot-scope="{row}">
           <span>{{ row.id }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" align="center">
+      <el-table-column label="名称" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.role === 0 ? '管理员' : row.role === 1 ? '学生' : '教师' }}</span>
+          <span>{{ row.name }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="handleUpdate(row.id)">
             编辑
           </el-button>
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-setting" @click="updatePwd(row.id)">
-            更改密码
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary"  @click="getCourseInfo(row.id)">
+            授课信息
           </el-button>
         </template>
       </el-table-column>
@@ -46,39 +46,35 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="Type" prop="type">
-          <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-          </el-select>
+       <el-form-item label="教师id" prop="id">
+          <el-input v-model="temp.id" placeholder="请输入id" :disabled="dialogStatus==='create'? false : true"/>
         </el-form-item>
-        <el-form-item label="Date" prop="timestamp">
-          <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date" />
-        </el-form-item>
-        <el-form-item label="Title" prop="title">
-          <el-input v-model="temp.title" />
-        </el-form-item>
-        <el-form-item label="Status">
-          <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Imp">
-          <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;" />
-        </el-form-item>
-        <el-form-item label="Remark">
-          <el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="Please input" />
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="temp.name" placeholder="请输入名称" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
-          Cancel
+          取消
         </el-button>
         <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          Confirm
+          完成
         </el-button>
       </div>
     </el-dialog>
 
+    <!-- 教师课程信息 -->
+    <!-- <el-button type="text" @click="dialogTableVisible = true">打开嵌套表格的 Dialog</el-button> -->
+
+    <el-dialog title="教师课程信息" :visible.sync="dialogTableVisible">
+      <el-table :data="teacherDetailInfo">
+        <el-table-column property="name" label="课程名" width="150"></el-table-column>
+        <el-table-column property="time" label="授课时间" width="200"></el-table-column>
+        <el-table-column property="place" label="地点"></el-table-column>
+      </el-table>
+    </el-dialog>
+
+
     <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics">
       <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
         <el-table-column prop="key" label="Channel" />
@@ -92,7 +88,7 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/manager/user.js'
+import { fetchList, fetchPv, createArticle, updateArticle,getInfoById,getDetailInfo } from '@/api/manager/teacher.js'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -129,6 +125,7 @@ export default {
   },
   data() {
     return {
+      teacherDetailInfo: null,
       tableKey: 0,
       list: null,
       total: 0,
@@ -143,16 +140,9 @@ export default {
       sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
       statusOptions: ['published', 'draft', 'deleted'],
       showReviewer: false,
-      temp: {
-        id: undefined,
-        importance: 1,
-        remark: '',
-        timestamp: new Date(),
-        title: '',
-        type: '',
-        status: 'published'
-      },
+      temp: { },
       dialogFormVisible: false,
+      dialogTableVisible: false,  //教师课程信息
       dialogStatus: '',
       textMap: {
         update: 'Edit',
@@ -172,18 +162,19 @@ export default {
     this.getList()
   },
   methods: {
-    edit(id) {
-      console.log(id)
-    },
-    updatePwd(id) {
-      console.log(id)
+    //打开授课信息表单
+    getCourseInfo(teacherId){
+      //获取信息
+      getDetailInfo(teacherId).then(response => {
+        this.teacherDetailInfo = response
+      })
+      this.dialogTableVisible = true  //打开窗口
     },
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
         this.list = response.rows
         this.total = response.total
-
         // Just to simulate the time of the request
         setTimeout(() => {
           this.listLoading = false
@@ -237,14 +228,14 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
+          //this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
+          //this.temp.author = 'vue-element-admin'
           createArticle(this.temp).then(() => {
             this.list.unshift(this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Created Successfully',
+              message: '添加成功',
               type: 'success',
               duration: 2000
             })
@@ -252,10 +243,15 @@ export default {
         }
       })
     },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
+    handleUpdate(id) {
+      getInfoById(id).then(response => {
+        this.temp = response
+        console.log(this.temp)
+      })
+      //this.temp = Object.assign({}, row) // copy obj
+      //this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
+
       this.dialogFormVisible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
@@ -264,15 +260,15 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
+          //const tempData = Object.assign({}, this.temp)
+          //tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          updateArticle(this.temp).then(() => {
             const index = this.list.findIndex(v => v.id === this.temp.id)
             this.list.splice(index, 1, this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Update Successfully',
+              message: '修改信息成功',
               type: 'success',
               duration: 2000
             })
diff --git a/cs-ui-portal/src/views/manager/user.vue b/cs-ui-portal/src/views/manager/user.vue
index a7a34fef174bd40c47560513f1e2fcbf5a7ae770..59d07da361670b2369a06c3f12320483c0525060 100644
--- a/cs-ui-portal/src/views/manager/user.vue
+++ b/cs-ui-portal/src/views/manager/user.vue
@@ -27,17 +27,15 @@
       </el-table-column>
       <el-table-column label="角色" align="center">
         <template slot-scope="{row}">
-          <span>{{ row.role === 0 ? '管理员' : row.role === 1 ? '学生' : '教师' }}</span>
+          <span>{{ row.role === 0 ? '管理员' : row.role === 1 ? '学生' : row.role === 2 ? '教师' : '开发者'}}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-setting" @click="handleUpdate(row.id)">
             编辑
           </el-button>
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-setting" @click="updatePwd(row.id)">
-            更改密码
-          </el-button>
+          <el-button type="danger" icon="el-icon-delete" circle @click="deleteUser(row.id)"></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -46,35 +44,29 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item label="Type" prop="type">
-          <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Date" prop="timestamp">
-          <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date" />
-        </el-form-item>
-        <el-form-item label="Title" prop="title">
-          <el-input v-model="temp.title" />
-        </el-form-item>
-        <el-form-item label="Status">
-          <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
-            <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
-          </el-select>
+        <el-form-item label="登录名" prop="id">
+          <el-input v-model="temp.id" placeholder="请输入学生学号" :disabled="dialogStatus==='create'? false : true"/>
         </el-form-item>
-        <el-form-item label="Imp">
-          <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;" />
+        <el-form-item label="密码" prop="password">
+          <el-input placeholder="请输入密码" v-model="temp.password" show-password></el-input>
         </el-form-item>
-        <el-form-item label="Remark">
-          <el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="Please input" />
+        <el-form-item label="角色" prop="role">
+          <el-select v-model="temp.role" placeholder="请选择">
+          <el-option
+            v-for="item in this.roles"
+            :key="item"
+            :label="item"
+            :value="item">
+          </el-option>
+        </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
-          Cancel
+          取消
         </el-button>
         <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          Confirm
+          完成
         </el-button>
       </div>
     </el-dialog>
@@ -92,7 +84,7 @@
 </template>
 
 <script>
-import { fetchList, fetchPv, createArticle, updateArticle } from '@/api/manager/user.js'
+import { fetchList, fetchPv, createArticle, updateArticle,getUserInfo,deleteUserInfo } from '@/api/manager/user.js'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
@@ -129,6 +121,7 @@ export default {
   },
   data() {
     return {
+      roles: ['管理员','学生','教师', '开发者'],
       tableKey: 0,
       list: null,
       total: 0,
@@ -144,13 +137,6 @@ export default {
       statusOptions: ['published', 'draft', 'deleted'],
       showReviewer: false,
       temp: {
-        id: undefined,
-        importance: 1,
-        remark: '',
-        timestamp: new Date(),
-        title: '',
-        type: '',
-        status: 'published'
       },
       dialogFormVisible: false,
       dialogStatus: '',
@@ -190,6 +176,31 @@ export default {
         }, 1.5 * 1000)
       })
     },
+    //删除user
+    deleteUser(id){
+      this.$confirm('此操作将永久删除该用户, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteUserInfo(id).then(() => {
+          this.$notify({
+                title: 'Success',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+          })
+      })
+      this.getList()
+        }).catch(() => {
+          this.$notify({
+                title: 'Cancel',
+                message: '取消删除',
+                type: 'info',
+                duration: 2000
+          });          
+        });
+    },
     handleFilter() {
       this.listQuery.page = 1
       this.getList()
@@ -237,14 +248,23 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
-          this.temp.author = 'vue-element-admin'
-          createArticle(this.temp).then(() => {
+          //this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
+          //this.temp.author = 'vue-element-admin'
+          if(this.temp.role ==='管理员'){
+            this.temp.role = 0
+          }else if(this.temp.role ==='学生'){
+            this.temp.role = 1
+          }else if(this.temp.role ==='教师'){
+            this.temp.role = 2
+          }else {
+            this.temp.role = -1
+          }
+          createArticle(this.temp).then(response => {
             this.list.unshift(this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Created Successfully',
+              message: '添加成功',
               type: 'success',
               duration: 2000
             })
@@ -252,9 +272,22 @@ export default {
         }
       })
     },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
+    handleUpdate(id) {
+      //this.temp = Object.assign({}, row) // copy obj
+      //this.temp.timestamp = new Date(this.temp.timestamp)
+      getUserInfo(id).then(response => {
+        this.temp = response
+        if(this.temp.role ===0){
+          this.temp.role = '管理员'
+        }else if(this.temp.role ===1){
+          this.temp.role = '学生'
+        }else if(this.temp.role ===2){
+          this.temp.role = '教师'
+        }else {
+          this.temp.role = '开发者'
+        }
+        this.temp.password = ''
+      })
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {
@@ -264,18 +297,28 @@ export default {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          updateArticle(tempData).then(() => {
+          //const tempData = Object.assign({}, this.temp)
+          //tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+          if(this.temp.role ==='管理员'){
+            this.temp.role = 0
+          }else if(this.temp.role ==='学生'){
+            this.temp.role = 1
+          }else if(this.temp.role ==='教师'){
+            this.temp.role = 2
+          }else {
+            this.temp.role = -1
+          }
+          updateArticle(this.temp).then(() => {
             const index = this.list.findIndex(v => v.id === this.temp.id)
             this.list.splice(index, 1, this.temp)
             this.dialogFormVisible = false
             this.$notify({
               title: 'Success',
-              message: 'Update Successfully',
+              message: '修改成功',
               type: 'success',
               duration: 2000
             })
+            this.getList()
           })
         }
       })
diff --git a/cs-ui-portal/src/views/myTeachCourse/index.vue b/cs-ui-portal/src/views/myTeachCourse/index.vue
index 021b767c25bcae2e31f773907dec042634a622b9..a0edf3d260f5ff8ad5e2bb65540d65ccf70b54b6 100644
--- a/cs-ui-portal/src/views/myTeachCourse/index.vue
+++ b/cs-ui-portal/src/views/myTeachCourse/index.vue
@@ -5,9 +5,6 @@
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
         搜索
       </el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
-        新增
-      </el-button>
       <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">
         导出Excel
       </el-button>
@@ -65,7 +62,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{row}">
-          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="edit(row.id)">
+          <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-edit" @click="getStudentList(row.id)">
             查看学生名单
           </el-button>
         </template>
@@ -153,6 +150,7 @@ export default {
   },
   data() {
     return {
+      teacherDetailInfo: null,
       tableKey: 0,
       list: null,
       total: 0,
@@ -207,6 +205,10 @@ export default {
         }, 1.5 * 1000)
       })
     },
+    //课程id查看选课学生名单
+    getStudentList(id){
+      this.$router.push({ name: 'select_studentList', params: { courseId: id }});
+    },
     handleFilter() {
       this.listQuery.page = 1
       this.getList()
diff --git a/cs-ui-portal/src/views/myTeachCourse/studentList.vue b/cs-ui-portal/src/views/myTeachCourse/studentList.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e17c39a962decce2db097a843b4fb93243a6dad3
--- /dev/null
+++ b/cs-ui-portal/src/views/myTeachCourse/studentList.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-input v-model="listQuery.key" placeholder="关键字" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
+        搜索
+      </el-button>
+      <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">
+        导出Excel
+      </el-button>
+    </div>
+
+    <el-table
+      :key="tableKey"
+      v-loading="listLoading"
+      :data="list"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;"
+      @sort-change="sortChange"
+    >
+      <el-table-column label="学号" prop="id" sortable="custom" align="center" width="180" >
+        <template slot-scope="{row}">
+          <span>{{ row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="姓名" align="center" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.sex===1?'男':'女' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="身份证号" align="center" width="350px">
+        <template slot-scope="{row}">
+          <span>{{ row.idNumber }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="院系" align="center" width="180">
+        <template slot-scope="{row}">
+          <span>{{ row.college }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="专业" align="center" width="100">
+        <template slot-scope="{row}">
+          <span>{{ row.major }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="班级" align="center" >
+        <template slot-scope="{row}">
+          <span>{{ row.clazz }}</span>
+        </template>
+      </el-table-column>
+    </el-table> 
+  </div>
+</template>
+
+<script>
+import { getStudentList } from '@/api/teach.js'
+import waves from '@/directive/waves' // waves directive
+import { parseTime } from '@/utils'
+import Pagination from '@/components/Pagination' // secondary package based on el-pagination
+
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+
+// arr to obj, such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+
+export default {
+  name: 'ComplexTable',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    return {
+      courseId: 0,
+      tableKey: 0,
+      list: null,
+      listLoading: true,
+      listQuery: {
+        importance: undefined,
+        title: undefined,
+        type: undefined
+      },
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.courseId = this.$route.params.courseId
+      this.listLoading = true
+      getStudentList(this.courseId).then(response => {
+        this.list = response
+        // Just to simulate the time of the request
+        setTimeout(() => {
+          this.listLoading = false
+        }, 1.5 * 1000)
+      })
+    },
+  }
+}
+</script>
diff --git a/cs-ui-portal/src/views/seckill_course/index.vue b/cs-ui-portal/src/views/seckill_course/index.vue
index 8357ccf106c7f7f46c3bcc880defae52bcf86b07..a777652a82fedf086f7229924bdec215d94fdd30 100644
--- a/cs-ui-portal/src/views/seckill_course/index.vue
+++ b/cs-ui-portal/src/views/seckill_course/index.vue
@@ -21,12 +21,12 @@
           <span>{{ row.name }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="学分" align="center" width="100">
+      <el-table-column label="学分" align="center" width="80">
         <template slot-scope="{row}">
           <span>{{ row.credit }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上课周数时间地点" align="center" width="350px">
+      <el-table-column label="上课周数时间地点" align="center" width="300px">
         <template slot-scope="{row}">
           <span>{{ ' [ ' + row.durationStart + ' ~ ' + row.durationEnd + ' ]  ' + row.time + '  ' + row.place }}</span>
         </template>
@@ -37,11 +37,14 @@
         </template>
       </el-table-column>
       <el-table-column label="课程类别" align="center" width="100">
-        <template>
-          <span>计算机选修</span>
+        <template slot-scope="{row}">
+          <span v-if="row.categoryId == 1">{{'自然科学'}}</span>
+          <span v-if="row.categoryId == 2">{{'体育艺术'}}</span>
+          <span v-if="row.categoryId == 3">{{'创新创业'}}</span>
+          <span v-if="row.categoryId == 4">{{'计算机选修'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="库存" align="center" width="100">
+      <el-table-column label="剩余" align="center" width="80">
         <template slot-scope="{row}">
           <span>{{ row.stock }}</span>
         </template>
diff --git a/cs-ui-portal/src/views/seckill_selection/pastSelection.vue b/cs-ui-portal/src/views/seckill_selection/pastSelection.vue
index 85cda2053a7ff45c4bd71ebdf720f40ae54066da..191d2a9dfb20fb89df091d8cd877b3028f40418f 100644
--- a/cs-ui-portal/src/views/seckill_selection/pastSelection.vue
+++ b/cs-ui-portal/src/views/seckill_selection/pastSelection.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { getPastList, fetchPv, createArticle, updateArticle } from '@/api/seckill_selection'
+import { getHistoryList, fetchPv, createArticle, updateArticle } from '@/api/seckill_selection'
 import waves from '@/directive/waves' // waves directive
 import { parseTime } from '@/utils'
 
@@ -169,9 +169,8 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-      getPastList().then(response => {
+      getHistoryList().then(response => {
         this.list = response
-
         // Just to simulate the time of the request
         setTimeout(() => {
           this.listLoading = false
diff --git a/cs-ui-portal/src/views/seckill_selection/presentSelection.vue b/cs-ui-portal/src/views/seckill_selection/presentSelection.vue
index ef286346bbfd3d695dcea8b17ead07f2d7b1563a..62450921edb1924d74df820ac8facc45d6d1a821 100644
--- a/cs-ui-portal/src/views/seckill_selection/presentSelection.vue
+++ b/cs-ui-portal/src/views/seckill_selection/presentSelection.vue
@@ -79,10 +79,10 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
-          Cancel
+          取消
         </el-button>
         <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          Confirm
+          完成
         </el-button>
       </div>
     </el-dialog>
@@ -184,8 +184,9 @@ export default {
         this.listLoading = false
       })
     },
-    seckillRemove() {
-      seckillRemove().then(response => {
+    seckillRemove(id) {
+      seckillRemove(id).then(response => {
+        // 访问取消选课接口
         // 弹窗
         this.$message(response.message)
         this.getList()
diff --git a/cy-code/.idea/codeStyles/codeStyleConfig.xml b/cy-code/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a179bde3e4e772c29c0c85e53354aa54618..0000000000000000000000000000000000000000
--- a/cy-code/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/cy-code/.idea/compiler.xml b/cy-code/.idea/compiler.xml
deleted file mode 100644
index a0256253d01bde20aea33f4a4456f1b606b7bffc..0000000000000000000000000000000000000000
--- a/cy-code/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="course-selection-interface" />
-        <module name="course-selection-service" />
-        <module name="course-selection-api" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="course-selection-api" options="-parameters" />
-      <module name="course-selection-interface" options="-parameters" />
-      <module name="course-selection-server" options="" />
-      <module name="course-selection-service" options="-parameters" />
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/.idea/encodings.xml b/cy-code/.idea/encodings.xml
deleted file mode 100644
index fd0d66df97ffec37eb7acd94dedf5e02bd44a955..0000000000000000000000000000000000000000
--- a/cy-code/.idea/encodings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/course-selection-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/course-selection-server/course-selection-interface/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/course-selection-server/course-selection-service/src/main/java" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/.idea/inspectionProfiles/Project_Default.xml b/cy-code/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 3eca60d691650f87063bd9bc8d7b60a2f82afa33..0000000000000000000000000000000000000000
--- a/cy-code/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="TOP_LEVEL_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="INNER_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="METHOD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
-        </value>
-      </option>
-      <option name="FIELD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="IGNORE_DEPRECATED" value="false" />
-      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
-      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
-      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="date,微信公众号,blog,create,Author,Blog,Create,Discription" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/cy-code/.idea/inspectionProfiles/profiles_settings.xml b/cy-code/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 0eefe328ab09916b90d7b29ba5c35396c977403c..0000000000000000000000000000000000000000
--- a/cy-code/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/cy-code/.idea/misc.xml b/cy-code/.idea/misc.xml
deleted file mode 100644
index 677967706f715117b3383822d102224e9d2cb03e..0000000000000000000000000000000000000000
--- a/cy-code/.idea/misc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$/course-selection-api" />
-  </component>
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/.idea/uiDesigner.xml b/cy-code/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb27b68192f27f985d3879e173ec77adb8..0000000000000000000000000000000000000000
--- a/cy-code/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/.idea/vcs.xml b/cy-code/.idea/vcs.xml
deleted file mode 100644
index 6c0b8635858dc7ad44b93df54b762707ce49eefc..0000000000000000000000000000000000000000
--- a/cy-code/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/.idea/workspace.xml b/cy-code/.idea/workspace.xml
deleted file mode 100644
index 396e9bd13c5c58b372732c3bc9a3061964446516..0000000000000000000000000000000000000000
--- a/cy-code/.idea/workspace.xml
+++ /dev/null
@@ -1,766 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="7ea0a920-4ed6-4a39-91c8-100d00b8e0bd" name="Default Changelist" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CodeStyleSettingsInfer">
-    <option name="done" value="true" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Interface" />
-        <option value="Enum" />
-        <option value="JUnit5 Test Class" />
-        <option value="HTML File" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="PUSH_TAGS">
-      <GitPushTagMode>
-        <option name="argument" value="--tags" />
-        <option name="title" value="All" />
-      </GitPushTagMode>
-    </option>
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$/.." value="master" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-    <option name="UPDATE_TYPE" value="MERGE" />
-  </component>
-  <component name="JsFlowSettings">
-    <service-enabled>true</service-enabled>
-    <exe-path />
-    <other-services-enabled>true</other-services-enabled>
-    <auto-save>true</auto-save>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="vmOptionsForImporter" value="-Xms1024m -Xmx2048m" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="ProjectCodeStyleSettingsMigration">
-    <option name="version" value="1" />
-  </component>
-  <component name="ProjectId" id="1hOLBZm98qRgveSfr2BbuJDjVZY" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
-    <option name="showLibraryContents" value="true" />
-    <option name="sortByType" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DatabaseDriversLRU" value="mysql" />
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="RequestMappingsPanelOrder0" value="0" />
-    <property name="RequestMappingsPanelOrder1" value="1" />
-    <property name="RequestMappingsPanelWidth0" value="75" />
-    <property name="RequestMappingsPanelWidth1" value="75" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
-    <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="fileTemplates" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CreateTestDialog.RecentsKey">
-      <recent name="cn.cy.course.mapper" />
-      <recent name="cn.cy.course.service" />
-      <recent name="cn.cy.course.task" />
-    </key>
-    <key name="CreateTestDialog.Recents.Supers">
-      <recent name="" />
-    </key>
-    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
-      <recent name="cn.cy.course.mapper" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service" />
-      <recent name="$PROJECT_DIR$/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl" />
-      <recent name="$PROJECT_DIR$/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper" />
-      <recent name="$PROJECT_DIR$/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo" />
-      <recent name="$PROJECT_DIR$/course-selection-api/src/main/resources/templates/views" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="cn.cy.course.controller" />
-      <recent name="cn.cy.course" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/course-selection-api/src/main/resources/templates/views" />
-      <recent name="$PROJECT_DIR$/course-selection-api/src/main/resources/templates" />
-      <recent name="$PROJECT_DIR$/course-selection-api/src/main/resources" />
-      <recent name="$PROJECT_DIR$/course-selection-api/src/main/resources/view" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
-  </component>
-  <component name="RunManager" selected="Spring Boot.CourseApiConsumer">
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-    </configuration>
-    <configuration name="CourseServiceProvider" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="cn.cy.course.CourseServiceProvider" />
-      <module name="course-selection-service" />
-      <option name="VM_PARAMETERS" value="-XX:+UseG1GC" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="cn.cy.course.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="SelectionMapperTest.fun" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="course-selection-service" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="cn.cy.course.mapper.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="cn.cy.course.mapper" />
-      <option name="MAIN_CLASS_NAME" value="cn.cy.course.mapper.SelectionMapperTest" />
-      <option name="METHOD_NAME" value="fun" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <option name="TEST_OBJECT" value="class" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="CourseApiConsumer" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="course-selection-api" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="cn.cy.course.util.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cy.course.CourseApiConsumer" />
-      <option name="VM_PARAMETERS" value="-XX:+UseG1GC" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="CourseServiceProvider" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="course-selection-service" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cy.course.CourseServiceProvider" />
-      <option name="VM_PARAMETERS" value="-XX:+UseG1GC -Xms3072m -Xmx3072m" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="TestNG">
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <properties />
-      <listeners />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file enabled="true" id="idea.log" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Application.CourseServiceProvider" />
-<<<<<<< HEAD
-      <item itemvalue="JUnit.CourseMapperTest" />
-      <item itemvalue="JUnit.CourseMapperTest.test" />
-=======
-      <item itemvalue="JUnit.SelectionMapperTest.fun" />
-      <item itemvalue="Spring Boot.CourseServiceProvider" />
->>>>>>> dev
-      <item itemvalue="Spring Boot.CourseApiConsumer" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Spring Boot.CourseApiConsumer" />
-        <item itemvalue="Application.CourseServiceProvider" />
-        <item itemvalue="JUnit.SelectionMapperTest.fun" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand>
-              <path>
-                <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
-                <item name="Spring Boot" type="7427dc5b:ServiceModel$ServiceGroupNode" />
-              </path>
-            </expand>
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7ea0a920-4ed6-4a39-91c8-100d00b8e0bd" name="Default Changelist" comment="" />
-      <created>1599877056705</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1599877056705</updated>
-      <workItem from="1599877058233" duration="1970000" />
-      <workItem from="1599879979399" duration="158000" />
-      <workItem from="1599880139963" duration="15046000" />
-      <workItem from="1599914746770" duration="2855000" />
-      <workItem from="1599961000194" duration="902000" />
-      <workItem from="1599966547870" duration="2216000" />
-      <workItem from="1599970229136" duration="173000" />
-      <workItem from="1599970444476" duration="122000" />
-      <workItem from="1599970592573" duration="1288000" />
-      <workItem from="1600323156610" duration="5387000" />
-      <workItem from="1600349130920" duration="44211000" />
-      <workItem from="1600656011528" duration="45365000" />
-      <workItem from="1600834085082" duration="23290000" />
-      <workItem from="1601019023038" duration="12304000" />
-      <workItem from="1601101729345" duration="8836000" />
-      <workItem from="1601120527573" duration="5720000" />
-      <workItem from="1601182606964" duration="20482000" />
-      <workItem from="1601266114424" duration="4427000" />
-      <workItem from="1601302289647" duration="1147000" />
-      <workItem from="1601303612064" duration="508000" />
-      <workItem from="1601304508158" duration="12364000" />
-      <workItem from="1602477341059" duration="4000" />
-      <workItem from="1602592299156" duration="8330000" />
-      <workItem from="1602659874382" duration="26888000" />
-      <workItem from="1604035389244" duration="3422000" />
-      <workItem from="1606438923198" duration="311000" />
-      <workItem from="1606623299499" duration="181000" />
-      <workItem from="1610073190777" duration="1386000" />
-      <workItem from="1610075775988" duration="252000" />
-    </task>
-    <task id="LOCAL-00001" summary="Update ServiceImpl and Something about Seckill">
-      <created>1600529040839</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1600529040840</updated>
-    </task>
-    <task id="LOCAL-00002" summary="CAS 单点登录 注释">
-      <created>1600565118219</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1600565118219</updated>
-    </task>
-    <task id="LOCAL-00003" summary="update readme.md.">
-      <created>1600570228783</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1600570228783</updated>
-    </task>
-    <task id="LOCAL-00004" summary="update function of 'selection'">
-      <created>1600581754926</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1600581754926</updated>
-    </task>
-    <task id="LOCAL-00005" summary="多线程处理Pack">
-      <created>1600611466045</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1600611466045</updated>
-    </task>
-    <task id="LOCAL-00006" summary="Async异步任务线程池">
-      <created>1600665103970</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1600665103970</updated>
-    </task>
-    <task id="LOCAL-00007" summary="限制选课只能有一个">
-      <created>1600668334461</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1600668334461</updated>
-    </task>
-    <task id="LOCAL-00008" summary="测试，选课add接口，并修复相应bug">
-      <created>1600693376744</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1600693376744</updated>
-    </task>
-    <task id="LOCAL-00009" summary="使得async线程池私有">
-      <created>1600693865119</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1600693865119</updated>
-    </task>
-    <task id="LOCAL-00010" summary="选课Pack处理异步任务">
-      <created>1600700505939</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1600700505939</updated>
-    </task>
-    <task id="LOCAL-00011" summary="fix 选课系统异步任务 BUG">
-      <created>1600738313263</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1600738313263</updated>
-    </task>
-    <task id="LOCAL-00012" summary="Course-Selection-Core update">
-      <created>1600759974319</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1600759974319</updated>
-    </task>
-    <task id="LOCAL-00013" summary="选课查重">
-      <created>1600769472672</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1600769472672</updated>
-    </task>
-    <task id="LOCAL-00014" summary="选课查重">
-      <created>1600770963554</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1600770963554</updated>
-    </task>
-    <task id="LOCAL-00015" summary="新增当前学期表，用于标示当前学期">
-      <created>1600774078404</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1600774078404</updated>
-    </task>
-    <task id="LOCAL-00016" summary="新增接口：&#10;1. 查询历史选课记录&#10;2. 查询当前学期选课记录">
-      <created>1600831973596</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1600831973596</updated>
-    </task>
-    <task id="LOCAL-00017" summary="从MySQL中查询对应学生历史选课情况">
-      <created>1600833160176</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1600833160176</updated>
-    </task>
-    <task id="LOCAL-00018" summary="新增RedisContantKey枚举类，用于存放REDIS-KEYS">
-      <created>1600833630413</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1600833630413</updated>
-    </task>
-    <task id="LOCAL-00019" summary="fix bug of interface /seckill/selection/query/curr">
-      <created>1600834563702</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1600834563702</updated>
-    </task>
-    <task id="LOCAL-00020" summary="将redis-key集中成一个Enum类中，方便使用">
-      <created>1600835049115</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1600835049115</updated>
-    </task>
-    <task id="LOCAL-00021" summary="RedisContantKey新增注解">
-      <created>1600849459974</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1600849459974</updated>
-    </task>
-    <task id="LOCAL-00022" summary="rename SeckillController &amp; SeckillService">
-      <created>1600849922604</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1600849922604</updated>
-    </task>
-    <task id="LOCAL-00023" summary="当课程被抢购完后，更新数据库中的库存信息">
-      <created>1600866687905</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1600866687905</updated>
-    </task>
-    <task id="LOCAL-00024" summary="让enum RedisContantKey -&gt; java.lang.String，使得可以在rdm可视化工具上查看">
-      <created>1600868894142</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1600868894142</updated>
-    </task>
-    <task id="LOCAL-00025" summary="selection新增属性CreateTime，选课时间">
-      <created>1600922060934</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1600922060934</updated>
-    </task>
-    <task id="LOCAL-00026" summary="selection新增属性CreateTime，选课时间">
-      <created>1600941587310</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1600941587310</updated>
-    </task>
-    <task id="LOCAL-00027" summary="项目打包">
-      <created>1600950499619</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1600950499619</updated>
-    </task>
-    <task id="LOCAL-00028" summary="更改线程池配置：无界等待队列-&gt;有界等待队列（Capacity）">
-      <created>1601011266424</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1601011266424</updated>
-    </task>
-    <task id="LOCAL-00029" summary="将课程id列表添加到redis中，并新增实时返回库存的接口">
-      <created>1601090761899</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1601090761899</updated>
-    </task>
-    <task id="LOCAL-00030" summary="rename package name">
-      <created>1601100739612</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1601100739612</updated>
-    </task>
-    <task id="LOCAL-00031" summary="新增Thymeleaf渲染模版，新增查询本次选课的课程信息接口，课程库存信息接口">
-      <created>1601116498892</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1601116498892</updated>
-    </task>
-    <task id="LOCAL-00032" summary="update">
-      <created>1601138554703</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1601138554703</updated>
-    </task>
-    <task id="LOCAL-00033" summary="1.更改线程池配置&#10;2.新增选课异步任务插入异常的回滚操作&#10;3.新增学生选课情况时，同时加入Redis-Set中&#10;4.在app启动时，先删除redis数据中的学生选课情况Set">
-      <created>1601198962178</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1601198962178</updated>
-    </task>
-    <task id="LOCAL-00034" summary="选课界面，点击选课事件更新">
-      <created>1601204059278</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1601204059278</updated>
-    </task>
-    <task id="LOCAL-00035" summary="update">
-      <created>1601212156496</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1601212156496</updated>
-    </task>
-    <task id="LOCAL-00036" summary="update">
-      <created>1601212185961</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1601212185961</updated>
-    </task>
-    <task id="LOCAL-00037" summary="update">
-      <created>1601298829280</created>
-      <option name="number" value="00037" />
-      <option name="presentableId" value="LOCAL-00037" />
-      <option name="project" value="LOCAL" />
-      <updated>1601298829280</updated>
-    </task>
-    <task id="LOCAL-00038" summary="前端选课情况页面显示">
-      <created>1601305824428</created>
-      <option name="number" value="00038" />
-      <option name="presentableId" value="LOCAL-00038" />
-      <option name="project" value="LOCAL" />
-      <updated>1601305824428</updated>
-    </task>
-    <task id="LOCAL-00039" summary="将jquery3.4.1.min.js文件移到本地">
-      <created>1601346104488</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1601346104488</updated>
-    </task>
-    <task id="LOCAL-00040" summary="交互界面优化，新增对外接口：移除选课">
-      <created>1601355224249</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1601355224249</updated>
-    </task>
-    <task id="LOCAL-00041" summary="update wechat public number">
-      <created>1602397731022</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1602397731022</updated>
-    </task>
-    <task id="LOCAL-00042" summary="新增ROLE_DEV，开发者角色，仅在开发阶段使用">
-      <created>1602404126087</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1602404126087</updated>
-    </task>
-    <task id="LOCAL-00043" summary="control层包结构更新，新增TeachController类">
-      <created>1602404993763</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1602404993763</updated>
-    </task>
-    <task id="LOCAL-00044" summary="fix a bug that question of 'slot-scope' missing.">
-      <created>1602477250896</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1602477250896</updated>
-    </task>
-    <task id="LOCAL-00045" summary="1.更新接口url&#10;2.更新选课接口数据来源从MySQL更改至Redis，并加上分页功能，以解决大量访问时耗费资源问题">
-      <created>1602829379757</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1602829379757</updated>
-    </task>
-    <task id="LOCAL-00046" summary="update">
-      <created>1604037072544</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1604037072544</updated>
-    </task>
-    <task id="LOCAL-00047" summary="Import Swagger Interface Doc">
-      <created>1604039206839</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1604039206839</updated>
-    </task>
-    <option name="localTasksCounter" value="48" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="RedisContantKey新增注解" />
-    <MESSAGE value="rename SeckillController &amp; SeckillService" />
-    <MESSAGE value="当课程被抢购完后，更新数据库中的库存信息" />
-    <MESSAGE value="让enum RedisContantKey -&gt; java.lang.String，使得可以在rdm可视化工具上查看" />
-    <MESSAGE value="selection新增属性CreateTime，选课时间" />
-    <MESSAGE value="项目打包" />
-    <MESSAGE value="更改线程池配置：无界等待队列-&gt;有界等待队列（Capacity）" />
-    <MESSAGE value="将课程列表添加到redis中" />
-    <MESSAGE value="将课程id列表添加到redis中，并新增实时返回库存的接口" />
-    <MESSAGE value="rename package name" />
-    <MESSAGE value="新增Thymeleaf渲染模版，新增查询本次选课的课程信息接口，课程库存信息接口" />
-    <MESSAGE value="防" />
-    <MESSAGE value="1.更改线程池配置&#10;2.新增选课异步任务插入异常的回滚操作&#10;3.新增学生选课情况时，同时加入Redis-Set中&#10;4.在app启动时，先删除redis数据中的学生选课情况Set" />
-    <MESSAGE value="选课系统界面更新，点击事件更新" />
-    <MESSAGE value="选课界面，点击选课事件更新" />
-    <MESSAGE value="前端选课情况页面显示" />
-    <MESSAGE value="将jquery3.4.1.min.js文件移到本地" />
-    <MESSAGE value="交互界面优化，新增对外接口：移除选课" />
-    <MESSAGE value="新增ROLE_DEV，开发者角色，仅在开发阶段使用" />
-    <MESSAGE value="update wechat public number" />
-    <MESSAGE value="control层包结构更新，新增TeachController类" />
-    <MESSAGE value="fix a bug that question of 'slot-scope' missing." />
-    <MESSAGE value="1.更新接口url&#10;2.更新选课接口数据来源从MySQL更改至Redis，并加上分页功能，以解决大量访问时耗费资源问题" />
-    <MESSAGE value="update" />
-    <MESSAGE value="Import Swagger Interface Doc" />
-    <option name="LAST_COMMIT_MESSAGE" value="Import Swagger Interface Doc" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="653" y="249" key="#com.intellij.ide.util.MemberChooser" timestamp="1602835002122">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="653" y="249" key="#com.intellij.ide.util.MemberChooser/0.23.1680.1027@0.23.1680.1027" timestamp="1602835002122" />
-    <state x="382" y="115" key="CommitChangelistDialog2" timestamp="1604039206618">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="382" y="115" key="CommitChangelistDialog2/0.23.1680.1027@0.23.1680.1027" timestamp="1604039206618" />
-    <state x="196" y="120" key="DiffContextDialog" timestamp="1602829112153">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="196" y="120" key="DiffContextDialog/0.23.1680.1027@0.23.1680.1027" timestamp="1602829112153" />
-    <state width="1126" height="410" key="GridCell.Tab.0.bottom" timestamp="1610075965185">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.0.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965185" />
-    <state width="1126" height="410" key="GridCell.Tab.0.center" timestamp="1610075965184">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.0.center/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965184" />
-    <state width="1126" height="410" key="GridCell.Tab.0.left" timestamp="1610075965183">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.0.left/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965183" />
-    <state width="1126" height="410" key="GridCell.Tab.0.right" timestamp="1610075965184">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.0.right/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965184" />
-    <state width="1126" height="410" key="GridCell.Tab.1.bottom" timestamp="1610075965187">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.1.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965187" />
-    <state width="1126" height="410" key="GridCell.Tab.1.center" timestamp="1610075965186">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.1.center/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965186" />
-    <state width="1126" height="410" key="GridCell.Tab.1.left" timestamp="1610075965186">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.1.left/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965186" />
-    <state width="1126" height="410" key="GridCell.Tab.1.right" timestamp="1610075965187">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="410" key="GridCell.Tab.1.right/0.23.1680.1027@0.23.1680.1027" timestamp="1610075965186" />
-    <state width="1126" height="376" key="GridCell.Tab.2.bottom" timestamp="1602637494075">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="376" key="GridCell.Tab.2.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1602637494075" />
-    <state width="1126" height="376" key="GridCell.Tab.2.center" timestamp="1602637494074">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="376" key="GridCell.Tab.2.center/0.23.1680.1027@0.23.1680.1027" timestamp="1602637494074" />
-    <state width="1126" height="376" key="GridCell.Tab.2.left" timestamp="1602637494074">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="376" key="GridCell.Tab.2.left/0.23.1680.1027@0.23.1680.1027" timestamp="1602637494074" />
-    <state width="1126" height="376" key="GridCell.Tab.2.right" timestamp="1602637494074">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="1126" height="376" key="GridCell.Tab.2.right/0.23.1680.1027@0.23.1680.1027" timestamp="1602637494074" />
-    <state x="328" y="119" key="SettingsEditor" timestamp="1602397620059">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="328" y="119" key="SettingsEditor/0.23.1680.1027@0.23.1680.1027" timestamp="1602397620059" />
-    <state width="533" height="445" key="SwitcherDM" timestamp="1602666367206">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state width="533" height="445" key="SwitcherDM/0.23.1680.1027@0.23.1680.1027" timestamp="1602666367206" />
-    <state x="440" y="278" key="Vcs.Push.Dialog.v2" timestamp="1604039212557">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="440" y="278" key="Vcs.Push.Dialog.v2/0.23.1680.1027@0.23.1680.1027" timestamp="1604039212557" />
-    <state x="495" y="300" width="845" height="538" key="find.popup" timestamp="1602836212947">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="495" y="300" width="845" height="538" key="find.popup/0.23.1680.1027@0.23.1680.1027" timestamp="1602836212947" />
-    <state x="505" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1610075799330">
-      <screen x="0" y="23" width="1680" height="1027" />
-    </state>
-    <state x="505" y="250" width="670" height="676" key="search.everywhere.popup/0.23.1680.1027@0.23.1680.1027" timestamp="1610075799330" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CategoryController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CategoryController.java
index deeeb81a1c3c91715ac8fea57266aa4c3cfd2210..8ca599760acd1dcac19ba1904e312f69ddbdd385 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CategoryController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CategoryController.java
@@ -3,6 +3,7 @@ package cn.cy.course.controller.manager;
 import cn.cy.course.entity.PageResult;
 import cn.cy.course.entity.Result;
 import cn.cy.course.pojo.Category;
+import cn.cy.course.pojo.vo.CategoryCountVo;
 import cn.cy.course.service.CategoryService;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.*;
@@ -35,7 +36,7 @@ public class CategoryController {
     }
 
     @PostMapping("/findPage")
-    public PageResult<Category> findPage(@RequestBody Map<String,Object> searchMap,int page, int size){
+    public PageResult<Category> findPage(@RequestBody(required = false) Map<String,Object> searchMap,int page, int size){
         return  categoryService.findPage(searchMap,page,size);
     }
 
@@ -63,4 +64,8 @@ public class CategoryController {
         return new Result();
     }
 
+    @GetMapping("/countCategory")
+    public CategoryCountVo countCategory(){
+        return categoryService.countCategory();
+    }
 }
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CourseController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CourseController.java
index 4b0fdb8a7797d0102262e85c44814713ac2761b1..d7369d04ca35561627be5b5dc1f2a36b751ce0e1 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CourseController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/CourseController.java
@@ -32,10 +32,10 @@ public class CourseController {
         return courseService.findList(searchMap);
     }
 
-    @PostMapping("/findPage")
-    public PageResult<Course> findPage(@RequestBody(required = false) Map<String,Object> searchMap,int page, int size){
-        System.out.println(page + "  " + size);
-        return  courseService.findPage(searchMap,page,size);
+    @PostMapping("/findPageByKey")
+    public PageResult<Course> findPage(String key,int page, int size){
+        //System.out.println(key);
+        return  courseService.findPageByKey(key,page,size);
     }
 
     @GetMapping("/findById")
@@ -62,4 +62,10 @@ public class CourseController {
         return new Result();
     }
 
+    //根据教师id查询教师授课信息
+    @GetMapping("/getDetailInfo")
+    public List<Course> getDetailInfo(String teacherId){
+        List<Course> courseList = courseService.getInfoByTeacherId(teacherId);
+        return courseList;
+    }
 }
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/SelectionController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/SelectionController.java
index c44dca1ac5d748cc4c43e79a7a6769ec819a1c84..28508fddb6d302bc25d404d7d47d513172055f5a 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/SelectionController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/SelectionController.java
@@ -3,6 +3,7 @@ package cn.cy.course.controller.manager;
 
 import cn.cy.course.entity.PageResult;
 import cn.cy.course.entity.Result;
+import cn.cy.course.pojo.Course;
 import cn.cy.course.pojo.Selection;
 import cn.cy.course.service.SelectionService;
 import org.apache.dubbo.config.annotation.Reference;
@@ -68,4 +69,5 @@ public class SelectionController {
         selectionService.delete(studentId, courseId);
         return new Result();
     }
+
 }
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/TeacherController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/TeacherController.java
index fc2f1e6fc970daa3bbdfb3a8f970e1ce73ae1252..67bde57b4b12f4d11f7ce68f3048485b9e51ec54 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/TeacherController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/TeacherController.java
@@ -37,7 +37,7 @@ public class TeacherController {
     }
 
     @PostMapping("/findPage")
-    public PageResult<Teacher> findPage(@RequestBody Map<String,Object> searchMap,int page, int size){
+    public PageResult<Teacher> findPage(@RequestBody(required = false) Map<String,Object> searchMap,int page, int size){
         return  teacherService.findPage(searchMap,page,size);
     }
 
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/UserController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/UserController.java
index df34502b84db0aab10ca7dcdfd958582fe0f1d8b..5a5fdf0dfe451ebb4cc3a9c200f6e4d07cb45eb4 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/UserController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/manager/UserController.java
@@ -6,6 +6,7 @@ import cn.cy.course.entity.Result;
 import cn.cy.course.pojo.User;
 import cn.cy.course.service.UserService;
 import org.apache.dubbo.config.annotation.Reference;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -21,6 +22,8 @@ public class UserController {
     @Reference
     private UserService userService;
 
+    private BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+
     @GetMapping("/findAll")
     public List<User> findAll(){
         return userService.findAll();
@@ -49,12 +52,14 @@ public class UserController {
 
     @PostMapping("/add")
     public Result add(@RequestBody User user){
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         userService.add(user);
         return new Result();
     }
 
     @PostMapping("/update")
     public Result update(@RequestBody User user){
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         userService.update(user);
         return new Result();
     }
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/SeckillController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/SeckillController.java
index 82e5e339dd35dbbdda51d98421ee5a889d20b49f..0c3654c32b0d363fabcc9e67c266b97c771e4a1d 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/SeckillController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/SeckillController.java
@@ -56,7 +56,13 @@ public class SeckillController {
             studentId  = (String) SecurityUserHelper.getCurrentPrincipal();
         }
 
+        //2. 封装Pack
+        Pack pack = new Pack();
+        pack.setStudentId(studentId);
+        pack.setCourseId(courseId);
 
+        //3. remove
+        seckillService.remove(pack);
 
         return AjaxResult.success("已经移除您的选课信息！");
     }
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/StuSelectionController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/StuSelectionController.java
index 862bec53c23e39ebd7b63e03f9b4a2ab1db8d122..095ae432b5fd30bb4a976971c9c5f2629575b042 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/StuSelectionController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/stu/StuSelectionController.java
@@ -53,7 +53,7 @@ public class StuSelectionController {
                 return o2.getTerm() - o1.getTerm();
             }
         });
-
+        System.out.println(res);
         return res;
     }
 
diff --git a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/teach/TeachController.java b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/teach/TeachController.java
index d872f04ee69e2a1cece388652396dfa119213064..defb21ff6206ab8b74dffc12920b05021f39fb1b 100644
--- a/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/teach/TeachController.java
+++ b/cy-code/course-selection-api/src/main/java/cn/cy/course/controller/teach/TeachController.java
@@ -1,7 +1,12 @@
 package cn.cy.course.controller.teach;
 
 import cn.cy.course.pojo.Course;
+import cn.cy.course.pojo.Selection;
+import cn.cy.course.pojo.Student;
 import cn.cy.course.service.CourseService;
+import cn.cy.course.service.SelectionService;
+import cn.cy.course.service.StudentService;
+import cn.cy.course.service.TeacherService;
 import cn.cy.course.util.SecurityUserHelper;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,11 +33,34 @@ public class TeachController {
     @Reference
     private CourseService courseService;
 
+    @Reference
+    private SelectionService selectionService;
+
+    @Reference
+    private StudentService studentService;
+
     @GetMapping("/course")
     public List<Course> teachCourse() {
         String teacherId = (String) SecurityUserHelper.getCurrentPrincipal();
-        Map<String, Object> searchMap = new HashMap<>();
-        searchMap.put("teacherId", teacherId);
-        return courseService.findList(searchMap);
+        return courseService.teachCourse(teacherId);
+    }
+
+    /**
+     * 根据课程id查询选课学生信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/getStudentList")
+    public List<Student> getStudentList(String id){
+        List<Student> studentList = new ArrayList<>();
+        List<Selection> selectionList = selectionService.findByCourseId(id);
+        for(Selection selection : selectionList){
+            String studentId = selection.getStudentId();
+            Student student = studentService.findById(studentId);
+            if(student != null){
+                studentList.add(student);
+            }
+        }
+        return studentList;
     }
 }
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Category.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Category.java
index 96c965050352a8903b2671d3c309289eeb68be46..4977fa4555f7470ebb27a726fc0e5ccfc99e6570 100644
--- a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Category.java
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Category.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
 public class Category implements Serializable {
 
     @Id
-    private String id;
+    private Integer id;
 
     /**
      * 分类名
@@ -29,11 +29,11 @@ public class Category implements Serializable {
                 '}';
     }
 
-    public String getId() {
+    public Integer getId() {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Student.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Student.java
index 139249549051634aa4e69e6319f7cb3986678b3f..993d912b75cb7a32436d37a440fdfeb1ad31d488 100644
--- a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Student.java
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/Student.java
@@ -25,10 +25,6 @@ public class Student implements Serializable {
      */
     private String name;
 
-    /**
-     * 密码
-     */
-    private String password;
 
     /**
      * 性别：0 女， 1 男
@@ -61,7 +57,6 @@ public class Student implements Serializable {
         return "Student{" +
                 "id='" + id + '\'' +
                 ", name='" + name + '\'' +
-                ", password='" + password + '\'' +
                 ", sex=" + sex +
                 ", idNumber='" + idNumber + '\'' +
                 ", college='" + college + '\'' +
@@ -86,14 +81,6 @@ public class Student implements Serializable {
         this.name = name;
     }
 
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
     public Integer getSex() {
         return sex;
     }
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/dto/CategoryIdCountDto.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/dto/CategoryIdCountDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..859267f080f6486fbdf1515826874ecc0ad016a3
--- /dev/null
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/dto/CategoryIdCountDto.java
@@ -0,0 +1,37 @@
+package cn.cy.course.pojo.dto;
+
+/**
+ * @Author eddieVim
+ * @微信公众号 艾迪威姆 / PositiveEddie
+ * @Blog https://blog.csdn.net/weixin_44129784
+ * @Create 2021/1/12 11:32
+ * @Discription
+ */
+public class CategoryIdCountDto {
+    private Integer id;
+    private Integer count;
+
+    @Override
+    public String toString() {
+        return "CategoryIdCountDto{" +
+                "id=" + id +
+                ", count=" + count +
+                '}';
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+}
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/vo/CategoryCountVo.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/vo/CategoryCountVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c2cfc011c8b9e72b7d0ecbb93c8a33f94f58a51
--- /dev/null
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/pojo/vo/CategoryCountVo.java
@@ -0,0 +1,91 @@
+package cn.cy.course.pojo.vo;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author AnxuVim
+ * @version 1.0
+ * @date 2021/1/11 17:01
+ */
+public class CategoryCountVo implements Serializable {
+
+    public static class NameToCount implements Serializable {
+
+        private String name;
+        private int value;
+
+        public NameToCount() {
+        }
+
+        public NameToCount(String name, int count) {
+            this.name = name;
+            this.value = count;
+        }
+
+        @Override
+        public String toString() {
+            return "NameToCount{" +
+                    "name='" + name + '\'' +
+                    ", count=" + value +
+                    '}';
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public void setValue(int value) {
+            this.value = value;
+        }
+    }
+
+    public CategoryCountVo(int n) {
+        this.names = new ArrayList<>(n);
+        this.nameCountList = new ArrayList<>(n);
+    }
+
+    //课程分类名称
+    private List<String> names;
+
+    //课程总数
+    private List<NameToCount> nameCountList;
+
+    public void add(String name, int count) {
+        this.names.add(name);
+        this.nameCountList.add(new NameToCount(name, count));
+    }
+
+    @Override
+    public String toString() {
+        return "CategoryCountVo{" +
+                "names=" + names +
+                ", nameCountList=" + nameCountList +
+                '}';
+    }
+
+    public List<String> getNames() {
+        return names;
+    }
+
+    public void setNames(List<String> names) {
+        this.names = names;
+    }
+
+    public List<NameToCount> getNameCountList() {
+        return nameCountList;
+    }
+
+    public void setNameCountList(List<NameToCount> nameCountList) {
+        this.nameCountList = nameCountList;
+    }
+}
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CategoryService.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CategoryService.java
index cb1c633793c5ca335ed9d58013f130f942df0d37..4df154f48e6d3bc6fd013f7c460b838b5ba9595c 100644
--- a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CategoryService.java
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CategoryService.java
@@ -2,6 +2,7 @@ package cn.cy.course.service;
 
 import cn.cy.course.entity.PageResult;
 import cn.cy.course.pojo.Category;
+import cn.cy.course.pojo.vo.CategoryCountVo;
 
 import java.util.*;
 
@@ -33,4 +34,5 @@ public interface CategoryService {
 
     public void delete(Integer id);
 
+    CategoryCountVo countCategory();
 }
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CourseService.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CourseService.java
index 6ef230e855fcddff7d2a9ef6dabfdcd4cf73752f..7e600fbd2f4af73d82aee1ab60cbeb7b74013e34 100644
--- a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CourseService.java
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/CourseService.java
@@ -22,7 +22,7 @@ public interface CourseService {
     public List<Course> findList(Map<String, Object> searchMap);
 
 
-    public PageResult<Course> findPage(Map<String, Object> searchMap, int page, int size);
+    public PageResult<Course> findPageByKey(String key, int page, int size);
 
 
     public Course findById(String id);
@@ -45,4 +45,9 @@ public interface CourseService {
      * 实时获取课程的库存数量
      */
     public Map<String, Integer> getCourseStockRealTime();
+
+    List<Course> getInfoByTeacherId(String teacherId);
+
+    List<Course> teachCourse(String teacherId);
+
 }
diff --git a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/SelectionService.java b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/SelectionService.java
index d07ba7e39e497838a586f169f5986c372c3f527b..dcc794b89cc4f70d84e4d2bd51f31495f74c8939 100644
--- a/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/SelectionService.java
+++ b/cy-code/course-selection-server/course-selection-interface/src/main/java/cn/cy/course/service/SelectionService.java
@@ -105,4 +105,5 @@ public interface SelectionService {
      * @return id -> Course
      */
     public Map<String, Course> currentTermSelection(String studentId);
+
 }
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CategoryMapper.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CategoryMapper.java
index 4cc52f074876d5e715a2579989cfeba830695f76..836d4ef483d723eaa66f41e826bc5b4a94fb4f41 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CategoryMapper.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CategoryMapper.java
@@ -1,8 +1,13 @@
 package cn.cy.course.mapper;
 
 import cn.cy.course.pojo.Category;
+import cn.cy.course.pojo.dto.CategoryIdCountDto;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author eddieVim
  * @微信公众号 艾迪威姆 / PositiveEddie
@@ -10,4 +15,16 @@ import tk.mybatis.mapper.common.Mapper;
  * @create 2020/9/13 11:29 上午
  */
 public interface CategoryMapper extends Mapper<Category> {
+
+
+    @Select("select category_id id,count(*) count " +
+            "from tb_course " +
+            "where category_id is not null " +
+            "group by category_id")
+    /**
+     * 计算不同课程分类中的课程数量
+     *
+     * @return
+     */
+    List<CategoryIdCountDto> countPeople();
 }
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CourseMapper.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CourseMapper.java
index 7ec2a6ec2211b6cf880a4d018086fedb78479643..d0dae793226ace9bd56e00cfa293be7a149800b4 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CourseMapper.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/mapper/CourseMapper.java
@@ -10,4 +10,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @create 2020/9/12 4:29 下午
  */
 public interface CourseMapper extends Mapper<Course> {
+
 }
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CategoryServiceImpl.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CategoryServiceImpl.java
index cbfa07ad0663fb44bde3beb7d2087b7d060303fc..ae92b80948ecee556a5c544d9d078b840ca2ba51 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CategoryServiceImpl.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CategoryServiceImpl.java
@@ -3,13 +3,18 @@ package cn.cy.course.service.impl;
 import cn.cy.course.entity.PageResult;
 import cn.cy.course.mapper.CategoryMapper;
 import cn.cy.course.pojo.Category;
+import cn.cy.course.pojo.dto.CategoryIdCountDto;
 import cn.cy.course.service.CategoryService;
+import cn.cy.course.service.CourseService;
+import cn.cy.course.pojo.vo.CategoryCountVo;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -19,6 +24,9 @@ public class CategoryServiceImpl implements CategoryService {
     @Autowired
     private CategoryMapper categoryMapper;
 
+    @Autowired
+    private CourseService courseService;
+
     /**
      * 返回全部记录
      * @return
@@ -104,6 +112,38 @@ public class CategoryServiceImpl implements CategoryService {
         categoryMapper.deleteByPrimaryKey(id);
     }
 
+    /**
+     * 统计课程分类课程数量用于图表显示
+     *
+     * @return
+     */
+    @Override
+    public CategoryCountVo countCategory() {
+        List<Category> categories = categoryMapper.selectAll();
+        // 将所有的课程分类转化为ID -> Category 的K-V 键值对
+        Map<Integer, Category> idCategoryMap = listToMap(categories);
+
+        CategoryCountVo ccv = new CategoryCountVo(categories.size());
+        List<CategoryIdCountDto> categoryIdCountDtos = categoryMapper.countPeople();
+
+        Collections.sort(categoryIdCountDtos, (a, b) -> b.getCount() - a.getCount());
+
+        for (CategoryIdCountDto categoryIdCountDto : categoryIdCountDtos) {
+            String name = idCategoryMap.get(categoryIdCountDto.getId()).getName();
+            ccv.add(name, categoryIdCountDto.getCount());
+        }
+
+        return ccv;
+    }
+
+    private Map<Integer, Category> listToMap(List<Category> categories) {
+        Map<Integer, Category> res = new HashMap<>();
+        for (Category category : categories) {
+            res.put(category.getId(), category);
+        }
+        return res;
+    }
+
     /**
      * 构建查询条件
      * @param searchMap
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CourseServiceImpl.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CourseServiceImpl.java
index 69ae1ce072d0e91f2dfad7e5fa9392b7d2ed152c..4b7cba33629196235e9144a80607068176e305f2 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CourseServiceImpl.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/CourseServiceImpl.java
@@ -46,6 +46,7 @@ public class CourseServiceImpl implements CourseService {
      */
     @Override
     public PageResult<Course> findPage(int page, int size) {
+        System.out.println(page + "  " + size);
         PageHelper.startPage(page,size);
         Page<Course> courses = (Page<Course>) courseMapper.selectAll();
         return new PageResult<Course>(courses.getTotal(),courses.getResult());
@@ -62,6 +63,23 @@ public class CourseServiceImpl implements CourseService {
         return courseMapper.selectByExample(example);
     }
 
+    @Override
+    public PageResult<Course> findPageByKey(String key, int page, int size) {
+        System.out.println(page + "  " + size);
+        System.out.println(key);
+        PageHelper.startPage(page,size);
+//        Course c = new Course();
+//        c.setName(key);
+        Example example = new Example(Course.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andLike("name","%"+key+"%");
+        criteria.orLike("teacherName","%"+key+"%");
+        Page<Course> courses = (Page<Course>) courseMapper.selectByExample(example);
+        System.out.println(courses);
+        return new PageResult<Course>(courses.getTotal(),courses.getResult());
+    }
+
+
     /**
      * 分页+条件查询
      * @param searchMap
@@ -69,7 +87,7 @@ public class CourseServiceImpl implements CourseService {
      * @param size
      * @return
      */
-    @Override
+
     public PageResult<Course> findPage(Map<String, Object> searchMap, int page, int size) {
         PageHelper.startPage(page,size);
         Example example = createExample(searchMap);
@@ -177,6 +195,25 @@ public class CourseServiceImpl implements CourseService {
         return ans;
     }
 
+    /**
+     * 根据教师id查询授课信息
+     * @param teacherId
+     * @return
+     */
+    @Override
+    public List<Course> getInfoByTeacherId(String teacherId) {
+        Course searchObj = new Course();
+        searchObj.setTeacherId(teacherId);
+        return courseMapper.select(searchObj);
+    }
+
+    @Override
+    public List<Course> teachCourse(String teacherId) {
+        Course course = new Course();
+        course.setTeacherId(teacherId);
+        return courseMapper.select(course);
+    }
+
     /**
      * 构建查询条件
      * @param searchMap
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SeckillServiceImpl.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SeckillServiceImpl.java
index e5ec93ea0348aadbcb709196c54596f1219142e1..c14439dbc44f9e84f808b5a6bd2c4bc5001b0d2c 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SeckillServiceImpl.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SeckillServiceImpl.java
@@ -2,7 +2,8 @@ package cn.cy.course.service.impl;
 
 import cn.cy.course.pojo.Pack;
 import cn.cy.course.service.SeckillService;
-import cn.cy.course.task.CreateSelectionExcutor;
+import cn.cy.course.service.SelectionService;
+import cn.cy.course.task.CreateSelectionExecutor;
 import cn.cy.course.util.RedisConstantKey;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +22,10 @@ public class SeckillServiceImpl implements SeckillService {
     private RedisTemplate redisTemplate;
 
     @Autowired
-    private CreateSelectionExcutor createSelectionExcutor;
+    private CreateSelectionExecutor createSelectionExecutor;
+
+    @Autowired
+    private SelectionService selectionService;
 
 
     @Override
@@ -43,14 +47,24 @@ public class SeckillServiceImpl implements SeckillService {
         redisTemplate.boundListOps(RedisConstantKey.SECKILL_QUEUE.toString()).leftPush(pack);
 
         //4. 异步处理任务Pack
-        createSelectionExcutor.createSelection();
+        createSelectionExecutor.createSelection();
     }
 
     @Override
     public void remove(Pack pack) {
-        boolean included = redisTemplate.boundSetOps(RedisConstantKey.SELECTION_SET.toString() + pack.getStudentId()).isMember(pack.getCourseId());
-        if (!included) {
+        System.out.println(pack.getCourseId() + " " + pack.getStudentId());
+        Boolean included = redisTemplate.boundSetOps(RedisConstantKey.SELECTION_SET.toString() + pack.getStudentId()).isMember(pack.getCourseId());
+        if (included == null || !included) {
             throw new RuntimeException("该选课记录已经被移除！");
         }
+
+        //1. mysql移除选课纪录
+        selectionService.delete(pack.getStudentId(), pack.getCourseId());
+
+        //2. redis选课记录移除
+        redisTemplate.boundSetOps(RedisConstantKey.SELECTION_SET.toString() + pack.getStudentId()).remove(pack.getCourseId());
+
+        //3. redis课程库存回滚
+        createSelectionExecutor.redisStockRollBack(pack.getCourseId());
     }
 }
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SelectionServiceImpl.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SelectionServiceImpl.java
index 33a1f534923452a4f91a3ec4eaa1d86c463eb555..d71da51246637ec8d9d2ef44c70515c4582e7283 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SelectionServiceImpl.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/service/impl/SelectionServiceImpl.java
@@ -4,11 +4,13 @@ import cn.cy.course.entity.PageResult;
 import cn.cy.course.mapper.SelectionMapper;
 import cn.cy.course.pojo.Course;
 import cn.cy.course.pojo.Selection;
+import cn.cy.course.service.CourseService;
 import cn.cy.course.service.SelectionService;
 import cn.cy.course.task.DB2RedisTimer;
 import cn.cy.course.util.RedisConstantKey;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import org.apache.dubbo.config.annotation.Reference;
 import org.apache.dubbo.config.annotation.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -31,6 +33,8 @@ public class SelectionServiceImpl implements SelectionService {
 
     @Autowired
     private RedisTemplate redisTemplate;
+
+
     @Override
     public List<Selection> findAll() {
         return selectionMapper.selectAll();
@@ -132,6 +136,9 @@ public class SelectionServiceImpl implements SelectionService {
      */
     @Override
     public void delete(String studentId, String courseId) {
+        if (studentId == null || courseId == null || "".equals(studentId) || "".equals(courseId)) {
+            throw new RuntimeException("Remove a Selection must determine studentId and courseId.");
+        }
         Selection selection = new Selection();
         selectionMapper.delete(selection);
     }
@@ -184,4 +191,5 @@ public class SelectionServiceImpl implements SelectionService {
         }
         return ans;
     }
+
 }
diff --git a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExcutor.java b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExecutor.java
similarity index 94%
rename from cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExcutor.java
rename to cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExecutor.java
index 738fca83de5e6df0e7794fcd8efdf4a5e2375da9..17ec578b2163acc708bc6e48fbd120238d18db0d 100644
--- a/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExcutor.java
+++ b/cy-code/course-selection-server/course-selection-service/src/main/java/cn/cy/course/task/CreateSelectionExecutor.java
@@ -12,8 +12,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import java.sql.SQLIntegrityConstraintViolationException;
-
 /**
  * @author eddieVim
  * @微信公众号 艾迪威姆 / PositiveEddie
@@ -21,7 +19,7 @@ import java.sql.SQLIntegrityConstraintViolationException;
  * @create 2020/9/18 5:10 下午
  */
 @Component
-public class CreateSelectionExcutor {
+public class CreateSelectionExecutor {
 
     @Autowired
     private RedisTemplate redisTemplate;
@@ -32,11 +30,6 @@ public class CreateSelectionExcutor {
     @Autowired(required = false)
     private CourseService courseService;
 
-    @Async
-    public void testAsync() {
-        System.out.println("---TEST_ASYNC---");
-    }
-
     /**
      * 1. 从redis list中取出处理
      * 2. 处理库存（库存队列，课程信息库存）
@@ -113,7 +106,7 @@ public class CreateSelectionExcutor {
      *
      * @param courseId 课程ID
      */
-    private void redisStockRollBack(String courseId) {
+    public void redisStockRollBack(String courseId) {
         // 库存数回滚
         redisTemplate.boundListOps(RedisConstantKey.COURSE_STOCK_QUEUE.toString()).leftPush(courseId);
         redisTemplate.boundHashOps(RedisConstantKey.COURSE_STOCK_HASH.toString()).increment(courseId, 1);
diff --git a/cy-code/course-selection-server/course-selection-service/src/test/java/cn/cy/course/mapper/SelectionMapperTest.java b/cy-code/course-selection-server/course-selection-service/src/test/java/cn/cy/course/mapper/SelectionMapperTest.java
index 5b57e1c3bcb97a2642c05dce9967f7e5a734419a..43f493ec7e9aa132a4e0a80f4170afb20303682e 100644
--- a/cy-code/course-selection-server/course-selection-service/src/test/java/cn/cy/course/mapper/SelectionMapperTest.java
+++ b/cy-code/course-selection-server/course-selection-service/src/test/java/cn/cy/course/mapper/SelectionMapperTest.java
@@ -1,6 +1,7 @@
 package cn.cy.course.mapper;
 
 import cn.cy.course.pojo.Selection;
+import cn.cy.course.service.CategoryService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
@@ -8,8 +9,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.Date;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 /**
  * @author eddieVim
  * @微信公众号 艾迪威姆 / PositiveEddie
@@ -23,6 +22,9 @@ class SelectionMapperTest {
     @Autowired(required = false)
     private SelectionMapper selectionMapper;
 
+    @Autowired(required = false)
+    private CategoryService categoryService;
+
     @Test
     public void fun() {
         Selection selection = new Selection();
@@ -33,4 +35,5 @@ class SelectionMapperTest {
         selectionMapper.insert(selection);
     }
 
+
 }
\ No newline at end of file
diff --git a/readme.md b/readme.md
index a2eaa79e7e3d55d63f10bc3afad8bc896caa70dc..88073a7a50ff3e91933591dde152bd4a940e5b3c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,36 +1,26 @@
-# cy-code
-
+# cy-code 
 
 
 ## CODE结构
 
-- 前端模块`cs-ui`
+- 前端模块`cs-ui-portal`
 
-- 数据库模块及其接口文档
+- 数据库模块及其接口文档`sql_doc`
 
 - 后端模块`cy-code`
 
-    - `course-selection-api`
-
-        为前端提供`api`，`dubbo`服务消费者
+    - `course-selection-api`: 为前端提供`api`，`dubbo`服务消费者
 
     - `course-selection-server`
 
-        - `course-selection-interface`
-
-            `pojo`实体类与服务接口定义
-
-        - `course-selection-service`
-
-            主要用于编写服务实现类及`Dao`接口，`dubbo`服务生产者
+        - `course-selection-interface`: `pojo`实体类与服务接口定义
 
+        - `course-selection-service`: 主要用于编写服务实现类及`Dao`接口，`dubbo`服务生产者
 
 
 
 
-## 选课系统
-
-### 技术选型
+## 技术选型
 
 `SpringBoot` + `Dubbo`  + `Redis` + `MySQL` + `Nginx`  + `RabbitMQ` + `Thymeleaf` + `Vue.js`
 
@@ -45,26 +35,11 @@
 - Thymeleaf：生成静态页面，减少渲染速度
 - Vue.js
 
+## 设计文档
+- [架构设计](https://gitee.com/eddievim/cy-code/wikis/%E6%9E%B6%E6%9E%84%E8%AE%BE%E8%AE%A1)
+- [数据库设计](https://gitee.com/eddievim/cy-code/wikis/%E6%95%B0%E6%8D%AE%E5%BA%93%E8%AE%BE%E8%AE%A1)
+- [系统权限设计](https://gitee.com/eddievim/cy-code/wikis/%E7%B3%BB%E7%BB%9F%E6%9D%83%E9%99%90%E8%AE%BE%E8%AE%A1)
+- [高并发选课流程设计](https://gitee.com/eddievim/cy-code/wikis/%E9%AB%98%E5%B9%B6%E5%8F%91%E9%80%89%E8%AF%BE%E6%B5%81%E7%A8%8B%E8%AE%BE%E8%AE%A1)
 
-
-### 重难点
-
-#### 多线程处理
-
-使用线程池，进行压力测试
-
-
-
-#### 集群部署与环境
-
-业务服务利用`Dubbo` + `zookeeper`部署，`MySQL`、`Redis`、`Nginx`部署
-
-结合`Docker`自动化部署？
-
-
-
-#### 用户权限管理
-
-`SpringSecurity`or`Shiro`？
-
-如何设计？
\ No newline at end of file
+## 系统部署
+[环境部署文档](https://gitee.com/eddievim/cy-code/wikis/Course-Selection%E7%8E%AF%E5%A2%83%E9%83%A8%E7%BD%B2)