宋悦 8 vuotta sitten
vanhempi
commit
5a0e524394
28 muutettua tiedostoa jossa 610 lisäystä ja 417 poistoa
  1. 30 0
      core-api/pom.xml
  2. 12 0
      core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java
  3. 10 0
      core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/CoreService.java
  4. 2 2
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/CourseRepo.java
  5. 10 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/LearnCenterRepo.java
  6. 10 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/SchoolRepo.java
  7. 10 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/StudentRepo.java
  8. 10 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/UserRepo.java
  9. 0 78
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/Exam.java
  10. 0 74
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/ExamScore.java
  11. 0 126
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/ExamStudent.java
  12. 0 54
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/Organization.java
  13. 0 18
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/enums/ExamType.java
  14. 0 8
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ExamRepo.java
  15. 0 8
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ExamStudentRepo.java
  16. 0 8
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/OrganizationRepo.java
  17. 0 8
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ScoreRepo.java
  18. 22 17
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Course.java
  19. 93 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/LearnCenter.java
  20. 95 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/School.java
  21. 116 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Student.java
  22. 92 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/User.java
  23. 8 0
      core-domain/src/main/java/cn/com/qmth/examcloud/service/core/enums/isValid.java
  24. 26 3
      core-main/pom.xml
  25. 5 1
      core-main/src/main/java/cn/com/qmth/examcloud/service/core/Application.java
  26. 36 0
      core-main/src/main/java/cn/com/qmth/examcloud/service/core/Swagger2.java
  27. 6 1
      core-main/src/main/resources/application.properties
  28. 17 11
      pom.xml

+ 30 - 0
core-api/pom.xml

@@ -11,5 +11,35 @@
 
     <artifactId>core-api</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>
+
 
 </project>

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

@@ -0,0 +1,12 @@
+package cn.com.qmth.examcloud.service.core.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@RestController
+@RequestMapping("${app.api.root}/user")
+public class UserApi {
+}

+ 10 - 0
core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/CoreService.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.service.core.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@Service
+public class CoreService {
+}

+ 2 - 2
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/CourseRepo.java → core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/CourseRepo.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.service.core.domain.repository;
+package cn.com.qmth.examcloud.service.core.dao;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import cn.com.qmth.examcloud.service.core.domain.entity.Course;
+import cn.com.qmth.examcloud.service.core.entity.Course;
 
 public interface CourseRepo extends JpaRepository<Course, Long> {
 }

+ 10 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/LearnCenterRepo.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.service.core.dao;
+
+import cn.com.qmth.examcloud.service.core.entity.LearnCenter;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+public interface LearnCenterRepo extends JpaRepository<LearnCenter,Long>{
+}

+ 10 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/SchoolRepo.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.service.core.dao;
+
+import cn.com.qmth.examcloud.service.core.entity.School;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+public interface SchoolRepo extends JpaRepository<School,Long>{
+}

+ 10 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/StudentRepo.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.service.core.dao;
+
+import cn.com.qmth.examcloud.service.core.entity.Student;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+public interface StudentRepo extends JpaRepository<Student,Long>{
+}

+ 10 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/dao/UserRepo.java

@@ -0,0 +1,10 @@
+package cn.com.qmth.examcloud.service.core.dao;
+
+import cn.com.qmth.examcloud.service.core.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+public interface UserRepo extends JpaRepository<User,Long>{
+}

+ 0 - 78
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/Exam.java

