Merge remote-tracking branch 'remotes/origin/dev' into dev

# Conflicts:
#	src/main/resources/templates/comparisonResultList.html

pom.xml

@@ -78,11 +78,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-websocket</artifactId>
 		</dependency>
-		<!-- 引入spring-boot-starter-data-jpa -->
-<!--		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>-->
+
 		<!--lombok包-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -113,6 +109,26 @@
 			</exclusions>
 			<scope>compile</scope>
 		</dependency>
+		<!--配置数据库驱动-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.1.8</version>
+		</dependency>
 
 	</dependencies>
 	<build>

src/main/java/com/cc/solr/entity/ConditionInfo.java

@@ -5,6 +5,7 @@ public class ConditionInfo extends PageBean{
     private String q;
     private String fq;
     private String core;
+    private String comparisonCore;
 
 
     public String getQ() {
@@ -31,4 +32,11 @@ public class ConditionInfo extends PageBean{
         this.core = core;
     }
 
+    public String getComparisonCore() {
+        return comparisonCore;
+    }
+
+    public void setComparisonCore(String comparisonCore) {
+        this.comparisonCore = comparisonCore;
+    }
 }

src/main/java/com/cc/solr/entity/Employee.java

+package com.cc.solr.entity;
+
+public class Employee {
+
+    private Integer id;
+    private String lastName;
+    private Integer gender;
+    private String email;
+    private Integer dId;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setdId(Integer dId) {
+        this.dId = dId;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public Integer getdId() {
+        return dId;
+    }
+}

src/main/java/com/cc/solr/mapper/EmployeeMapper.java

+package com.cc.solr.mapper;
+
+
+import com.cc.solr.entity.Employee;
+
+//@Mapper或者@MapperScan将接口扫描装配到容器中
+public interface EmployeeMapper {
+
+    public Employee getEmpById(Integer id);
+
+    public void insertEmp(Employee employee);
+}

src/main/resources/application.yml

 server:
  port: 8080
 spring:
- data:
-   solr:
-     host: http://127.0.0.1:9090/solr/
+  datasource:
+#   数据源基本配置
+    username: root
\ No newline at end of file
+    password: 123
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/mybatis
+    type: com.alibaba.druid.pool.DruidDataSource
+#   数据源其他配置
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+#   配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+    filters: stat,wall,log4j
+    maxPoolPreparedStatementPerConnectionSize: 20
+    useGlobalDataSourceStat: true
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
+mybatis:
+  # 指定全局配置文件位置
+  config-location: classpath:mybatis/mybatis-config.xml
+  # 指定sql映射文件位置
+  mapper-locations: classpath:mybatis/mapper/*.xml

src/main/resources/mybatis/mapper/EmployeeMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cc.solr.mapper.EmployeeMapper">
+
+    <!--    public Employee getEmpById(Integer id);
+
+     public void insertEmp(Employee employee);-->
+    <select id="getEmpById" resultType="com.cc.solr.entity.Employee">
+        SELECT * FROM employee WHERE id=#{id}
+    </select>
+
+    <insert id="insertEmp">
+        INSERT INTO employee(lastName,email,gender,d_id) VALUES (#{lastName},#{email},#{gender},#{dId})
+    </insert>
+</mapper>
\ No newline at end of file

src/main/resources/mybatis/mybatis-config.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+
+    <settings>
+        <setting name="mapUnderscoreToCamelCase" value="true"/>
+    </settings>
+</configuration>
\ No newline at end of file