diff --git a/front/src/App.vue b/front/src/App.vue
index 4ea79a0..7c84290 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -17,8 +17,12 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-  max-width: 1920px;
+  max-width: 120rem;
   margin: auto;
   background-color: #f5f5f5;
 }
+html,body{
+  width: 100%;
+  height: 100%;
+}
 </style>
diff --git a/front/src/api/competition.js b/front/src/api/competition.js
index 94404c7..12f6027 100644
--- a/front/src/api/competition.js
+++ b/front/src/api/competition.js
@@ -1,9 +1,8 @@
 import request from '@/utils/request'
 let baseUrl = '/api/competition/'
-export function getList(query) {
+export function getList(pageNO,type) {
     return request({
-      url: baseUrl+'list',
-      method: 'post',
-      data: query
+      url: baseUrl+'list'+"/"+type+"/"+pageNO,
+      method: 'get'
     })
   }
\ No newline at end of file
diff --git a/front/src/components/index.vue b/front/src/components/index.vue
index 57091a8..7dcbc3c 100644
--- a/front/src/components/index.vue
+++ b/front/src/components/index.vue
@@ -330,6 +330,9 @@ import Footer from '@/components/footer.vue'
 export default {
   components:{
     "tz-footer": Footer
+  },
+  mounted(){
+
   },
   methods:{
     goCompetition(id){
diff --git a/front/src/router/index.js b/front/src/router/index.js
index 1bdee5c..5ea37bc 100644
--- a/front/src/router/index.js
+++ b/front/src/router/index.js
@@ -4,6 +4,7 @@ import Index from '@/components/index'
 import CompetitionIndex from '@/views/competition/index'
 import Login from '@/views/login/index'
 import Exam from '@/views/system/exam'
+import Member from '@/views/member/index'
 
 Vue.use(Router)
 
@@ -29,6 +30,11 @@ export default new Router({
       path: '/exam',
       name: 'Exam',
       component: Exam
+    },
+    {
+      path: '/member',
+      name: 'Member',
+      component: Member
     }
   ]
 })
diff --git a/front/src/views/member/index.vue b/front/src/views/member/index.vue
new file mode 100644
index 0000000..fb8c102
--- /dev/null
+++ b/front/src/views/member/index.vue
@@ -0,0 +1,139 @@
+<template>
+    <div>
+        <div class="member_header">
+            <div>
+                <b-img class="logo" src="/static/image/logo_white.png" />
+                <b-img src="/static/image/title.png" />
+            </div>
+            <div class="tz-flex">
+                <div>
+                    <b-img src="/static/image/icon_admin1_30x30.png" />
+                    <span>首页</span>
+                </div>
+                <div>
+                    <b-img src="/static/image/icon_admin2_30x30.png" />
+                    <span>个人中心</span>
+                </div>
+                <div>
+                    <b-img src="/static/image/icon_admin3_30x30.png" />
+                    <span>退出</span>
+                </div>
+            </div>
+        </div>
+        <b-container class="member_info">
+            <b-row>
+                <b-col sm="3">
+                    <div class="left_panel">
+                        <div>
+                            <b-img src="/static/image/icon_admin4_30x30.png" /> 个人中心
+                        </div>
+                        <div>
+                            个人信息
+                        </div>
+                    </div>
+                </b-col>
+                <b-col>                   
+                        <div>
+                            <b-img src="/static/image/admin_tx.jpg" />
+                        </div>
+                        <div class="info">
+                            <div>
+                                下午好，李女士
+                            </div>
+                            <div>
+                                <b-img src="/static/image/icon_admin5_20x20.png" />
+                                <span> 上次登录1天前</span>
+                            </div>
+                            <div>
+                            <span> 上次登陆IP: 110.12.68.64</span>
+                            <span> IP登陆地: 广东省深圳市宝安区</span>
+                            </div>
+                        </div>
+                </b-col>
+            </b-row>
+        </b-container>
+        <tz-footer />
+    </div>
+</template>
+<script>
+import Footer from '@/components/footer'
+export default {
+    components:{
+        "tz-footer": Footer
+    }
+    
+}
+</script>
+<style scoped>
+.logo{
+    width: 2rem;
+    height: 2rem;
+}
+.member_header{
+    background-image: url('/static/image/member_bg.jpg');
+    background-size: cover;
+    min-height: 90px;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+.member_content{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: 1rem;
+    margin-top: 1rem;
+}
+.tz-flex{
+    display: flex;
+    color: white;
+    align-items: center;
+}
+.tz-flex div{
+    margin-right: 1rem;
+    font-weight: 500;
+}
+.left_panel{
+    background-color: white;
+    margin-right: 1rem;
+}
+.left_panel div{
+    padding: 0.5rem 3rem 0.5rem 3rem ;
+}
+.left_panel img{
+    margin-right: 1rem;
+}
+.left_panel div:nth-child(1){
+    background-color: #016fe7;
+    /* background-image: linear-gradient(to rigth ,#00a0f1, #0163e4); */
+    background-image: linear-gradient(to right, #00a1f1 , #0163e4);
+    color: white;
+    font-weight: bolder;
+    text-align: left;
+}
+.member_info{
+    padding: 1rem;
+}
+.info{
+    width: 100%;
+}
+.info div{
+    margin-top: .5rem;
+    text-align: left;
+    padding-left: 1rem;
+}
+.info div:nth-child(1){
+    font-weight: bold;
+    color: black;
+}
+.info div:nth-child(2) span{
+    display: inline-block;
+    background-color: #fe7e01;
+    border-radius: 10px;
+    color: white;
+    padding:  0 1rem 0 1rem;
+}
+.info div:nth-child(3) span{
+    margin-right: 1rem;
+}
+</style>
\ No newline at end of file
diff --git a/front/src/views/system/cutdown.vue b/front/src/views/system/cutdown.vue
index 5344a3d..2a3782a 100644
--- a/front/src/views/system/cutdown.vue
+++ b/front/src/views/system/cutdown.vue
@@ -12,20 +12,35 @@
 <script>
 export default {
     created(){
-        this.cutDownManger = setInterval(tihs.cutDown,1000)       
+        this.startTime = new Date(this.start)
+        this.endTime = new Date(this.end)
+      
+            
+    },
+    mounted(){
+        let end = setInterval(() => {
+            
+        }, 3000);
+        for(var i = 0;i<=end;i++){
+            clearInterval(i);
+        }
+      console.log("cutDown component mounted")
+      this.cutDownManger = setInterval(this.cutDown,1000)  
     },
     props:{
-        startTime:{
-            type: Date,
+        start:{
+            type: String,
             default: null
         },
-        endTime:{
-            type: Date,
+        end:{
+            type: String,
             default: null
         }
     },
     data(){
         return {
+            startTime: null,
+            endTime: null,
             hundred:9,
             ten: 9,
             bit: 9,
@@ -36,17 +51,19 @@ export default {
     },
     methods:{
         cutDown(){
-            if(this.endTime.getTime()<Date.getTime()&&this.startTime.getTime()>=Date.getTime()){
-               let remaind =  Date.getTime() - this.endTime.getTime()
+            let now = new Date()
+            console.log(this.cutDownManger)
+            if( this.endTime.getTime()>now.getTime()&&this.startTime.getTime()<=now.getTime()){                
+               let remaind = this.endTime.getTime() - now.getTime()               
                let seconds = Math.floor(remaind/1000)
                let sec = seconds%60
-               let minutes = (seconds - sec)%60
+               let minutes =Math.floor(seconds/60)              
                this.sec2 = sec%10
-               this.sec1 = sec - this.sec2
+               this.sec1 = (sec - this.sec2)%100/10
                this.bit = minutes%10;
-               this.then = (minutes - this.bit)%100
-               this.hundred = (minutes - this.then - this. bit)%1000
-            }else if(this.endTime.getTime()>=Date.getTime()) {
+               this.ten =Math.floor( minutes %100/10)
+               this.hundred =Math.floor( minutes %1000/100)
+            }else if(this.endTime.getTime()<=now.getTime()) {
                 this.hundred = 0
                 this.ten = 0
                 this.bit =0
@@ -63,16 +80,22 @@ export default {
 </script>
 <style scoped>
 .cutdown{
+    display: inline-block;
     position: relative;
-    display: flex;
+    max-width: 15rem;
 }
 .cd-text{
     color: white;
+    font-weight: bolder;
 }
 .cd-time{
     display: inline-block;
     background-color: white;
     color: black;
-
+    padding: 3px;
+    border-radius: 5px;
+    font-weight: bold;
+    padding-left: .5rem;
+    padding-right: .5rem;
 }
 </style>
\ No newline at end of file
diff --git a/front/src/views/system/exam.vue b/front/src/views/system/exam.vue
index b31e0ad..8f3cb5c 100644
--- a/front/src/views/system/exam.vue
+++ b/front/src/views/system/exam.vue
@@ -7,10 +7,61 @@
                 <b-img src="/static/image/exam_title.png" />
                 </div>
                 <div>
-                    <cut-down endTime="2022-3-9 00:00:00" startTime="2022-3-8 00:00:00" />
+                    <cut-down start="2022-3-9 00:00:00" end="2022-3-9 03:00:00"  />
+                </div>
+            </div>
+            <div class="exam-header-title">
+                <div>
+                    2020年全国高职财经大数据分析大赛--金融实操赛项
+                </div>
+                <div>
+                    <b-button class="exam-button">交卷</b-button>
                 </div>
             </div>
         </div>
+        <div class="tz-exam-content">
+            <div class="tz-exam-left-panel">
+                <div class="tz-exam-box">
+                    <div class="tz-exam-box-title2">产品研究部试用吴京和</div>
+                    <div class="tz-exam-box-content">
+                        <b-img src="/static/image/tx80x80.png" /> 考试日期： 2022-10-10
+                    </div>
+                </div>
+                <div class="tz-exam-box">
+                    <div class="tz-exam-box-title">
+                        <b-img src="/static/image/icon_answer2_25x25.png" />
+                        单选题
+                    </div>
+                    <div class="tz-exam-box-content">
+                        <span  v-for="(item,$index) in singleQuestion" :key="$index" :class="getStatus(item.id)" > {{ item.id }} </span>
+                    </div>
+                </div>
+                <div  class="tz-exam-box">
+                    <div class="tz-exam-box-title">
+                        <b-img src="/static/image/icon_answer3_25x25.png" />
+                        多选题
+                    </div>
+                    <div class="tz-exam-box-content">
+                        <span v-for="(item,$index) in multiQuestion" :key="$index" :class="getStatus(item.id)"> {{ item.id }} </span>
+                    </div>
+                </div>
+                <div class="tz-exam-box">
+                    <div class="tz-exam-box-title">
+                        <b-img src="/static/image/icon_answer4_25x25.png" />
+                        判断题
+                    </div>
+                    <div class="tz-exam-box-content">
+                        <span v-for="(item,$index) in judgeQuestion" :key="$index" :class="getStatus(item.id)"> {{ item.id }} </span>
+                    </div>
+                </div>
+                <div class="tz-exam-box-tips">
+                    <span class="done">已答</span><span class="notAnwser">未答</span><span class="sign">标记</span>
+                </div>
+            </div>
+            <div>
+                
+            </div>
+        </div>
     </div>
 </template>
 <script>
@@ -18,7 +69,42 @@ import CutDown from './cutdown.vue'
 export default {
     data(){
         return {
-
+            singleQuestion: [],
+            multiQuestion: [],
+            judgeQuestion: [],
+            doneList:[],
+            markList:[],
+            current: 20
+        }
+    },
+    methods:{
+        getStatus(id){
+            let c = "";
+            if(id == this.current){
+                c = "current"
+            }
+            if(this.markList.indexOf(id)>=0){
+                return c +" sign"
+            }
+            if(this.doneList.indexOf(id)>=0){
+                return c+ " done"
+            }
+            return  c +"notAnwser";
+        }
+    },
+    created(){
+        this.doneList = [1,3,5,20,50,88]
+        this.markList = [2,6,9,10,80,100,120]
+        for(var i = 1;i<=60;i++){
+            this.singleQuestion.push({id:i,name: ''})
+        }
+        let startIndex =this.singleQuestion.length+1
+        for(var i = startIndex; i<=startIndex +40; i++){
+            this.multiQuestion.push({id:i,name: ''})
+        }
+        startIndex =this.singleQuestion.length+ this.multiQuestion.length +1
+        for(var i = startIndex; i<= startIndex +20;i++){
+            this.judgeQuestion.push({id:i,name: ''})
         }
     },
     components:{
@@ -30,13 +116,138 @@ export default {
 .tz-exam-header{
     background-image: url('/static/image/answer_topbg_1990x140.jpg');
     background-size: cover;
-    min-height: 140px;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    min-height: 8.75rem;
 }
 .tz-exam-header-line{
-    max-width: 1200px;
+    min-width: 75rem;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 1rem;
+    height: 20%;
 }
 .tz-logo{
     width: 2rem;
     margin-right: .5rem;
 }
+.tz-exam-left-panel{
+    width: 30%;
+}
+.exam-header-title{
+    display: flex;
+    min-width: 75rem;
+    margin-top: 1rem;
+    justify-content: center;
+    align-items: center;
+    background-color: #0264d2;
+    color: white;
+    /* height: calc(80% - 2rem); */
+    border-top-left-radius: 1.5rem;
+    border-top-right-radius: 1.5rem;
+    font-weight: bold;
+}
+.exam-header-title div:nth-child(1){
+    width: 90%;
+}
+.exam-button{
+    background-color: #ff6600;
+    font-weight: bold;
+    color: white;
+    padding: 0.1rem 1rem 0.1rem 1rem;
+}
+.tz-exam-content{
+    display: flex;
+    max-width: 75rem;
+    margin:auto;
+}
+.tz-exam-box{
+    display: flex;
+    flex-wrap: wrap;
+}
+.tz-exam-box-title{
+    width: 60%;
+    margin:auto;
+    background-color: #0172e7;
+    margin-top:2rem;
+    color: white;
+    padding: .5rem;
+    border-radius: 10px 10px 0 0 ;
+    font-weight: bold;
+}
+.tz-exam-box-title img{
+    margin-right: 1rem;
+}
+.tz-exam-box-title::before{
+    background-image: url('/static/image/circle.png');
+    content: "";
+    width: 2rem;
+    height: 2rem;
+    position: absolute;
+    margin-left: -1.5rem;
+    background-size: cover;
+}
+.tz-exam-box-title2{
+    width: 60%;
+    margin:auto;
+    margin-top:2rem;
+    color: white;
+    padding: .5rem;
+    border-radius: 10px 10px 0 0 ;
+    font-weight: bold;
+    background-color: #ee4c50;
+}
+.tz-exam-box-title2::after{
+    background-image: url('/static/image/icon_answer1_27x27.png');
+
+}
+.tz-exam-box-content{
+    width: 100%;
+    border-radius: 10px;
+    background-color: white;
+    padding: 1rem 0 1rem 0;
+    border: 1px solid #e0e0e0;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 1rem;
+    align-items: center;
+    justify-content: space-around;
+}
+.tz-exam-box-content span{
+    background-color: #eaedf6;
+    display: inline-block;
+    border-radius: 5px;
+    color: black;
+    padding: .5rem;
+    margin-top: 1rem;
+    margin-right: .5rem;
+}
+.tz-exam-box-tips{
+    text-align: left;
+}
+.tz-exam-box-tips span{
+    border-radius: 5px;
+    padding: .5rem;
+    display: inline-block;    
+    margin-right: .5rem;
+    margin-top: 1rem;
+}
+
+.done {
+    background-color: #e1e4ec !important;
+    color: black !important;
+}
+.notAnwser{
+    background-color: #e64d50 !important;
+    color: white !important;
+}
+.sign{
+    background-color: #0260ca !important;
+    color: white !important;
+}
+.current{
+    border: 1px solid black;
+}
 </style>
\ No newline at end of file
diff --git a/front/static/image/admin_tx.jpg b/front/static/image/admin_tx.jpg
new file mode 100644
index 0000000..87f4e65
Binary files /dev/null and b/front/static/image/admin_tx.jpg differ
diff --git a/front/static/image/circle.png b/front/static/image/circle.png
new file mode 100644
index 0000000..9749ade
Binary files /dev/null and b/front/static/image/circle.png differ
diff --git a/front/static/image/icon_admin1_30x30.png b/front/static/image/icon_admin1_30x30.png
new file mode 100644
index 0000000..f084a8c
Binary files /dev/null and b/front/static/image/icon_admin1_30x30.png differ
diff --git a/front/static/image/icon_admin2_30x30.png b/front/static/image/icon_admin2_30x30.png
new file mode 100644
index 0000000..09b4a60
Binary files /dev/null and b/front/static/image/icon_admin2_30x30.png differ
diff --git a/front/static/image/icon_admin3_30x30.png b/front/static/image/icon_admin3_30x30.png
new file mode 100644
index 0000000..28db15d
Binary files /dev/null and b/front/static/image/icon_admin3_30x30.png differ
diff --git a/front/static/image/icon_admin4_30x30.png b/front/static/image/icon_admin4_30x30.png
new file mode 100644
index 0000000..0c27819
Binary files /dev/null and b/front/static/image/icon_admin4_30x30.png differ
diff --git a/front/static/image/icon_admin5_20x20.png b/front/static/image/icon_admin5_20x20.png
new file mode 100644
index 0000000..6501082
Binary files /dev/null and b/front/static/image/icon_admin5_20x20.png differ
diff --git a/front/static/image/logo_white.png b/front/static/image/logo_white.png
new file mode 100644
index 0000000..1bebfae
Binary files /dev/null and b/front/static/image/logo_white.png differ
diff --git a/front/static/image/member_bg.jpg b/front/static/image/member_bg.jpg
new file mode 100644
index 0000000..2870159
Binary files /dev/null and b/front/static/image/member_bg.jpg differ
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/CompetitionIndexControll.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/CompetitionIndexControll.java
index 484605f..8add9f5 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/CompetitionIndexControll.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/CompetitionIndexControll.java
@@ -12,9 +12,9 @@ public class CompetitionIndexControll {
 
     @Autowired
     private CompetitionIndexBiz competitionIndexBiz;
-    @GetMapping(value = "list/{pageNo}")
-    public Result<IndexListCompetitionDTO> list(@PathVariable("pageNo") Integer pageNo){
-        return competitionIndexBiz.list(pageNo);
-    }
 
+    @GetMapping(value = "list/{type}/{pageNo}")
+    public Result<IndexListCompetitionDTO> list(@PathVariable("type") Integer type,@PathVariable("pageNo") Integer pageNo){
+        return competitionIndexBiz.list(pageNo,type);
+    }
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionIndexBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionIndexBiz.java
index 3f5551f..df3bb20 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionIndexBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionIndexBiz.java
@@ -1,17 +1,36 @@
 package com.tz.platform.competitiion.api.biz;
 
 import com.tz.platform.common.core.base.Result;
+import com.tz.platform.common.core.tools.BeanUtils;
+import com.tz.platform.competitiion.api.dto.IndexCompetitionDTO;
 import com.tz.platform.competitiion.api.dto.IndexListCompetitionDTO;
+import com.tz.platform.entity.Competition;
 import com.tz.platform.repository.CompetitionDao;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class CompetitionIndexBiz {
     @Autowired
     private CompetitionDao competitionDao;
 
-    public Result<IndexListCompetitionDTO> list(int pageNo){
-        return Result.error("");
+    public Result<IndexListCompetitionDTO> list(int pageNo,int type){
+        int pageSize = 20;
+        if(pageNo<0){
+            pageNo = 0;
+        }
+        pageNo =pageNo* pageSize;
+        Pageable pageable = PageRequest.of(pageNo,pageSize);
+        Page<Competition> competitionList = competitionDao.findAllByStatus(type,pageable);
+        System.out.println(competitionList.getContent());
+        IndexListCompetitionDTO dto = new IndexListCompetitionDTO();
+        List<IndexCompetitionDTO> competitionDTOList = BeanUtils.copyProperties(competitionList.getContent(),IndexCompetitionDTO.class);
+        dto.setList(competitionDTOList);
+        return Result.success(dto);
     }
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexCompetitionDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexCompetitionDTO.java
index 2818247..59003b6 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexCompetitionDTO.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexCompetitionDTO.java
@@ -1,17 +1,24 @@
 package com.tz.platform.competitiion.api.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class IndexCompetitionDTO implements Serializable {
     private Integer id;
     private String name;
     private String sponsor;
+    private String supporter;
+    private String thumbnail;
     private Date startTime;
     private Date endTime;
     private Date sinUpStartTime;
     private Date sinUpEndTime;
+    private Boolean enableSignup;
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexListCompetitionDTO.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexListCompetitionDTO.java
index c33e356..aad4282 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexListCompetitionDTO.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/dto/IndexListCompetitionDTO.java
@@ -8,5 +8,4 @@ import java.util.List;
 @Data
 public class IndexListCompetitionDTO implements Serializable {
    private List<IndexCompetitionDTO> list;
-   private Integer total;
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/CompetitionJob.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/CompetitionJob.java
index dcd2846..f88b4c7 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/CompetitionJob.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/CompetitionJob.java
@@ -3,42 +3,64 @@ package com.tz.platform.competitiion.job;
 import com.tz.platform.competitiion.job.biz.CompetitionJobBiz;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisStringCommands;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.types.Expiration;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 @Component
 @Slf4j
 public class CompetitionJob {
 
 
-    @Autowired
-    private RedisTemplate<String,Boolean> redisTemplate;
+    @Resource
+    private RedisTemplate redisTemplate;
 
     @Autowired
     private CompetitionJobBiz jobBiz;
 
+    /**
+     * 过期时间 毫秒
+     */
+    private long ms = 3600000;
+
+    /**
+     * 每分钟执行一次
+     */
     @Scheduled(cron = "*/60 * * * * ?")
     public void processCompetition(){
-//        String jobName = "competitionJob";
-//        Boolean isWorking =   redisTemplate.opsForValue().get(jobName);
-//        if(isWorking == null ||isWorking == false){
-//            redisTemplate.opsForValue().set(jobName,true,10*60, TimeUnit.SECONDS);
-//            System.out.println("competition Job");
-//            try {
-//                jobBiz.updateCompetitionStatus();
-//            }catch (Exception ex) {
-//                log.error(jobName,ex.getMessage());
-//            }finally {
-//                redisTemplate.opsForValue().set(jobName,false,10*60, TimeUnit.SECONDS);
-//            }
-//        }
+        String jobName = "competitionJobLock";
+        boolean lr = lock(jobName,ms);
+        if(lr){
+            try {
+                jobBiz.updateCompetitionStatus();
+            }catch (Exception ex){
+                log.error("大赛状态更新任务失败: {}",ex.getMessage());
+            }finally {
+                unLock(jobName);
+            }
+        }
+    }
+
+    /**
+     * 每分钟执行一次
+     */
+//    @Scheduled(cron = "*/5 * * * * ?")
+    public void preHeat(){
+        String jobName = "competitionPreHeat";
+        boolean lock = lock(jobName,ms);
+        if(lock){
+            try{
+                jobBiz.preHeat();
+            }catch (Exception ex){
+
+            }finally {
+                unLock(jobName);
+            }
+        }
     }
 
     /**
@@ -69,4 +91,10 @@ public class CompetitionJob {
             return Boolean.FALSE;
         });
     }
+    public  void unLock(String key){
+        redisTemplate.execute((RedisCallback) redisConnection -> {
+            redisConnection.del(key.getBytes());
+            return true;
+        });
+    }
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/CompetitionJobBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/CompetitionJobBiz.java
index 454d12f..24d8d4b 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/CompetitionJobBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/CompetitionJobBiz.java
@@ -1,13 +1,21 @@
 package com.tz.platform.competitiion.job.biz;
 
+import com.tz.platform.common.core.bo.Stage;
 import com.tz.platform.entity.Competition;
+import com.tz.platform.entity.CompetitionMember;
+import com.tz.platform.entity.CompetitionTask;
+import com.tz.platform.feign.exam.IFeignExam;
+import com.tz.platform.feign.exam.qo.CacheQuetionQO;
+import com.tz.platform.feign.user.IFeignUser;
 import com.tz.platform.repository.CompetitionDao;
 import com.tz.platform.repository.CompetitionMemberDao;
 import com.tz.platform.repository.CompetitionTaskDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 public class CompetitionJobBiz {
@@ -21,18 +29,91 @@ public class CompetitionJobBiz {
     @Autowired
     private CompetitionMemberDao memberDao;
 
+    @Autowired
+    private IFeignUser feignUser;
+
+    @Autowired
+    private IFeignExam feignExam;
+
+
     /**
-     * 大赛开始状态检测
+     * 大赛开始状态检测 每分钟执行
      */
     public void updateCompetitionStatus(){
         List<Competition> competitionList = competitionDao.findAllByStatus(0);
+        competitionList.forEach(competition -> {
+            try {
+                updateCompetitionStatus(competition);
+            }catch (Exception ex){
+
+            }
+        });
+        List<Competition> competitionList1 = competitionDao.findAllByStatus(1);
+        competitionList1.forEach(competition -> {
+            try {
+                doneCompetitionStatus(competition);
+            }catch (Exception ex){
+
+            }
+        });
     }
 
     /**
      * 大赛数据预热
      */
     public void preHeat(){
+        List<Competition> competitionList = competitionDao.findAllByStatus(0);
+        competitionList.forEach(competition -> {
+            try {
+                preHeatCompetition(competition);
+            }catch (Exception ex){
+
+            }
+        });
+    }
+
+    public void preHeatCompetition(Competition competition){
+        Long now = System.currentTimeMillis();
+        Stage current = competition.getStageList().stream().filter(stage -> stage.getStartTime().getTime() <= now && stage.getEndTime().getTime() > now).findFirst().orElse(null);
+        if(current!=null){
+            List<CompetitionMember> memberList = memberDao.findAllByCompetitionIdAndStageId(competition.getId(),current.getId());
+            List<Long> userIdList = memberList.stream().mapToLong(CompetitionMember::getUserId).boxed().collect(Collectors.toList());
+            boolean rs =  feignUser.putToCache(userIdList);
+            CompetitionTask task = taskDao.getByCompetitionIdAndStageId(competition.getId(),current.getId());
+            List<Long> ids = new ArrayList<>();
+            task.getQuestionList().forEach(taskQuestion -> {
+                ids.addAll(taskQuestion.getQuestionIds());
+            });
+            long ms = (task.getExamEndTime().getTime() - now)+24*3600*1000;
+            CacheQuetionQO qo = new CacheQuetionQO();
+            qo.setIds(ids);
+            qo.setKey("exam_"+competition.getId()+"_"+current.getId());
+            qo.setMs(ms);
+            feignExam.putToCache(qo);
+        }
+    }
+
+    public void updateCompetitionStatus(Competition competition){
+        Long now = System.currentTimeMillis();
+
+        //进行中
+        Stage current = competition.getStageList().stream().filter(stage -> stage.getStartTime().getTime() <= now && stage.getEndTime().getTime() > now).findFirst().orElse(null);
+        if (current != null) {
+            competition.setCurrentStage(current.getId());
+            competition.setCurrentStageName(current.getName());
+            competition.setStatus(1);
+            competitionDao.updateStatus(competition.getId(),1,current.getName(),current.getId());
+        }
+    }
 
+    public void doneCompetitionStatus(Competition competition){
+        Long now = System.currentTimeMillis();
+        //已完成
+        long done = competition.getStageList().stream().filter(stage -> stage.getEndTime().getTime()<= now).count();
+        if(competition.getStageList().size() == done){
+            competition.setStatus(2);
+            competitionDao.updateStatus(competition.getId(),2);
+        }
     }
 
     /**
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
index 1e05cd2..a99d843 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/CompetitionMember.java
@@ -3,10 +3,11 @@ package com.tz.platform.entity;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.util.Date;
 
 @Entity
 @Data
-@Table(indexes={@Index(columnList = "competitionId,stageId,teamId"),@Index(columnList = "studentNo"),@Index(columnList = "name")})
+@Table(indexes={@Index(columnList = "competitionId,stageId,teamId"),@Index(columnList = "studentNo"),@Index(columnList = "name"),@Index(columnList = "school")})
 public class CompetitionMember {
 
     @Id
@@ -23,8 +24,11 @@ public class CompetitionMember {
     private String accountId;
     private String accountPwd;
     private String teacher;
-    private Long examSore;
-    private Long financeSore;
+    private Long examScore;
+    private Long financeScore;
+    private Long combineScore;
+    private Date examStartTime;
+    private Date examEndTime;
     private Long examCostTime;
     private Integer levelId;
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
index 700ecfb..779f69d 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamAnswer.java
@@ -13,7 +13,7 @@ import java.util.List;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(indexes = {@Index(columnList = "userId,competitionId,stageId")})
-public class ExamAnwser {
+public class ExamAnswer {
     /**
      * 大赛ID_阶段ID_分组ID_用户ID_问题ID
      */
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
index 7e1e2ee..cd6bd8c 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/entity/ExamQuestion.java
@@ -15,8 +15,7 @@ import java.util.List;
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 public class ExamQuestion {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private String id;
     private Long competitionId;
     private Integer stageId;
     private Integer groupId;
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
index 8003cd9..9719797 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/juejin/JueJinApi.java
@@ -117,14 +117,14 @@ public class JueJinApi {
         String zhangSan1GuPiao = "";
 
 
-        AccountInfo info = api.createAccount("张三1",1000000L,4);
+//        AccountInfo info = api.createAccount("张三1",1000000L,4);
 //        System.out.println(info.getAccount_id());
 //        api.deleteAccount("4811913f-9dba-11ec-89b3-00163e0e6ad0");
 //        api.getCashInfo("2e41a913-9dc1-11ec-89b3-00163e0e6ad0");
 //        api.test();
 //        api.createReport(accountId,"report"+ System.currentTimeMillis());
-//        api.getReport("5");
-        api.getBaseRatio();
+        api.getReport("5");
+//        api.getBaseRatio();
 
     }
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java
index 1517d6c..f418e19 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionDao.java
@@ -1,6 +1,9 @@
 package com.tz.platform.repository;
 
+import com.tz.platform.competitiion.api.dto.IndexCompetitionDTO;
 import com.tz.platform.entity.Competition;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -9,6 +12,8 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 @Repository
 public interface CompetitionDao extends JpaRepository<Competition,Long> {
@@ -16,8 +21,20 @@ public interface CompetitionDao extends JpaRepository<Competition,Long> {
 
     List<Competition> findAllByStatus(Integer status);
 
+    Page<Competition> findAllByStatus(Integer status, Pageable pageable);
+
     @Transactional
     @Modifying
     @Query(value = "update competition set people_count =:pcount,team_count=:tcount where id=:id",nativeQuery = true)
     int updatePeopleCount( @Param("pcount") Integer pcount ,@Param("tcount") Integer tcount , @Param("id") Long id);
+
+    @Transactional
+    @Modifying
+    @Query(value = "upate cometition set status=:status where id=:compId",nativeQuery = true)
+    int updateStatus(@Param("compId") Long compId,@Param("status") Integer status);
+
+    @Transactional
+    @Modifying
+    @Query(value = "upate cometition set status=:status,stage_name=:stageName,stage_id=:stageId  where id=:compId",nativeQuery = true)
+    int updateStatus(@Param("compId") Long compId,@Param("status") Integer status,@Param("stageName") String stageName,@Param("stageId") Integer stageId);
 }
diff --git a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java
index 6572759..558b75a 100644
--- a/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java
+++ b/tz/exam/exam-feign/src/main/java/com/tz/platform/feign/exam/IFeignExam.java
@@ -1,5 +1,6 @@
 package com.tz.platform.feign.exam;
 
+import com.tz.platform.feign.exam.qo.CacheQuetionQO;
 import com.tz.platform.feign.exam.vo.QuestionVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,33 +12,8 @@ import java.util.List;
 
 @FeignClient(value = "tz-exam-service")
 public interface IFeignExam {
-    @GetMapping(value = "/feign/exam/question/{id}")
-    QuestionVo getQuestionById(@PathVariable(value = "id") Long id);
 
-    @GetMapping(value = "/feign/exam/question/list/{pageNo}")
-    List<QuestionVo> listQuestion(@PathVariable(value = "pageNo") Long pageNo);
+    @PostMapping(value = "/feign/exam/question/putToCache")
+    boolean putToCache(@RequestBody CacheQuetionQO qo);
 
-    @PostMapping(value = "/feign/exam/question/update")
-    int updateQuestion(@RequestBody QuestionVo questionVo);
-
-    @PostMapping(value = "/feign/exam/quest/save")
-    int saveQuestion(@RequestBody QuestionVo questionVo);
-
-    @GetMapping(value = "/feign/exam/question/delete/{id}")
-    int deleteQuestion(@PathVariable( value = "id") Long id);
-
-    @PostMapping(value = "/feign/exam/quest/batchInsert")
-    int batchQuestionInsert(@RequestBody List<QuestionVo> list);
-
-    @PostMapping(value = "/feign/exam/question/batchOff")
-    int batchQuestionOff(@RequestBody List<Integer> ids);
-
-    @PostMapping(value = "/feign/exam/question/batchUp")
-    int batchQuestionUp(@RequestBody List<Integer> ids);
-
-    @GetMapping(value = "/feign/exam/question/off/{id}")
-    int questionOff(@PathVariable(value = "id") Long id);
-
-    @GetMapping(value = "/feign/exam/question/up/{id}")
-    int questionUp(@PathVariable(value = "id") Long id);
 }
diff --git a/tz/exam/exam-service/pom.xml b/tz/exam/exam-service/pom.xml
index 138d2cc..60291c0 100644
--- a/tz/exam/exam-service/pom.xml
+++ b/tz/exam/exam-service/pom.xml
@@ -32,6 +32,11 @@
             <groupId>com.tz</groupId>
             <artifactId>system-feign</artifactId>
         </dependency>
+        <!--rabbitmq-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
         <!-- test -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java
index 082e4e2..2cf3a67 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/ExamApiController.java
@@ -1,4 +1,17 @@
 package com.tz.platform.api;
 
-public class ExamApiController {
+import com.tz.platform.api.dto.ListExamQuestionDTO;
+import com.tz.platform.common.core.base.BaseController;
+import com.tz.platform.common.core.base.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/api/exam")
+public class ExamApiController extends BaseController {
+
+
+    public Result<ListExamQuestionDTO> listExam(){
+        return Result.error("failed");
+    }
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java
index 6aa3713..fe13c7f 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ExamQuestionDTO.java
@@ -1,4 +1,23 @@
 package com.tz.platform.api.dto;
 
+import com.tz.platform.common.core.bo.Answer;
+import com.tz.platform.common.core.bo.SubQuestionVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
 public class ExamQuestionDTO {
+    private Long id;
+    private Integer levelId;
+    private String levelName;
+    private Integer questionType;
+    private Long score;
+    private Integer type;
+    private String stem;
+    private String content;
+    private String stemImg;
+    private Integer status;
+    List<Answer> answerList;
+    private List<SubQuestionVO> children;
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java
index 3158cc5..34323c9 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/api/dto/ListExamQuestionDTO.java
@@ -1,4 +1,11 @@
 package com.tz.platform.api.dto;
 
-public class ListExamQuestionDTO {
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ListExamQuestionDTO implements Serializable {
+    List<ExamQuestionDTO> list;
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java b/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java
index 668cb1e..3613632 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/config/RedisConfig.java
@@ -1,4 +1,41 @@
 package com.tz.platform.config;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
 public class RedisConfig {
+    @Bean(name = "template")
+    public RedisTemplate<String, Object> template(RedisConnectionFactory factory) {
+        // 创建RedisTemplate<String, Object>对象
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        // 配置连接工厂
+        template.setConnectionFactory(factory);
+        // 定义Jackson2JsonRedisSerializer序列化对象
+        Jackson2JsonRedisSerializer<Object> jacksonSeial = new Jackson2JsonRedisSerializer<>(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会报异常
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jacksonSeial.setObjectMapper(om);
+        StringRedisSerializer stringSerial = new StringRedisSerializer();
+        // redis key 序列化方式使用stringSerial
+        template.setKeySerializer(stringSerial);
+        // redis value 序列化方式使用jackson
+        template.setValueSerializer(jacksonSeial);
+        // redis hash key 序列化方式使用stringSerial
+        template.setHashKeySerializer(stringSerial);
+        // redis hash value 序列化方式使用jackson
+        template.setHashValueSerializer(jacksonSeial);
+        template.afterPropertiesSet();
+        return template;
+    }
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java b/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java
index 1337df2..efacf0f 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/config/TzRabbitConfig.java
@@ -1,4 +1,34 @@
 package com.tz.platform.config;
 
+
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
 public class TzRabbitConfig {
+
+    @Bean
+    public Queue examQueue(){
+        return new Queue("ExamQueue",true);
+    }
+
+    @Bean
+    DirectExchange examExchange(){
+        return new DirectExchange("ExamExchange",true,false);
+    }
+
+    @Bean
+    Binding bindingExam(){
+        return BindingBuilder.bind(examQueue()).to(examExchange()).with("ExamRouting");
+    }
+
+    @Bean
+    DirectExchange lonelyExchange(){
+        return  new DirectExchange("lonelyDirectExchange");
+    }
+
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java
index 2818bfb..6d1ad8d 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/FeignExamController.java
@@ -3,6 +3,7 @@ package com.tz.platform.exam.feign;
 import com.tz.platform.common.core.base.BaseController;
 import com.tz.platform.exam.feign.biz.FeignExamBiz;
 import com.tz.platform.feign.exam.IFeignExam;
+import com.tz.platform.feign.exam.qo.CacheQuetionQO;
 import com.tz.platform.feign.exam.vo.QuestionVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,53 +15,10 @@ public class FeignExamController extends BaseController implements IFeignExam {
     @Autowired
     private FeignExamBiz feignExamBiz;
 
-    @Override
-    public QuestionVo getQuestionById(Long id) {
-        return null;
-    }
 
     @Override
-    public List<QuestionVo> listQuestion(Long pageNo) {
-        return null;
+    public boolean putToCache(CacheQuetionQO qo) {
+        return feignExamBiz.putToCache(qo.getIds(),qo.getKey(),qo.getMs());
     }
 
-    @Override
-    public int updateQuestion(QuestionVo questionVo) {
-        return 0;
-    }
-
-    @Override
-    public int saveQuestion(QuestionVo questionVo) {
-        return 0;
-    }
-
-    @Override
-    public int deleteQuestion(Long id) {
-        return 0;
-    }
-
-    @Override
-    public int batchQuestionInsert(List<QuestionVo> list) {
-        return 0;
-    }
-
-    @Override
-    public int batchQuestionOff(List<Integer> ids) {
-        return 0;
-    }
-
-    @Override
-    public int batchQuestionUp(List<Integer> ids) {
-        return 0;
-    }
-
-    @Override
-    public int questionOff(Long id) {
-        return 0;
-    }
-
-    @Override
-    public int questionUp(Long id) {
-        return 0;
-    }
 }
diff --git a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/biz/FeignExamBiz.java b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/biz/FeignExamBiz.java
index d93e7e5..ac87cde 100644
--- a/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/biz/FeignExamBiz.java
+++ b/tz/exam/exam-service/src/main/java/com/tz/platform/exam/feign/biz/FeignExamBiz.java
@@ -17,7 +17,7 @@ public class FeignExamBiz {
     private QuestionDao questionDao;
 
     @Autowired
-    private RedisTemplate<String,List<Question>> redisTemplate;
+    private RedisTemplate<String,Object> redisTemplate;
 
     public boolean putToCache(List<Long> ids,String key,long seconds){
         try {