merge

.idea/vcs.xml

@@ -1,6 +1,14 @@
+<<<<<<< HEAD
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
   </component>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+>>>>>>> 3fcdc9a55d09f5e02b0c959a79c4251e0269f1b1
 </project>

seec-data-server/pom.xml

@@ -69,6 +69,11 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.58</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.seecoder</groupId>
+			<artifactId>seecoder-bok-client</artifactId>
+			<version>0.1.1</version>
+		</dependency>
 	</dependencies>
 
 	<build>

seec-data-server/src/main/java/cn/seecoder/data/server/domain/EvaluateDao.java

@@ -10,12 +10,12 @@ import javax.persistence.*;
 public class EvaluateDao {
 
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
-    @Column(name = "generalId" , nullable = false)
+    @Column(name = "general_id" , nullable = false)
     private Integer generalId;
 
-    @Column(name = "examId" , nullable = false)
+    @Column(name = "exam_id" , nullable = false)
     private Integer examId;
 }

seec-data-server/src/main/java/cn/seecoder/data/server/domain/GeneralRecordDao.java

@@ -11,7 +11,7 @@ import java.sql.Timestamp;
 @Table(name = "general_record")
 public class GeneralRecordDao {
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
     @Column(name = "user_id" , nullable = false)

seec-data-server/src/main/java/cn/seecoder/data/server/domain/KnowledgeDao.java

@@ -0,0 +1,39 @@
+package cn.seecoder.data.server.domain;
+
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "knowledge")
+public class KnowledgeDao {
+
+    @Id
+    private int id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "name_eng")
+    private String nameEng;
+
+    @Column(name = "abbreviation")
+    private String abbreviation;
+
+    @Column(name = "parent_id")
+    private int parentId;
+
+    @Column(name = "parent_name")
+    private String parentName;
+
+    @Column(name = "uid")
+    private int uid;
+
+    @Column(name = "pid")
+    private int pid;
+}

seec-data-server/src/main/java/cn/seecoder/data/server/repository/KnowledgeRepository.java

@@ -0,0 +1,7 @@
+package cn.seecoder.data.server.Repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import cn.seecoder.data.server.domain.KnowledgeDao;
+
+public interface KnowledgeRepository extends JpaRepository<KnowledgeDao,Integer> {
+}

seec-data-server/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     username: 'root'
     password: 'root'
-    url: jdbc:mysql://localhost:3306/seec_data
+    url: jdbc:mysql://localhost:3306/seec_data?serverTimezone=GMT&useUnicode=true&characterEncoding=utf-8
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:

seec-data-server/target/classes/application.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     username: 'root'
     password: 'root'
-    url: jdbc:mysql://localhost:3306/seec_data
+    url: jdbc:mysql://localhost:3306/seec_data?serverTimezone=GMT&useUnicode=true&characterEncoding=utf-8
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate: