重构部分代码,修复升级springboot1.5.1启动报错的bug

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/CourseApi.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.service.core.api;
 
 import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.dao.Course;
+import cn.com.qmth.examcloud.service.core.entity.Course;
 import cn.com.qmth.examcloud.service.core.service.CourseService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgApi.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.service.core.api;
 
 import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.dao.Org;
+import cn.com.qmth.examcloud.service.core.entity.Org;
 import cn.com.qmth.examcloud.service.core.service.OrgService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/StudentApi.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.service.core.api;
 
 import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.dao.Student;
+import cn.com.qmth.examcloud.service.core.entity.Student;
 import cn.com.qmth.examcloud.service.core.service.StudentService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.service.core.dao.User;
+import cn.com.qmth.examcloud.service.core.entity.User;
 import cn.com.qmth.examcloud.service.core.enums.UserType;
 import cn.com.qmth.examcloud.service.core.repo.UserRepo;
 import cn.com.qmth.examcloud.service.core.service.UserService;

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/UserRoleApi.java

@@ -1,9 +1,6 @@
 package cn.com.qmth.examcloud.service.core.api;
 
-import cn.com.qmth.examcloud.service.core.dao.User;
-import cn.com.qmth.examcloud.service.core.dao.UserRole;
-import cn.com.qmth.examcloud.service.core.enums.UserType;
-import cn.com.qmth.examcloud.service.core.repo.UserRepo;
+import cn.com.qmth.examcloud.service.core.entity.UserRole;
 import cn.com.qmth.examcloud.service.core.repo.UserRoleRepo;
 import cn.com.qmth.examcloud.service.core.service.UserService;
 import io.swagger.annotations.ApiOperation;
@@ -12,8 +9,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 用户角色服务API
  * Created by songyue on 17/1/13.

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/CourseService.java

@@ -1,18 +1,9 @@
 package cn.com.qmth.examcloud.service.core.service;
 
 import cn.com.qmth.examcloud.service.core.repo.CourseRepo;
-import cn.com.qmth.examcloud.service.core.dao.Course;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.startsWith;
-
 /**
  * Created by songyue on 17/1/14.
  */

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/OrgService.java

@@ -1,17 +1,9 @@
 package cn.com.qmth.examcloud.service.core.service;
 
 import cn.com.qmth.examcloud.service.core.repo.OrgRepo;
-import cn.com.qmth.examcloud.service.core.dao.Org;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.startsWith;
-
 /**
  * 学校服务类
  * Created by songyue on 17/1/14.

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/StudentService.java

@@ -1,20 +1,16 @@
 package cn.com.qmth.examcloud.service.core.service;
 
 import cn.com.qmth.examcloud.service.core.repo.StudentRepo;
-import cn.com.qmth.examcloud.service.core.dao.Student;
+import cn.com.qmth.examcloud.service.core.entity.Student;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatchers.startsWith;
-
 /**
  * 学生服务类
  * Created by songyue on 17/1/14.

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/UserService.java

@@ -3,10 +3,10 @@ package cn.com.qmth.examcloud.service.core.service;
 import cn.com.qmth.examcloud.common.uac.AccessCtrlUtil;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import cn.com.qmth.examcloud.common.util.RedisUtil;
-import cn.com.qmth.examcloud.service.core.dao.Org;
-import cn.com.qmth.examcloud.service.core.dao.Student;
-import cn.com.qmth.examcloud.service.core.dao.User;
-import cn.com.qmth.examcloud.service.core.dao.UserRole;
+import cn.com.qmth.examcloud.service.core.entity.Org;
+import cn.com.qmth.examcloud.service.core.entity.Student;
+import cn.com.qmth.examcloud.service.core.entity.User;
+import cn.com.qmth.examcloud.service.core.entity.UserRole;
 import cn.com.qmth.examcloud.service.core.dto.UserInfo;
 import cn.com.qmth.examcloud.service.core.enums.UserType;
 import cn.com.qmth.examcloud.service.core.params.UserParam;

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/Course.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Course.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.core.entity;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -35,12 +35,10 @@ public class Course implements Serializable{
 
 	@Temporal(value = TemporalType.DATE)
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Column(columnDefinition = "default now()")
 	private Date createTime;
 
 	@Temporal(value = TemporalType.DATE)
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Column(columnDefinition = "default now()",updatable = true,insertable = false)
 	private Date updateTime;
 
 	@NotNull

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/Org.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Org.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.core.entity;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -11,7 +11,7 @@ import java.util.Date;
  * Created by songyue on 17/1/13.
  */
 @Entity
