Merge branch 'dev' of ssh://10.10.101.21/source/search-parent

pom.xml

@@ -12,34 +12,37 @@
 	<version>0.1.9-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>search-parent</name>
-	<url>http://maven.apache.org</url>
+	<modules>
+		<module>search-common</module>
+	</modules>
 
 	<profiles>
 		<profile>
-			<id>b2c_release</id>
+			<id>all</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<!-- api -->
 				<module>search-api</module>
-				<!-- console -->
+				<module>search-console</module>
+				<module>search-api-b2b</module>
+				<module>search-console-b2b</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>b2c_release</id>
+			<modules>
+				<module>search-api</module>
 				<module>search-console</module>
 			</modules>
 		</profile>
 		<profile>
 			<id>b2b_release</id>
 			<modules>
-				<!-- api -->
 				<module>search-api-b2b</module>
-				<!-- console -->
 				<module>search-console-b2b</module>
 			</modules>
 		</profile>
-		<profile>
-			<id>release</id>
-		</profile>
 	</profiles>
 
 	<properties>
@@ -48,7 +51,6 @@
 		<java.source.version>1.7</java.source.version>
 		<java.target.version>1.7</java.target.version>
 		<maven.compiler.plugin.version>2.3.2</maven.compiler.plugin.version>
-		<spring.cloud.version>1.2.1.RELEASE</spring.cloud.version>
 		<dubbo.version>2.8.4</dubbo.version>
 		<zookeeper.version>3.4.6</zookeeper.version>
 		<servlet.version>3.0-alpha-1</servlet.version>
