solr相关

pcloud-common/pom.xml

@@ -291,13 +291,6 @@
 			<artifactId>aliyun-java-sdk-mts</artifactId>
 		</dependency>
 
-		<!-- solr add by gaop at 2018-4-23 11:33:47 -->
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-solr</artifactId>
-		</dependency>
-		<!-- end -->
-
 		<!-- Jackson Begin -->
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>

pcloud-solr/pom.xml

+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.pcloud.common</groupId>
+        <artifactId>pcloud-common-parent</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>pcloud-solr</artifactId>
+    <packaging>jar</packaging>
+    <version>${pcloud-solr.version}</version>
+
+    <name>pcloud-solr</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.pcloud.common</groupId>
+			<artifactId>pcloud-common-config</artifactId>
+			<version>${pcloud-common-config.version}</version>
+		</dependency>
+
+        <!-- solr add by gaop at 2018-4-23 11:33:47 -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-solr</artifactId>
+            <version>${spring.data.solr.version}</version>
+        </dependency>
+
+		<!-- Spring Cloud Begin -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-config</artifactId>
+		</dependency>
+		<!-- Spring Cloud End -->
+
+		<!-- Common Dependency Begin -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+            <version>1.7.18</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+            <version>1.2.38</version>
+		</dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
+        </dependency>
+		<!-- Common Dependency End -->
+
+	</dependencies>
+
+</project>

pcloud-common/src/main/java/com/pcloud/common/utils/solr/SolrDto.java → pcloud-solr/src/main/java/com/pcloud/solr/SolrDto.java

-package com.pcloud.common.utils.solr;
+package com.pcloud.solr;
 
 import java.io.Serializable;
 import java.util.Calendar;

pcloud-common/src/main/java/com/pcloud/common/utils/solr/SolrQueryParam.java → pcloud-solr/src/main/java/com/pcloud/solr/SolrQueryParam.java

-package com.pcloud.common.utils.solr;
+package com.pcloud.solr;
 
 import java.util.List;
 import java.util.Map;

pcloud-common/src/main/java/com/pcloud/common/utils/solr/SolrResult.java → pcloud-solr/src/main/java/com/pcloud/solr/SolrResult.java

-package com.pcloud.common.utils.solr;
+package com.pcloud.solr;
 
 import java.io.Serializable;
 import java.util.List;
@@ -8,7 +8,7 @@ import java.util.List;
  * @author PENG
  * @date 2018/4/24
  */
-public class SolrResult implements Serializable {
+public class SolrResult<T> implements Serializable {
 
     private static final long serialVersionUID = 1195918725820896691L;
 
@@ -25,7 +25,7 @@ public class SolrResult implements Serializable {
     /**
      * 查询结果列表
      */
-    private List<SolrDto> list;
+    private List<T> list;
 
     public Integer getTotalCount() {
         return totalCount;
@@ -43,11 +43,11 @@ public class SolrResult implements Serializable {
         this.maxScore = maxScore;
     }
 
-    public List<SolrDto> getList() {
+    public List<T> getList() {
         return list;
     }
 
-    public void setList(List<SolrDto> list) {
+    public void setList(List<T> list) {
         this.list = list;
     }
 

pom.xml

@@ -18,6 +18,7 @@
 		<module>pcloud-common-config</module>
 		<module>pcloud-common</module>
 		<module>pcloud-common-core</module>
+		<module>pcloud-solr</module>
 	</modules>
 	<packaging>pom</packaging>
 
@@ -47,6 +48,7 @@
 				<pcloud-common.version>2.1.0-RELEASE</pcloud-common.version>
 				<pcloud-common-config.version>2.1.0-RELEASE</pcloud-common-config.version>
 				<pcloud-common-core.version>2.1.0-RELEASE</pcloud-common-core.version>
+				<pcloud-solr.version>2.1.0-RELEASE</pcloud-solr.version>
 			</properties>
 		</profile>
 		<!-- 压测环境 -->
@@ -68,6 +70,7 @@
 				<pcloud-common.version>2.1.0-RELEASE</pcloud-common.version>
 				<pcloud-common-config.version>2.1.0-RELEASE</pcloud-common-config.version>
 				<pcloud-common-core.version>2.1.0-RELEASE</pcloud-common-core.version>
+				<pcloud-solr.version>2.1.0-RELEASE</pcloud-solr.version>
 			</properties>
 		</profile>
 		<!-- 生产环境 RAYS -->
@@ -89,6 +92,7 @@
 				<pcloud-common.version>2.1.1-RELEASE</pcloud-common.version>
 				<pcloud-common-config.version>2.1.1-RELEASE</pcloud-common-config.version>
 				<pcloud-common-core.version>2.1.1-RELEASE</pcloud-common-core.version>
+				<pcloud-solr.version>2.1.1-RELEASE</pcloud-solr.version>
 			</properties>
 		</profile>
 	</profiles>
@@ -303,13 +307,6 @@
 			</dependency>
 			<!-- end -->
 
-			<!-- solr add by gaop at 2018-4-23 11:33:47 -->
-			<dependency>
-				<groupId>org.springframework.data</groupId>
-				<artifactId>spring-data-solr</artifactId>
-				<version>${spring.data.solr.version}</version>
-			</dependency>
-
 			<!-- Jackson Begin -->
 			<dependency>
 				<groupId>org.codehaus.jackson</groupId>