-@Table(name = "ecs_org")
+@Table(name = "ecs_core_org")
 public class Org implements Serializable{
 
     private static final long serialVersionUID = -592353272256492483L;
@@ -39,17 +39,14 @@ public class Org implements Serializable{
     private String apps;
 
     @NotNull
-    @Column(columnDefinition = "default 1")
     private Boolean enable;
 
     @Temporal(value = TemporalType.DATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(columnDefinition = "default now()")
     private Date createTime;
 
     @Temporal(value = TemporalType.DATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(columnDefinition = "default now()",updatable = true,insertable = false)
     private Date updateTime;
 
     public static long getSerialVersionUID() {

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/Student.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Student.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.core.entity;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -45,12 +45,10 @@ public class Student implements Serializable {
 
 	@Temporal(value = TemporalType.DATE)
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Column(columnDefinition = "default now()")
 	private Date createTime;
 
 	@Temporal(value = TemporalType.DATE)
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Column(columnDefinition = "default now()",updatable = true,insertable = false)
 	private Date updateTime;
 
 	public static long getSerialVersionUID() {

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/User.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/User.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.core.entity;
 
 import cn.com.qmth.examcloud.service.core.enums.Gender;
 import cn.com.qmth.examcloud.service.core.enums.UserScope;
@@ -52,17 +52,14 @@ public class User implements Serializable{
     private UserType type;
 
     @NotNull
-    @Column(columnDefinition = "default 1")
     private Boolean enable;
 
     @Temporal(value = TemporalType.DATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(columnDefinition = "default now()")
     private Date createTime;
 
     @Temporal(value = TemporalType.DATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(columnDefinition = "default now()",updatable = true,insertable = false)
     private Date updateTime;
 
     public static long getSerialVersionUID() {

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/UserRole.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/UserRole.java

@@ -1,11 +1,6 @@
-package cn.com.qmth.examcloud.service.core.dao;
+package cn.com.qmth.examcloud.service.core.entity;
 
-import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
-import org.springframework.data.annotation.Id;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/CourseRepo.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.service.core.repo;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.dao.Course;
+import cn.com.qmth.examcloud.service.core.entity.Course;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 public interface CourseRepo extends JpaRepository<Course, Long>,QueryByExampleExecutor<Course> {

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/OrgRepo.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.service.core.repo;
 
-import cn.com.qmth.examcloud.service.core.dao.Org;
+import cn.com.qmth.examcloud.service.core.entity.Org;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/StudentRepo.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.service.core.repo;
 
-import cn.com.qmth.examcloud.service.core.dao.Student;
+import cn.com.qmth.examcloud.service.core.entity.Student;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserRepo.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.service.core.repo;
 
-import cn.com.qmth.examcloud.service.core.dao.User;
+import cn.com.qmth.examcloud.service.core.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserRoleRepo.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.service.core.repo;
 
-import cn.com.qmth.examcloud.service.core.dao.UserRole;
+import cn.com.qmth.examcloud.service.core.entity.UserRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 

core-main/pom.xml

@@ -28,6 +28,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.2.RELEASE</version>
     </parent>
 
 
@@ -31,7 +31,7 @@
         <!-- maven plugins -->
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
-        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.2.RELEASE</spring.boot.version>
         <project.version>0.1.0</project.version>
     </properties>