diff --git a/src/main/java/com/fjy/spring/controller/DataController.java b/src/main/java/com/fjy/spring/controller/DataController.java
index 072b034..6282973 100644
--- a/src/main/java/com/fjy/spring/controller/DataController.java
+++ b/src/main/java/com/fjy/spring/controller/DataController.java
@@ -48,6 +48,9 @@ public class DataController {
     @Autowired
     private VUserfileService vUserfileService;
 
+    @Autowired
+    private NoticeService noticeService;
+
     @Resource
     private HttpServletRequest httpServletRequest;
 
@@ -172,4 +175,9 @@ public class DataController {
             throw new UserException(ResultEnum.ILLEGAL_ACCESS);
         }
     }
+
+    @GetMapping("/home/findAllNotice")
+    public List<TbNotice> findAllNotice(){
+        return noticeService.findAll();
+    }
 }
diff --git a/src/main/java/com/fjy/spring/domain/TbNotice.java b/src/main/java/com/fjy/spring/domain/TbNotice.java
new file mode 100644
index 0000000..5982e9c
--- /dev/null
+++ b/src/main/java/com/fjy/spring/domain/TbNotice.java
@@ -0,0 +1,25 @@
+package com.fjy.spring.domain;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+@Data
+public class TbNotice {
+
+    @Id
+    @GeneratedValue
+    private Integer noticeid;
+
+    private Integer adminid;
+
+    @Column(name = "noticecontent")
+    private String noticeContent;
+
+    @Column(name = "issuetime")
+    private String issueTime;
+}
diff --git a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java
index 5d20a5e..5c000e8 100644
--- a/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java
+++ b/src/main/java/com/fjy/spring/interceptor/WebAppConfig.java
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@Configuration
+/*@Configuration*/
 public class WebAppConfig implements WebMvcConfigurer {
 
     /**
diff --git a/src/main/java/com/fjy/spring/repository/TbNoticeRepository.java b/src/main/java/com/fjy/spring/repository/TbNoticeRepository.java
new file mode 100644
index 0000000..04a8d88
--- /dev/null
+++ b/src/main/java/com/fjy/spring/repository/TbNoticeRepository.java
@@ -0,0 +1,8 @@
+package com.fjy.spring.repository;
+
+import com.fjy.spring.domain.TbNotice;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TbNoticeRepository extends JpaRepository<TbNotice,Integer> {
+
+}
diff --git a/src/main/java/com/fjy/spring/service/NoticeService.java b/src/main/java/com/fjy/spring/service/NoticeService.java
new file mode 100644
index 0000000..0b1ac51
--- /dev/null
+++ b/src/main/java/com/fjy/spring/service/NoticeService.java
@@ -0,0 +1,20 @@
+package com.fjy.spring.service;
+
+import com.fjy.spring.domain.TbNotice;
+import com.fjy.spring.repository.TbNoticeRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class NoticeService {
+
+    @Autowired
+    private TbNoticeRepository noticeRepository;
+
+    public List<TbNotice> findAll(){
+        return noticeRepository.findAll();
+    }
+
+}
diff --git a/src/main/resources/static/js/homePage.js b/src/main/resources/static/js/homePage.js
index a4ff00c..a988c7f 100644
--- a/src/main/resources/static/js/homePage.js
+++ b/src/main/resources/static/js/homePage.js
@@ -93,6 +93,20 @@ var Main = {
             activeName: 'login',
             fileList: [],
             DownloadList: [],
+            NoticeList:[
+                {
+                    noticeid: 1,
+                    adminid: 1,
+                    noticeContent: "系统正式上线，Alpha测试版",
+                    issueTime: "2018-2-26 11:00"
+                },
+                {
+                    noticeid: 2,
+                    adminid: 1,
+                    noticeContent: "系统，测试",
+                    issueTime: "2018-2-26 11:13"
+                }
+            ],
             VersionList:[
                 {
                     date:'2018-02-24',
@@ -371,6 +385,15 @@ var Main = {
                 .catch(function (error) {
                     console.log(error);
                 });
+            axios.get(getRootPath_web()+'/home/findAllNotice')
+                .then(function (response) {
+                    console.log(response.data);
+                    that.NoticeList = response.data;
+                    //that.limitTime = response.data;
+                })
+                .catch(function (error) {
+                    console.log(error);
+                });
         })
     },
     methods: {
diff --git a/src/main/resources/templates/home/home.html b/src/main/resources/templates/home/home.html
index 17ed046..ab91731 100644
--- a/src/main/resources/templates/home/home.html
+++ b/src/main/resources/templates/home/home.html
@@ -257,36 +257,12 @@
                     <el-row>
                         <el-col :span="24">
                             <div class="grid-content">
-                                <el-card class="box-card hidden-xs-only">
-                                    <div slot="header" class="clearfix">
-                                        <span>作业提交倒计时</span>
-                                        <span style="color: red"> 功能未完成</span>
-                                    </div>
-                                    <div class="text item">
-                                        <el-table :data="tableHomeworkData" style="width: 100%"
-                                                  :default-sort="{prop: 'coursename', order: 'descending'}">
-                                            <el-table-column prop="coursename" label="科目" sortable width="180">
-                                            </el-table-column>
-                                            <el-table-column label="倒计时" sortable>
-                                                <template slot-scope="scope">
-                                                    {{limitTime(scope.row)}}
-                                                </template>
-                                            </el-table-column>
-                                        </el-table>
-                                    </div>
-                                </el-card>
+                                <el-card th:include="dist/thymeleaf/layout :: timelimit"></el-card>
                             </div>
                         </el-col>
                     </el-row>
                     <el-row>
-                        <el-card class="box-card hidden-xs-only">
-                            <div slot="header" class="clearfix">
-                                <span>公告</span>
-                            </div>
-                            <div v-for="o in 4" :key="o" class="text item">
-                                {{'公告内容 ' + o }}
-                            </div>
-                        </el-card>
+                        <el-card th:include="dist/thymeleaf/layout :: notice"></el-card>
                         <!--<template>
                             <el-table :data="tableData3" style="width: 100%">
                                 <el-table-column label="公告">