@@ -1,78 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/**
- * 
- * @Description: 考试
- * @author ting.yin
- * @date 2017年1月5日
- */
-@Entity
-@Table(name = "ecs_core_exam")
-public class Exam implements Serializable {
-
-	private static final long serialVersionUID = 4009839764353162256L;
-
-	@Id
-	@GeneratedValue
-	private long id;
-
-	@Temporal(value = TemporalType.DATE)
-	private Date createdOn;
-
-	private String name;
-
-	private Long orgId;
-
-	private String description;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public Date getCreatedOn() {
-		return createdOn;
-	}
-
-	public void setCreatedOn(Date createdOn) {
-		this.createdOn = createdOn;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-}

+ 0 - 74
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/ExamScore.java

@@ -1,74 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.entity;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 
- * @Description: 成绩
- * @author ting.yin
- * @date 2017年1月5日
- */
-@Entity
-@Table(name = "ecs_core_exam_score")
-public class ExamScore implements Serializable {
-
-	private static final long serialVersionUID = -3263640333978061256L;
-
-	@Id
-	@GeneratedValue
-	private long id;
-
-	private Long examId;
-
-	private Long examStudentId;
-
-	private Long courseId;
-
-	private Double score;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getExamStudentId() {
-		return examStudentId;
-	}
-
-	public void setExamStudentId(Long examStudentId) {
-		this.examStudentId = examStudentId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-}

+ 0 - 126
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/ExamStudent.java

@@ -1,126 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.entity;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import cn.com.qmth.examcloud.service.core.domain.enums.ExamType;
-
-/**
- * 
- * @Description: 考生
- * @author ting.yin
- * @date 2017年1月5日
- */
-@Entity
-@Table(name = "ecs_core_exam_student")
-public class ExamStudent implements Serializable {
-
-	private static final long serialVersionUID = 757531976286006550L;
-
-	@Id
-	@GeneratedValue
-	private long id;
-
-	private String name;
-
-	private Long examId;
-
-	private ExamType examType;
-
-	private Long courseId;
-
-	private String studentCode;
-
-	private String identityNumber;
-
-	private Long userId;
-	
-	private String examNumber;
-	
-	private boolean uploaded;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getExamNumber() {
-		return examNumber;
-	}
-
-	public void setExamNumber(String examNumber) {
-		this.examNumber = examNumber;
-	}
-
-	public boolean isUploaded() {
-		return uploaded;
-	}
-
-	public void setUploaded(boolean uploaded) {
-		this.uploaded = uploaded;
-	}
-
-}

+ 0 - 54
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/entity/Organization.java

@@ -1,54 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.entity;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 
- * @Description: 机构
- * @author ting.yin
- * @date 2017年1月5日
- */
-@Entity
-@Table(name = "ecs_core_org")
-public class Organization implements Serializable {
-
-	private static final long serialVersionUID = 3762956474294533908L;
-
-	@Id
-	@GeneratedValue
-	private long id;
-
-	private String name;
-	
-	private String code;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-	
-}

+ 0 - 18
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/enums/ExamType.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.enums;
-
-/**
- * 
- * @Description: 考试类型
- * @author ting.yin
- * @date 2017年1月5日
- */
-public enum ExamType {
-    /**
-     * 传统
-     */
-    TRADITION,
-    /**
-     * 网考
-     */
-    ONLINE
-}

+ 0 - 8
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ExamRepo.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.service.core.domain.entity.Exam;
-
-public interface ExamRepo extends JpaRepository<Exam, Long> {
-}

+ 0 - 8
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ExamStudentRepo.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.service.core.domain.entity.ExamStudent;
-
-public interface ExamStudentRepo extends JpaRepository<ExamStudent, Long> {
-}

+ 0 - 8
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/OrganizationRepo.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.service.core.domain.entity.Organization;
-
-public interface OrganizationRepo extends JpaRepository<Organization, Long> {
-}

+ 0 - 8
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/domain/repository/ScoreRepo.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.service.core.domain.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.service.core.domain.entity.ExamScore;
-
-public interface ScoreRepo extends JpaRepository<ExamScore, Long> {
-}

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

@@ -1,11 +1,10 @@
-package cn.com.qmth.examcloud.service.core.domain.entity;
+package cn.com.qmth.examcloud.service.core.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 
 /**
  * 
@@ -22,13 +21,16 @@ public class Course implements Serializable{
     @Id
     @GeneratedValue
     private long id;
-    
-    private Long orgId;
 
+	@NotNull
+	private String code;
+
+	@NotNull
     private String name;
-    
-    private String code;
 
+	@Temporal(TemporalType.DATE)
+	private Date createTime;
+    
 	public long getId() {
 		return id;
 	}
@@ -45,14 +47,6 @@ public class Course implements Serializable{
 		this.name = name;
 	}
 
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
 	public String getCode() {
 		return code;
 	}
@@ -61,4 +55,15 @@ public class Course implements Serializable{
 		this.code = code;
 	}
 
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

+ 93 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/LearnCenter.java

@@ -0,0 +1,93 @@
+package cn.com.qmth.examcloud.service.core.entity;
+
+import cn.com.qmth.examcloud.service.core.enums.isValid;
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@Entity
+@Table(name = "ecs_core_learn_center")
+public class LearnCenter implements Serializable{
+    private static final long serialVersionUID = -6213266550004743423L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    private String code;
+
+    @NotNull
+    private String name;
+
+    @Enumerated(EnumType.STRING)
+    private isValid isvalid;
+
+    @ManyToOne
+    @JoinColumn(name = "schoolId")
+    private School school;
+
+    @Temporal(value = TemporalType.DATE)
+    private Date createTime;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public isValid getIsvalid() {
+        return isvalid;
+    }
+
+    public void setIsvalid(isValid isvalid) {
+        this.isvalid = isvalid;
+    }
+
+    public School getSchool() {
+        return school;
+    }
+
+    public void setSchool(School school) {
+        this.school = school;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public LearnCenter() {
+    }
+}

+ 95 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/School.java

@@ -0,0 +1,95 @@
+package cn.com.qmth.examcloud.service.core.entity;
+
+import cn.com.qmth.examcloud.service.core.enums.isValid;
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@Entity
+@Table(name = "ecs_core_school")
+public class School implements Serializable{
+
+    private static final long serialVersionUID = -592353272256492483L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    private String code;
+
+    @NotNull
+    private String name;
+
+    @Temporal(value = TemporalType.DATE)
+    private Date createTime;
+
+    @Enumerated(EnumType.STRING)
+    private isValid isvalid;
+
+    @OneToMany(cascade = {CascadeType.ALL})
+    @JoinColumn(name="schoolId")
+    private List<LearnCenter> learnCenters;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public isValid getIsvalid() {
+        return isvalid;
+    }
+
+    public void setIsvalid(isValid isvalid) {
+        this.isvalid = isvalid;
+    }
+
+    public List<LearnCenter> getLearnCenters() {
+        return learnCenters;
+    }
+
+    public void setLearnCenters(List<LearnCenter> learnCenters) {
+        this.learnCenters = learnCenters;
+    }
+
+    public School() {
+    }
+}

+ 116 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/Student.java

@@ -0,0 +1,116 @@
+package cn.com.qmth.examcloud.service.core.entity;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@Entity
+@Table(name = "ecs_core_student")
+public class Student implements Serializable {
+
+	private static final long serialVersionUID = 757531976286006550L;
+
+	@Id
+	@GeneratedValue
+	private long id;
+
+	@OneToOne
+	@JoinColumn(name = "userId")
+	private User user;
+
+	private String studentCode;
+
+	private String identityNumber;
+
+	private String examNumber;
+
+	private String degree;
+
+	private String major;
+
+	private String photoPath;
+
+	private String remark;
+
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getExamNumber() {
+		return examNumber;
+	}
+
+	public void setExamNumber(String examNumber) {
+		this.examNumber = examNumber;
+	}
+
+	public String getDegree() {
+		return degree;
+	}
+
+	public void setDegree(String degree) {
+		this.degree = degree;
+	}
+
+	public String getMajor() {
+		return major;
+	}
+
+	public void setMajor(String major) {
+		this.major = major;
+	}
+
+	public String getPhotoPath() {
+		return photoPath;
+	}
+
+	public void setPhotoPath(String photoPath) {
+		this.photoPath = photoPath;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public Student() {
+	}
+}

+ 92 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/User.java

@@ -0,0 +1,92 @@
+package cn.com.qmth.examcloud.service.core.entity;
+
+import cn.com.qmth.examcloud.service.core.enums.isValid;
+import org.springframework.data.annotation.Id;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+@Entity
+@Table(name = "ecs_core_user")
+public class User implements Serializable{
+
+    private static final long serialVersionUID = 9190180279768027647L;
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotNull
+    private String userName;
+
+    @NotNull
+    private String loginName;
+
+    private Date createTime;
+
+    @NotNull
+    private String password;
+
+    @Enumerated(EnumType.STRING)
+    private isValid isvalid;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public isValid getIsvalid() {
+        return isvalid;
+    }
+
+    public void setIsvalid(isValid isvalid) {
+        this.isvalid = isvalid;
+    }
+
+    public User() {
+    }
+}

+ 8 - 0
core-domain/src/main/java/cn/com/qmth/examcloud/service/core/enums/isValid.java

@@ -0,0 +1,8 @@
+package cn.com.qmth.examcloud.service.core.enums;
+
+/**
+ * Created by songyue on 17/1/13.
+ */
+public enum isValid {
+    TRUE,FALSE
+}

+ 26 - 3
core-main/pom.xml

@@ -11,10 +11,33 @@
 
     <artifactId>core-main</artifactId>
     <dependencies>
-		<dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-feign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-eureka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.6.1</version>
         </dependency>
     </dependencies>
-
 </project>

+ 5 - 1
core-main/src/main/java/cn/com/qmth/examcloud/service/core/domain/Application.java → core-main/src/main/java/cn/com/qmth/examcloud/service/core/Application.java

@@ -1,9 +1,13 @@
-package cn.com.qmth.examcloud.service.core.domain;
+package cn.com.qmth.examcloud.service.core;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.netflix.feign.EnableFeignClients;
 
 @SpringBootApplication
+@EnableEurekaClient
+@EnableFeignClients
 public class Application {
 
 	public static void main(String[] args) throws Exception {

+ 36 - 0
core-main/src/main/java/cn/com/qmth/examcloud/service/core/Swagger2.java

@@ -0,0 +1,36 @@
+package cn.com.qmth.examcloud.service.core;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * Created by songyue on 17/1/12.
+ */
+@Configuration
+@EnableSwagger2
+public class Swagger2 {
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("cn.com.qmth.examcloud.service.core"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("考试云平台基础信息接口")
+                .description("基于swagger构建的Restful API")
+                .version("1.0")
+                .build();
+    }
+
+}

+ 6 - 1
core-main/src/main/resources/application.properties

@@ -8,7 +8,7 @@ spring.datasource.test-on-borrow=true
 #spring.redis.host=192.168.199.102
 #spring.redis.port=32768
 
-server.port=8080
+#server.port=8080
 
 
 #logging.file=d:/gkwb/logs/gkwb.log
@@ -21,3 +21,8 @@ spring.jpa.hibernate.ddl-auto=update
 
 spring.http.multipart.max-file-size=10Mb
 
+spring.application.name=ExamCloud-service-core
+server.port=8100
+eureka.client.serviceUrl.defaultZone=http://localhost:1111/eureka/
+app.api.root=/api/ecs_core
+

+ 17 - 11
pom.xml

@@ -51,22 +51,28 @@
                 <artifactId>mysql-connector-java</artifactId>
                 <version>${mysql.version}</version>
             </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>reflectasm</artifactId>
-            <version>${reflectasm.version}</version>
-        </dependency>
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.esotericsoftware</groupId>
+                <artifactId>reflectasm</artifactId>
+                <version>${reflectasm.version}</version>
+            </dependency>
             <dependency>
                 <groupId>net.coobird</groupId>
                 <artifactId>thumbnailator</artifactId>
                 <version>${thumbnailator.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Camden.SR3</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>