@@ -62,11 +64,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-config</artifactId>
-				<version>${spring.cloud.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
@@ -75,7 +72,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.uas.search</groupId>
-				<artifactId>search-api</artifactId>
+				<artifactId>search-common</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>

search-api-b2b/pom.xml

@@ -9,15 +9,12 @@
 		<version>0.1.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>search-api-b2b</artifactId>
-	<name>search-api-b2b</name>
-	<url>http://maven.apache.org</url>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
 	<build>
-		<finalName>search-api</finalName>
-
 		<plugins>
 			<!-- 生成javadoc文档包的插件 -->
 			<plugin>

search-api-b2b/src/main/main.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

search-api/pom.xml

@@ -7,14 +7,11 @@
 		<version>0.1.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>search-api</artifactId>
-	<name>search-api</name>
-	<url>http://maven.apache.org</url>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<build>
-		<finalName>search-api</finalName>
-
 		<plugins>
 			<!-- 生成javadoc文档包的插件 -->
 			<plugin>

search-common/pom.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.uas.search</groupId>
+        <artifactId>search-parent</artifactId>
+        <version>0.1.9-SNAPSHOT</version>
+    </parent>
+    <artifactId>search-common</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <!-- 生成javadoc文档包的插件 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 生成sources源码包的插件 -->
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

search-common/src/main/java/com/uas/search/util/ArrayUtils.java

@@ -0,0 +1,46 @@
+package com.uas.search.util;
+
+/**
+ * 数组工具类
+ * 
+ * @author sunyj
+ * @since 2017年4月21日 下午9:01:53
+ */
+public class ArrayUtils {
+
+	public static boolean isEmpty(Object[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(long[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(int[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(short[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(char[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(byte[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(double[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(float[] array) {
+		return array == null || array.length == 0;
+	}
+
+	public static boolean isEmpty(boolean[] array) {
+		return array == null || array.length == 0;
+	}
+}

search-common/src/main/java/com/uas/search/util/CollectionUtils.java

@@ -0,0 +1,21 @@
+package com.uas.search.util;
+
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * 集合工具类
+ * 
+ * @author sunyj
+ * @since 2017年4月21日 下午9:43:31
+ */
+public class CollectionUtils {
+
+	public static boolean isEmpty(Collection<?> coll) {
+		return (coll == null || coll.isEmpty());
+	}
+
+	public static boolean isEmpty(Map<?, ?> map) {
+		return (map == null || map.isEmpty());
+	}
+}

search-common/src/main/java/com/uas/search/util/StringUtils.java

@@ -0,0 +1,31 @@
+package com.uas.search.util;
+
+/**
+ * 字符串工具类
+ * 
+ * @author sunyj
+ * @since 2017年5月25日 上午11:09:36
+ */
+public class StringUtils {
+
+	public static boolean isEmpty(Object str) {
+		return (str == null || "".equals(str.toString().trim()));
+	}
+
+	public static String reverse(String str) {
+		if (isEmpty(str)) {
+			return str;
+		}
+		char[] array = str.toCharArray();
+		int begin = 0;
+		int end = str.length() - 1;
+		while (begin < end) {
+			array[begin] = (char) (array[begin] ^ array[end]);
+			array[end] = (char) (array[begin] ^ array[end]);
+			array[begin] = (char) (array[begin] ^ array[end]);
+			begin++;
+			end--;
+		}
+		return new String(array);
+	}
+}

search-console-b2b/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -42,6 +38,15 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+		</dependency>
+
 		<!-- fastjson -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -54,6 +59,10 @@
 			<artifactId>search-api-b2b</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.uas.search</groupId>
+			<artifactId>search-common</artifactId>
+		</dependency>
 
 		<!-- dubbo -->
 		<dependency>
@@ -152,6 +161,12 @@
 			<groupId>com.uas.platform</groupId>
 			<artifactId>platform-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- 文件上传 -->

search-console-b2b/src/main/java/com/uas/search/console/b2b/aop/ServiceLogAspect.java

@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.druid.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 /**
  * 利用AOP处理Service层日志

search-console-b2b/src/main/java/com/uas/search/console/b2b/controller/IndexController.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import com.uas.search.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

search-console-b2b/src/main/java/com/uas/search/console/b2b/controller/SearchController.java

@@ -7,8 +7,8 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 

search-console-b2b/src/main/java/com/uas/search/console/b2b/core/advice/ExceptionHandlerAdvice.java

@@ -8,7 +8,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/AQListener.java

@@ -1,27 +1,5 @@
 package com.uas.search.console.b2b.jms;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.Session;
-
-import org.apache.commons.lang.NullArgumentException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONException;
 import com.uas.search.console.b2b.DruidDBConfiguration;
@@ -29,10 +7,21 @@ import com.uas.search.console.b2b.model.ParsedQueueMessage;
 import com.uas.search.console.b2b.service.IndexService;
 import com.uas.search.console.b2b.util.SearchConstants;
 import com.uas.search.console.b2b.util.SearchConstants.DataSourceQualifier;
-
+import com.uas.search.util.CollectionUtils;
 import oracle.jms.AQjmsAdtMessage;
 import oracle.jms.AQjmsFactory;
 import oracle.jms.AQjmsSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.jms.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 对数据库的消息队列进行实时监听
@@ -219,7 +208,7 @@ public class AQListener implements InitializingBean {
 	 */
 	public boolean isRunning(DataSourceQualifier dataSourceQualifier) {
 		if (dataSourceQualifier == null) {
-			throw new NullArgumentException("dataSourceQualifier");
+			throw new IllegalArgumentException("dataSourceQualifier 为空");
 		}
 		MessageConsumer consumer = consumers.get(dataSourceQualifier);
 		return consumer != null;

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneQueueMessageDao.java

@@ -1,26 +1,19 @@
 package com.uas.search.console.b2b.jms;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLRecoverableException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.console.b2b.util.JSONUtils;
 import com.uas.search.console.b2b.util.SearchConstants;
-
+import com.uas.search.util.StringUtils;
 import oracle.sql.STRUCT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author sunyj

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/QueueMessageParser.java

@@ -7,7 +7,7 @@ import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;

search-console-b2b/src/main/java/com/uas/search/console/b2b/model/PurchaseOrderSimpleInfo.java

@@ -1,22 +1,13 @@
 package com.uas.search.console.b2b.model;
 
+import com.uas.search.util.CollectionUtils;
+
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import com.alibaba.dubbo.common.utils.CollectionUtils;
-
 /**
  * 平台里面，以供应商的角度来查看采购订单
  * 

search-console-b2b/src/main/java/com/uas/search/console/b2b/schedule/service/impl/TaskServiceImpl.java

@@ -13,8 +13,8 @@ import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.console.b2b.schedule.model.TaskInformation;

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/IndexServiceImpl.java

@@ -1,31 +1,5 @@
 package com.uas.search.console.b2b.service.impl;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.SQLRecoverableException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.Term;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.PageInfo;
@@ -48,6 +22,22 @@ import com.uas.search.console.b2b.util.FileUtils;
 import com.uas.search.console.b2b.util.ObjectToDocumentUtils;
 import com.uas.search.console.b2b.util.SearchConstants.DataSourceQualifier;
 import com.uas.search.console.b2b.util.SearchUtils;
+import com.uas.search.util.ArrayUtils;
+import com.uas.search.util.CollectionUtils;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.Term;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Service;
+import com.uas.search.util.StringUtils;
+
+import java.io.*;
+import java.sql.SQLRecoverableException;
+import java.util.*;
 
 /**
  * 创建索引等

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/SearchServiceImpl.java

@@ -1,35 +1,5 @@
 package com.uas.search.console.b2b.service.impl;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.NumericRangeQuery;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TopDocs;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.model.MultiValue;
@@ -41,6 +11,22 @@ import com.uas.search.console.b2b.util.ClassAndTableNameUtils;
 import com.uas.search.console.b2b.util.DocumentToObjectUtils;
 import com.uas.search.console.b2b.util.FileUtils;
 import com.uas.search.console.b2b.util.SearchUtils;
+import com.uas.search.util.ArrayUtils;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * 搜索实现

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/UpdateVirtualColumnServiceImpl.java

@@ -18,7 +18,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import com.uas.search.util.CollectionUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;

search-console-b2b/src/main/java/com/uas/search/console/b2b/support/IndexSearcherManager.java

@@ -14,7 +14,7 @@ import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.NIOFSDirectory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.util.ClassAndTableNameUtils;

search-console-b2b/src/main/java/com/uas/search/console/b2b/support/RealTimeUpdateMonitor.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
+import com.uas.search.util.CollectionUtils;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.uas.search.b2b.model.SPage;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ClassAndTableNameUtils.java

@@ -7,7 +7,7 @@ import com.uas.search.console.b2b.dao.*;
 import com.uas.search.console.b2b.model.*;
 import com.uas.search.console.b2b.platformmanager.dao.UserSpaceDetailSimpleInfoDao;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
-import org.apache.commons.lang3.StringUtils;
+import com.uas.search.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.jpa.repository.JpaRepository;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -1,6 +1,6 @@
 package com.uas.search.console.b2b.util;
 
-import com.alibaba.dubbo.common.utils.StringUtils;
+import com.uas.search.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.b2b.exception.SearchException;
 import com.uas.search.b2b.service.SearchService.Table_name;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/MergeUserSpaceDetailData.java

@@ -7,7 +7,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -1,7 +1,7 @@
 package com.uas.search.console.b2b.util;
 
 import com.uas.search.console.b2b.model.*;
-import org.apache.commons.collections.CollectionUtils;
+import com.uas.search.util.CollectionUtils;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.document.FloatDocValuesField;
@@ -9,7 +9,7 @@ import org.apache.lucene.document.LongField;
 import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/SearchUtils.java

@@ -21,8 +21,8 @@ import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
 import com.uas.search.b2b.exception.SearchException;

search-console-b2b/src/main/resources/bootstrap.yml → search-console-b2b/src/main/resources/application.yml

@@ -1,36 +1,30 @@
-spring:
- application:
-  name: b2b-search
- cloud:
-  config:
-   uri: http://10.10.100.145:8080
- jpa:
-  database: ORACLE
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.Oracle10gDialect
- http:
-  multipart:
-   enabled: true
-   max-file-size: 512MB
-   max-request-size: 512MB
-     
-
-security:
- user:
-  name: admin
-  password: select111***
-  role: ADMIN
- ignored:
-  - /static/**
-  
-schedule:
- daily:
-  time:
-   hour: 3
-   minute: 0
-   second: 0
-   
-zk:
- url: zookeeper://10.10.100.11:2181
+spring:
+ jpa:
+  database: ORACLE
+  show-sql: false
+  properties:
+   hibernate:
+    dialect: org.hibernate.dialect.Oracle10gDialect
+ http:
+  multipart:
+   enabled: true
+   max-file-size: 512MB
+   max-request-size: 512MB
+     
+security:
+ user:
+  name: admin
+  password: select111***
+  role: ADMIN
+ ignored:
+  - /static/**
+  
+schedule:
+ daily:
+  time:
+   hour: 3
+   minute: 0
+   second: 0
+   
+zk:
+ url: zookeeper://10.10.100.11:2181

search-console-b2b/src/main/resources/config/application-dev.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+platformmanager.datasource.username=platformmanager$test
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=dev
+dubbo.group=dev
+
+lucene.indexes.dir=/mnt/data/b2b-search/dev/indexes
+lucene.data.dir=/mnt/data/b2b-search/dev/data
+
+schedule.auto-start=false

search-console-b2b/src/main/resources/config/application-prod.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
+datasource.username=platform$b2b
+datasource.password=select*fromuu
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@//10.10.100.215:1521/orcl
+platformmanager.datasource.username=platformmanager
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=prod
+dubbo.group=prod
+
+lucene.indexes.dir=/mnt/data/b2b-search/prod/indexes
+lucene.data.dir=/mnt/data/b2b-search/prod/data
+
+schedule.auto-start=true

search-console-b2b/src/main/resources/config/application-test.properties

@@ -0,0 +1,32 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+#platformmanager
+platformmanager.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+platformmanager.datasource.username=platformmanager$test
+platformmanager.datasource.password=select!#%*(
+
+dubbo.owner=test
+dubbo.group=test
+
+lucene.indexes.dir=/mnt/data/b2b-search/test/indexes
+lucene.data.dir=/mnt/data/b2b-search/test/data
+
+schedule.auto-start=true

search-console/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-config</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -42,6 +38,15 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-jpa</artifactId>
+		</dependency>
+
 		<!-- fastjson -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -52,6 +57,11 @@
 		<dependency>
 			<groupId>com.uas.search</groupId>
 			<artifactId>search-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.uas.search</groupId>
+			<artifactId>search-common</artifactId>
 		</dependency>
 
 		<!-- dubbo -->
@@ -151,6 +161,12 @@
 			<groupId>com.uas.platform</groupId>
 			<artifactId>platform-core</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
+			<exclusions>
+				<exclusion>
+					<groupId>*</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- 文件上传 -->

search-console/src/main/java/com/uas/search/console/aop/ServiceLogAspect.java

@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.druid.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
 /**
  * 利用AOP处理Service层日志

search-console/src/main/java/com/uas/search/console/controller/IndexController.java

@@ -1,20 +1,19 @@
 package com.uas.search.console.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import com.uas.search.console.jms.AQListener;
+import com.uas.search.console.model.LuceneQueueMessage;
+import com.uas.search.console.service.IndexService;
+import com.uas.search.exception.SearchException;
+import com.uas.search.model.SPage;
+import com.uas.search.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.uas.search.console.jms.AQListener;
-import com.uas.search.console.model.LuceneQueueMessage;
-import com.uas.search.console.service.IndexService;
-import com.uas.search.exception.SearchException;
-import com.uas.search.model.SPage;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 索引创建相关请求

search-console/src/main/java/com/uas/search/console/controller/OrderSearchController.java

@@ -1,18 +1,5 @@
 package com.uas.search.console.controller;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.uas.search.console.core.util.ContextUtils;
 import com.uas.search.console.model.OrderInvoiceSimpleInfo;
 import com.uas.search.console.model.OrderSimpleInfo;
@@ -26,6 +13,14 @@ import com.uas.search.model.PageParams;
 import com.uas.search.model.PageParams.FilterField;
 import com.uas.search.model.SPage;
 import com.uas.search.service.OrderSearchService.Table_name;
+import com.uas.search.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.*;
 
 /**
  * 订单搜索请求

search-console/src/main/java/com/uas/search/console/controller/SearchController.java

@@ -1,27 +1,6 @@
 package com.uas.search.console.controller;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.alibaba.druid.util.StringUtils;
+import com.uas.search.util.StringUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.console.core.util.ContextUtils;
@@ -42,6 +21,21 @@ import com.uas.search.model.SPage;
 import com.uas.search.model.Sort;
 import com.uas.search.model.Sort.Field;
 import com.uas.search.service.SearchService;
+import com.uas.search.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * 搜索请求

search-console/src/main/java/com/uas/search/console/core/advice/ExceptionHandlerAdvice.java

@@ -8,7 +8,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 

search-console/src/main/java/com/uas/search/console/dao/GoodsSimpleInfoDao.java

@@ -1,16 +1,15 @@
 package com.uas.search.console.dao;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-import org.springframework.util.CollectionUtils;
-
 import com.uas.search.console.model.ComponentSimpleInfo;
 import com.uas.search.console.model.GoodsSimpleInfo;
 import com.uas.search.console.model.StoreSimpleInfo;
 import com.uas.search.console.model.TradeGoodsSimpleInfo;
+import com.uas.search.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author sunyj

search-console/src/main/java/com/uas/search/console/dao/LuceneQueueMessageDao.java

@@ -1,28 +1,21 @@
 package com.uas.search.console.dao;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.SQLRecoverableException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.console.model.LuceneQueueMessage;
 import com.uas.search.console.util.SearchConstants;
 import com.uas.search.exception.SearchException;
 import com.uas.search.model.SPage;
-
+import com.uas.search.util.StringUtils;
 import oracle.sql.STRUCT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author sunyj

search-console/src/main/java/com/uas/search/console/data/MergeData.java

@@ -1,30 +1,16 @@
 package com.uas.search.console.data;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.search.console.model.*;
+import com.uas.search.util.StringUtils;
+
+import java.io.*;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.util.StringUtils;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.search.console.model.BrandSimpleInfo;
-import com.uas.search.console.model.ComponentSimpleInfo;
-import com.uas.search.console.model.GoodsSimpleInfo;
-import com.uas.search.console.model.KindSimpleInfo;
-import com.uas.search.console.model.PropertyValueSimpleInfo;
-import com.uas.search.console.model.StoreSimpleInfo;
-
 /**
  * 用于对从数据库导出的器件和属性值两个文本文件进行处理，将每个器件所拥有的属性值提取出来，之后每个器件作为一行，以json的形式写入多个文件中
  * 

search-console/src/main/java/com/uas/search/console/data/PropertyValueSplit.java

@@ -1,13 +1,8 @@
 package com.uas.search.console.data;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
+import com.uas.search.util.StringUtils;
 
-import org.springframework.util.StringUtils;
+import java.io.*;
 
 public class PropertyValueSplit {
 

search-console/src/main/java/com/uas/search/console/jms/QueueMessageParser.java

@@ -1,36 +1,21 @@
 package com.uas.search.console.jms;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.search.console.dao.*;
+import com.uas.search.console.model.*;
+import com.uas.search.console.util.SearchConstants;
+import com.uas.search.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.search.console.dao.BrandSimpleInfoDao;
-import com.uas.search.console.dao.ComponentSimpleInfoDao;
-import com.uas.search.console.dao.KindSimpleInfoDao;
-import com.uas.search.console.dao.OrderInvoiceSimpleInfoDao;
-import com.uas.search.console.dao.OrderSimpleInfoDao;
-import com.uas.search.console.dao.PurchaseInvoiceSimpleInfoDao;
-import com.uas.search.console.dao.PurchaseSimpleInfoDao;
-import com.uas.search.console.model.BrandSimpleInfo;
-import com.uas.search.console.model.ComponentSimpleInfo;
-import com.uas.search.console.model.GoodsSimpleInfo;
-import com.uas.search.console.model.KindSimpleInfo;
-import com.uas.search.console.model.OrderInvoiceSimpleInfo;
-import com.uas.search.console.model.OrderSimpleInfo;
-import com.uas.search.console.model.ParsedQueueMessage;
-import com.uas.search.console.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.console.model.PurchaseSimpleInfo;
-import com.uas.search.console.util.SearchConstants;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 对得到的队列消息进行解析的工具

search-console/src/main/java/com/uas/search/console/schedule/service/impl/TaskServiceImpl.java

@@ -1,5 +1,16 @@
 package com.uas.search.console.schedule.service.impl;
 
+import com.uas.search.console.schedule.model.TaskInformation;
+import com.uas.search.console.schedule.model.TaskLog;
+import com.uas.search.console.schedule.service.Executable;
+import com.uas.search.console.schedule.service.TaskService;
+import com.uas.search.exception.SearchException;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -10,18 +21,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import com.uas.search.console.schedule.model.TaskInformation;
-import com.uas.search.console.schedule.model.TaskLog;
-import com.uas.search.console.schedule.service.Executable;
-import com.uas.search.console.schedule.service.TaskService;
-import com.uas.search.exception.SearchException;
-
 /**
  * 管理定时任务
  * 

search-console/src/main/java/com/uas/search/console/service/impl/IndexServiceImpl.java

@@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.core.model.PageInfo;

search-console/src/main/java/com/uas/search/console/service/impl/OrderSearchServiceImpl.java

@@ -19,8 +19,8 @@ import org.apache.lucene.search.TopDocs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 
 import com.uas.search.console.model.OrderInvoiceSimpleInfo;
 import com.uas.search.console.model.OrderSimpleInfo;

search-console/src/main/java/com/uas/search/console/service/impl/RealTimeUpdateMonitorServiceImpl.java

@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
+import com.uas.search.util.CollectionUtils;
 
 import com.uas.search.console.dao.LuceneQueueMessageDao;
 import com.uas.search.console.jms.AQListener;

search-console/src/main/java/com/uas/search/console/service/impl/SearchServiceImpl.java

@@ -29,8 +29,8 @@ import org.apache.lucene.search.TopDocs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.console.core.util.FastjsonUtils;

search-console/src/main/java/com/uas/search/console/support/IndexSearcherManager.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang3.StringUtils;
+import com.uas.search.util.StringUtils;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.search.IndexSearcher;

search-console/src/main/java/com/uas/search/console/support/IndexWriterManager.java

@@ -1,12 +1,7 @@
 package com.uas.search.console.support;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.commons.lang3.StringUtils;
+import com.uas.search.console.util.SearchUtils;
+import com.uas.search.util.StringUtils;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.store.FSDirectory;
@@ -15,7 +10,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
-import com.uas.search.console.util.SearchUtils;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 对IndexWriter进行管理，防止同时有多个方法对索引进行修改，抛出LockObtainFailedException异常

search-console/src/main/java/com/uas/search/console/util/DocumentToObjectUtils.java

@@ -1,32 +1,13 @@
 package com.uas.search.console.util;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.lucene.document.Document;
-
-import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.search.console.model.BaseOrderDetailSimpleInfo;
-import com.uas.search.console.model.BrandSimpleInfo;
-import com.uas.search.console.model.ComponentSimpleInfo;
-import com.uas.search.console.model.EnterpriseSimpleInfo;
-import com.uas.search.console.model.GoodsSimpleInfo;
-import com.uas.search.console.model.KindSimpleInfo;
-import com.uas.search.console.model.OrderDetailSimpleInfo;
-import com.uas.search.console.model.OrderInvoiceDetailSimpleInfo;
-import com.uas.search.console.model.OrderInvoiceSimpleInfo;
-import com.uas.search.console.model.OrderSimpleInfo;
-import com.uas.search.console.model.PurchaseDetailSimpleInfo;
-import com.uas.search.console.model.PurchaseInvoiceDetailSimpleInfo;
-import com.uas.search.console.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.console.model.PurchaseSimpleInfo;
-import com.uas.search.console.model.StoreSimpleInfo;
+import com.uas.search.console.model.*;
 import com.uas.search.exception.SearchException;
 import com.uas.search.model.BaseOrderDetail;
+import com.uas.search.util.StringUtils;
+import org.apache.lucene.document.Document;
+
+import java.util.*;
 
 /**
  * 将Document转换为对象的工具类

search-console/src/main/java/com/uas/search/console/util/ObjectToDocumentUtils.java

@@ -1,33 +1,15 @@
 package com.uas.search.console.util;
 
-import java.util.Set;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleDocValuesField;
-import org.apache.lucene.document.DoubleField;
+import com.alibaba.fastjson.JSONObject;
+import com.uas.search.console.model.*;
+import com.uas.search.util.CollectionUtils;
+import net.sf.ehcache.search.SearchException;
+import org.apache.lucene.document.*;
 import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.LongField;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
 import org.apache.lucene.util.BytesRef;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.StringUtils;
 
-import com.alibaba.fastjson.JSONObject;
-import com.uas.search.console.model.BrandSimpleInfo;
-import com.uas.search.console.model.ComponentSimpleInfo;
-import com.uas.search.console.model.GoodsSimpleInfo;
-import com.uas.search.console.model.KindSimpleInfo;
-import com.uas.search.console.model.OrderInvoiceSimpleInfo;
-import com.uas.search.console.model.OrderSimpleInfo;
-import com.uas.search.console.model.PropertyValueSimpleInfo;
-import com.uas.search.console.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.console.model.PurchaseSimpleInfo;
-import com.uas.search.console.model.StoreSimpleInfo;
-
-import net.sf.ehcache.search.SearchException;
+import java.util.Set;
 
 /**
  * 将对象转换为Document的工具类
@@ -357,7 +339,7 @@ public class ObjectToDocumentUtils {
 	/**
 	 * PurchaseSimpleInfo对象转为Document
 	 * 
-	 * @param order
+	 * @param purchase
 	 *            PurchaseSimpleInfo对象
 	 * @return 转换的Document
 	 */

search-console/src/main/java/com/uas/search/console/util/SearchUtils.java

@@ -20,8 +20,8 @@ import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
+import com.uas.search.util.CollectionUtils;
+import com.uas.search.util.StringUtils;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
 import com.uas.search.console.LuceneProperties;

search-console/src/main/java/com/uas/search/grouping/GoodsGroupCollector.java

@@ -1,19 +1,13 @@
 package com.uas.search.grouping;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.uas.search.util.StringUtils;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.SimpleCollector;
 
-import com.alibaba.druid.util.StringUtils;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * 批次统计

search-console/src/main/resources/bootstrap.yml → search-console/src/main/resources/application.yml

@@ -1,32 +1,27 @@
-spring:
- application:
-  name: mall-search
- cloud:
-  config:
-   uri: http://10.10.100.145:8080
- jpa:
-  database: ORACLE
-  show-sql: false
-  properties:
-   hibernate:
-    dialect: org.hibernate.dialect.Oracle10gDialect
- http:
-  multipart:
-   enabled: true
-   max-file-size: 512MB
-   max-request-size: 512MB
-     
-
-security:
- user:
-  name: admin
-  password: select111***
-  role: ADMIN
- ignored:
-  - /static/**
-  
-schedule:
- auto-start: true
-   
-zk:
- url: zookeeper://10.10.100.11:2181
+spring:
+ jpa:
+  database: ORACLE
+  show-sql: false
+  properties:
+   hibernate:
+    dialect: org.hibernate.dialect.Oracle10gDialect
+ http:
+  multipart:
+   enabled: true
+   max-file-size: 512MB
+   max-request-size: 512MB
+     
+
+security:
+ user:
+  name: admin
+  password: select111***
+  role: ADMIN
+ ignored:
+  - /static/**
+  
+schedule:
+ auto-start: true
+   
+zk:
+ url: zookeeper://10.10.100.11:2181

search-console/src/main/resources/config/application-dev.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=dev
+dubbo.group=dev
+
+lucene.indexes.dir=/mnt/data/mall-search/dev/indexes
+lucene.data.dir=/mnt/data/mall-search/dev/data

search-console/src/main/resources/config/application-prod.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@10.10.100.200:1521:orcl
+datasource.username=platform$b2b
+datasource.password=select*fromuu
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=prod
+dubbo.group=prod
+
+lucene.indexes.dir=/data/indexes
+lucene.data.dir=/data/data

search-console/src/main/resources/config/application-test.properties

@@ -0,0 +1,25 @@
+datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+datasource.username=uuplatformdemo
+datasource.password=selectuuplatform
+datasource.driverClassName=oracle.jdbc.driver.OracleDriver
+datasource.initialSize=3
+datasource.minIdle=1
+datasource.maxActive=20
+datasource.maxWait=60000
+datasource.timeBetweenEvictionRunsMillis=60000
+datasource.minEvictableIdleTimeMillis=300000
+datasource.validationQuery=SELECT 1 FROM DUAL
+datasource.testWhileIdle=true
+datasource.testOnBorrow=true
+datasource.testOnReturn=false
+datasource.poolPreparedStatements=true
+datasource.timeBetweenLogStatsMillis=60000
+datasource.maxPoolPreparedStatementPerConnectionSize=20
+datasource.filters=stat,slf4j
+datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+dubbo.owner=test
+dubbo.group=test
+
+lucene.indexes.dir=/mnt/data/mall-search/test/indexes
+lucene.data.dir=/mnt/data/mall-search/test/data